Merge pull request #592 from Wepala/field-map-fix

Added getFieldMapping method

Author: lsmith77

lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php

@@ -26,6 +26,7 @@
 use PHPCR\Util\PathHelper;
 use ReflectionProperty;
 use ReflectionClass;
+use Doctrine\ODM\PHPCR\Mapping\MappingException;
 use Doctrine\Common\Persistence\Mapping\ReflectionService;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata as ClassMetadataInterface;
 use Doctrine\Common\ClassLoader;
@@ -1126,14 +1127,11 @@ public function hasField($fieldName)
 
     /**
      * {@inheritDoc}
+     * @deprecated use getFieldMapping instead
      */
     public function getField($fieldName)
     {
-        if (!$this->hasField($fieldName)) {
-            throw MappingException::fieldNotFound($this->name, $fieldName);
-        }
-
-        return $this->mappings[$fieldName];
+        return $this->getFieldMapping($fieldName);
     }
 
     /**
@@ -1289,7 +1287,7 @@ public function isInheritedField($fieldName)
      */
     public function isNullable($fieldName)
     {
-        $mapping = $this->getField($fieldName);
+        $mapping = $this->getFieldMapping($fieldName);
         if ($mapping !== false) {
             return isset($mapping['nullable']) && true == $mapping['nullable'];
         }
@@ -1560,6 +1558,25 @@ public function getFieldValue($document, $field)
         return null;
     }
 
+    /**
+     * Gets the mapping of a (regular) field that holds some data but not a
+     * reference to another object.
+     *
+     * @param string $fieldName The field name.
+     *
+     * @return array The field mapping.
+     *
+     * @throws MappingException
+     */
+    public function getFieldMapping($fieldName)
+    {
+        if (!$this->hasField($fieldName)) {
+            throw MappingException::fieldNotFound($this->name, $fieldName);
+        }
+
+        return $this->mappings[$fieldName];
+    }
+
     /**
      * Dispatches the lifecycle event of the given document to the registered
      * lifecycle callbacks and lifecycle listeners.

lib/Doctrine/ODM/PHPCR/Query/Builder/BuilderConverterPhpcr.php

@@ -133,7 +133,7 @@ protected function getPhpcrProperty($originalAlias, $odmField)
         $meta = $this->aliasMetadata[$originalAlias];;
 
         if ($meta->hasField($odmField)) {
-            $fieldMeta = $meta->getField($odmField);
+            $fieldMeta = $meta->getFieldMapping($odmField);
         } elseif ($meta->hasAssociation($odmField)) {
             $fieldMeta = $meta->getAssociation($odmField);
         } else {

lib/Doctrine/ODM/PHPCR/UnitOfWork.php

@@ -2412,7 +2412,7 @@ private function executeInserts($documents)
      */
     private function isAutocreatedProperty(ClassMetadata $class, $fieldName)
     {
-        $field = $class->getField($fieldName);
+        $field = $class->getFieldMapping($fieldName);
         if ('jcr:uuid' === $field['property']) {
             // jackrabbit at least does not identify this as auto created
             // it is strictly speaking no property

tests/Doctrine/Tests/ODM/PHPCR/Mapping/ClassMetadataTest.php

@@ -99,7 +99,7 @@ public function testGetAssociationNonexisting(ClassMetadata $cm)
      */
     public function testGetFieldNonexisting(ClassMetadata $cm)
     {
-        $cm->getField('nonexisting');
+        $cm->getFieldMapping('nonexisting');
     }
 
     /**

tests/Doctrine/Tests/ODM/PHPCR/Query/Builder/BuilderConverterPhpcrTest.php

@@ -44,7 +44,7 @@ public function setUp()
                     ->will($me->returnValue(true));
 
                 $meta->expects($me->any())
-                    ->method('getField')
+                    ->method('getFieldMapping')
                     ->will($me->returnCallback(function ($name) {
 
                         $res = array(