[2.0] Fixed PHP Notice in SchemaTest (only variables should be passed by reference...) and a few other cosmetics in various parts.

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -22,8 +22,7 @@
 namespace Doctrine\ORM\Internal\Hydration;
 
 use Doctrine\DBAL\Connection,
-    Doctrine\DBAL\Types\Type,
-    Doctrine\Common\DoctrineException;
+    Doctrine\DBAL\Types\Type;
 
 /**
  * Base class for all hydrators. A hydrator is a class that provides some form
@@ -38,7 +37,7 @@ use Doctrine\DBAL\Connection,
  */
 abstract class AbstractHydrator
 {
-    /** The ResultSetMapping. */
+    /** @var ResultSetMapping The ResultSetMapping. */
     protected $_rsm;
 
     /** @var EntityManager The EntityManager instance. */
@@ -152,7 +151,7 @@ abstract class AbstractHydrator
      */
     protected function _hydrateRow(array &$data, array &$cache, array &$result)
     {
-        throw new DoctrineException("_hydrateRow() not implemented by this hydrator.");
+        throw new HydrationException("_hydrateRow() not implemented by this hydrator.");
     }
 
     /**
@@ -301,7 +300,7 @@ abstract class AbstractHydrator
      * during hydration because the hydrator caches effectively.
      *
      * @return string  The field name.
-     * @throws DoctrineException If the field name could not be found.
+     * @throws HydrationException If the field name could not be found.
      * @todo Remove. See inline FIXME comment.
      */
     private function _lookupDeclaringClass($class, $fieldName)
@@ -317,6 +316,6 @@ abstract class AbstractHydrator
             }
         }
 
-        throw DoctrineException::noOwnerFoundForField($class, $fieldName);
+        throw new HydrationException("No owner found for field $fieldName.");
     }
 }

lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php

@@ -81,8 +81,7 @@ class ArrayHydrator extends AbstractHydrator
             unset($rowData['scalars']);
         }
 
-        // 3) Now hydrate the rest of the data found in the current row, that
-        // belongs to other (related) entities.
+        // 2) Now hydrate the data found in the current row.
         foreach ($rowData as $dqlAlias => $data) {
             $index = false;
 

lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php

@@ -137,7 +137,7 @@ class ObjectHydrator extends AbstractHydrator
             $value = new ArrayCollection;
         }
         
-        if ($value instanceof ArrayCollection) {
+        if ( ! $value instanceof PersistentCollection) {
             $value = new PersistentCollection(
                 $this->_em,
                 $this->_ce[$relation->targetEntityName],

lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php

@@ -42,10 +42,4 @@ class SingleScalarHydrator extends AbstractHydrator
         $result = $this->_gatherScalarRowData($result[key($result)], $cache);
         return array_shift($result);
     }
-
-    /** {@inheritdoc} */
-    protected function _getRowContainer()
-    {
-        return array();
-    }
 }

lib/Doctrine/ORM/Mapping/AssociationMapping.php

@@ -120,8 +120,10 @@ abstract class AssociationMapping
      */
     public function __construct(array $mapping)
     {
+        if ($mapping) {
             $this->_validateAndCompleteMapping($mapping);
         }
+    }
     
     /**
      * Validates & completes the mapping. Mapping defaults are applied here.

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

@@ -183,8 +183,10 @@ class AnnotationDriver implements Driver
                 $mapping['precision'] = $columnAnnot->precision;
                 $mapping['scale'] = $columnAnnot->scale;
                 $mapping['nullable'] = $columnAnnot->nullable;
-                $mapping['options'] = $columnAnnot->options;
                 $mapping['unique'] = $columnAnnot->unique;
+                if ($columnAnnot->options) {
+                    $mapping['options'] = $columnAnnot->options;
+                }
                 
                 if (isset($columnAnnot->default)) {
                     $mapping['default'] = $columnAnnot->default;

lib/Doctrine/ORM/Mapping/OneToOneMapping.php

@@ -255,4 +255,33 @@ class OneToOneMapping extends AssociationMapping
         
         return $targetEntity;
     }
+    
+    /**
+     * @internal Experimental. For MetaModel API, Doctrine 2.1.
+     */
+    public static function __set_state(array $state)
+    {
+        $assoc = new self(array());
+        $assoc->isOptional = $state['isOptional'];
+        $assoc->joinColumnFieldNames = $state['joinColumnFieldNames'];
+        $assoc->joinColumns = $state['joinColumns'];
+        $assoc->orphanRemoval = $state['orphanRemoval'];
+        $assoc->sourceToTargetKeyColumns = $state['sourceToTargetKeyColumns'];
+        $assoc->targetToSourceKeyColumns = $state['targetToSourceKeyColumns'];
+        
+        $assoc->fetchMode = $state['fetchMode'];
+        $assoc->isCascadeDetach = $state['isCascadeDetach'];
+        $assoc->isCascadeRefresh = $state['isCascadeRefresh'];
+        $assoc->isCascadeRemove = $state['isCascadeRemove'];
+        $assoc->isCascadePersist = $state['isCascadePersist'];
+        $assoc->isCascadeMerge = $state['isCascadeMerge'];
+        $assoc->isOwningSide = $state['isOwningSide'];
+        $assoc->joinTable = $state['joinTable'];
+        $assoc->mappedByFieldName = $state['mappedByFieldName'];
+        $assoc->sourceEntityName = $state['sourceEntityName'];
+        $assoc->targetEntityName = $state['targetEntityName'];
+        $assoc->sourceFieldName = $state['sourceFieldName'];
+        
+        return $assoc;
+    }
 }

lib/Doctrine/ORM/OptimisticLockException.php

@@ -30,5 +30,10 @@ namespace Doctrine\ORM;
  * @since       2.0
  * @version     $Revision$
  */
-class OptimisticLockException extends \Doctrine\Common\DoctrineException
-{}
+class OptimisticLockException extends ORMException
+{
+    public static function lockFailed()
+    {
+        return new self("The optimistic lock failed.");
+    }
+}

lib/Doctrine/ORM/Persisters/StandardEntityPersister.php

@@ -256,7 +256,7 @@ class StandardEntityPersister
         $result = $this->_conn->executeUpdate($sql, $params);
 
         if ($isVersioned && ! $result) {
-            throw \Doctrine\ORM\OptimisticLockException::optimisticLockFailed();
+            throw \Doctrine\ORM\OptimisticLockException::lockFailed();
         }
     }
 

lib/Doctrine/ORM/UnitOfWork.php

@@ -1344,7 +1344,7 @@ class UnitOfWork implements PropertyChangedListener
                 $entityVersion = $class->reflFields[$class->versionField]->getValue($entity);
                 // Throw exception if versions dont match.
                 if ($managedCopyVersion != $entityVersion) {
-                    throw OptimisticLockException::versionMismatch();
+                    throw OptimisticLockException::lockFailed();
                 }
             }
     

tests/Doctrine/Tests/DBAL/Schema/SchemaTest.php

@@ -183,7 +183,8 @@ class SchemaTest extends \PHPUnit_Framework_TestCase
         $schema->visit(new \Doctrine\DBAL\Schema\Visitor\FixSchema(true));
 
         $this->assertEquals(1, count($tableB->getIndexes()));
-        $index = current($tableB->getIndexes());
+        $indexes = $tableB->getIndexes();
+        $index = current($indexes);
         $this->assertTrue($index->hasColumnAtPosition('foo_id', 0));
     }
 }