doctrine / orm

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

Doc Comments +12 added lines

@@ -373,6 +373,9 @@ 
         return $this->items;
     }
 
+    /**
+     * @param string $value
+     */
     public function setTransient($value) {
         if ($value != $this->transient) {
             $this->_onPropertyChanged('transient', $this->transient, $value);
@@ -384,6 +387,9 @@ 
         return $this->data;
     }
 
+    /**
+     * @param string $data
+     */
     public function setData($data) {
         if ($data != $this->data) {
             $this->_onPropertyChanged('data', $this->data, $data);
@@ -396,6 +402,9 @@ 
         $this->_listeners[] = $listener;
     }
 
+    /**
+     * @param string $propName
+     */
     protected function _onPropertyChanged($propName, $oldValue, $newValue) {
         if ($this->_listeners) {
             foreach ($this->_listeners as $listener) {
@@ -426,6 +435,9 @@ 
         return $this->owner;
     }
 
+    /**
+     * @param NotifyChangedEntity|null $owner
+     */
     public function setOwner($owner) {
         $this->owner = $owner;
     }

Spacing +5 added lines, -5 removed lines

@@ -425,7 +425,7 @@ 
             'empty string, single field'     => [$emptyString, ''],
             'non-empty string, single field' => [$nonEmptyString, $nonEmptyString->id],
             'empty strings, two fields'      => [$emptyStrings, ' '],
-            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1 . ' ' . $nonEmptyStrings->id2],
+            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1.' '.$nonEmptyStrings->id2],
             'boolean true'                   => [$booleanTrue, '1'],
             'boolean false'                  => [$booleanFalse, ''],
         ];
@@ -456,7 +456,7 @@ 
 
     public function entitiesWithInvalidIdentifiersProvider()
     {
-        $firstNullString  = new EntityWithCompositeStringIdentifier();
+        $firstNullString = new EntityWithCompositeStringIdentifier();
 
         $firstNullString->id2 = uniqid('id2', true);
 
@@ -515,7 +515,7 @@ 
             ->eventManager
             ->expects(self::any())
             ->method('hasListeners')
-            ->willReturnCallback(function ($eventName) {
+            ->willReturnCallback(function($eventName) {
                 return $eventName === Events::prePersist;
             });
         $this
@@ -524,7 +524,7 @@ 
             ->method('dispatchEvent')
             ->with(
                 self::anything(),
-                self::callback(function (LifecycleEventArgs $args) use ($entity, $generatedFieldValue) {
+                self::callback(function(LifecycleEventArgs $args) use ($entity, $generatedFieldValue) {
                     /* @var $object EntityWithRandomlyGeneratedField */
                     $object = $args->getObject();
 
@@ -564,7 +564,7 @@ 
             ->eventManager
             ->expects(self::any())
             ->method('hasListeners')
-            ->willReturnCallback(function ($eventName) {
+            ->willReturnCallback(function($eventName) {
                 return $eventName === Events::prePersist;
             });
         $this->eventManager->expects(self::never())->method('dispatchEvent');

tests/Doctrine/Tests/OrmTestCase.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     protected $secondLevelCacheDriverImpl = null;
 
     /**
-     * @param array $paths
+     * @param string[] $paths
      * @param mixed $alias
      *
      * @return \Doctrine\ORM\Mapping\Driver\AnnotationDriver

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
             }
         }
 
-        Annotations\AnnotationRegistry::registerFile(__DIR__ . "/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php");
+        Annotations\AnnotationRegistry::registerFile(__DIR__."/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php");
 
         return new AnnotationDriver($reader, (array) $paths);
     }
@@ -127,11 +127,11 @@ 
         $config->setMetadataCacheImpl($metadataCache);
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
         $config->setQueryCacheImpl(self::getSharedQueryCacheImpl());
-        $config->setProxyDir(__DIR__ . '/Proxies');
+        $config->setProxyDir(__DIR__.'/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
             [
-            realpath(__DIR__ . '/Models/Cache')
+            realpath(__DIR__.'/Models/Cache')
             ], true));
 
         if ($this->isSecondLevelCacheEnabled) {

lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php

Doc Comments +1 added lines

@@ -83,6 +83,7 @@
 
     /**
      * {@inheritDoc}
+     * @param string $value
      */
     public function setValue($object, $value = null)
     {

tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php

Doc Comments +4 added lines, -4 removed lines

@@ -182,7 +182,7 @@ 
 
 	/**
      *
-     * @param kateglo\application\models\Type $type
+     * @param Type $type
      * @return void
      */
 	public function addType(Type $type){
@@ -194,7 +194,7 @@ 
 
     /**
      *
-     * @param kateglo\application\models\Type $type
+     * @param Type $type
      * @return void
      */
     public function removeType(Type $type)
@@ -304,7 +304,7 @@ 
 
 	/**
 	 *
-	 * @param kateglo\application\models\Lemma $lemma
+	 * @param Lemma $lemma
 	 * @return void
 	 */
 	public function addLemma(Lemma $lemma)
@@ -317,7 +317,7 @@ 
 
 	/**
 	 *
-	 * @param kateglo\application\models\Lemma $lemma
+	 * @param Lemma $lemma
 	 * @return void
 	 */
 	public function removeLEmma(Lemma $lemma)

Indentation +170 added lines, -170 removed lines

@@ -131,65 +131,65 @@ 
  */
 class Lemma {
 
-	const CLASS_NAME = __CLASS__;
-
-	/**
-	 * @var int
-	 * @Id
-	 * @Column(type="integer", name="lemma_id")
-	 * @GeneratedValue(strategy="AUTO")
-	 */
-	private $id;
-
-	/**
-	 *
-	 * @var string
-	 * @Column(type="string", name="lemma_name", unique=true, length=255)
-	 */
-	private $lemma;
-
-	/**
-	 * @var kateglo\application\utilities\collections\ArrayCollection
-	 * @ManyToMany(targetEntity="Type", mappedBy="lemmas", cascade={"persist"})
-	 */
-	private $types;
-
-	public function __construct() {
-		$this->types = new ArrayCollection();
-	}
-
-
-	/**
-	 *
-	 * @return int
-	 */
-	public function getId(){
-		return $this->id;
-	}
-
-	/**
-	 *
-	 * @param string $lemma
-	 * @return void
-	 */
-	public function setLemma($lemma){
-		$this->lemma = $lemma;
-	}
-
-	/**
-	 *
-	 * @return string
-	 */
-	public function getLemma(){
-		return $this->lemma;
-	}
-
-	/**
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     * @var int
+     * @Id
+     * @Column(type="integer", name="lemma_id")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     *
+     * @var string
+     * @Column(type="string", name="lemma_name", unique=true, length=255)
+     */
+    private $lemma;
+
+    /**
+     * @var kateglo\application\utilities\collections\ArrayCollection
+     * @ManyToMany(targetEntity="Type", mappedBy="lemmas", cascade={"persist"})
+     */
+    private $types;
+
+    public function __construct() {
+        $this->types = new ArrayCollection();
+    }
+
+
+    /**
+     *
+     * @return int
+     */
+    public function getId(){
+        return $this->id;
+    }
+
+    /**
+     *
+     * @param string $lemma
+     * @return void
+     */
+    public function setLemma($lemma){
+        $this->lemma = $lemma;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getLemma(){
+        return $this->lemma;
+    }
+
+    /**
      *
      * @param kateglo\application\models\Type $type
      * @return void
      */
-	public function addType(Type $type){
+    public function addType(Type $type){
         if (!$this->types->contains($type)) {
             $this->types[] = $type;
             $type->addLemma($this);
@@ -225,121 +225,121 @@ 
  */
 class Type {
 
-	const CLASS_NAME = __CLASS__;
-
-	/**
-	 *
-	 * @var int
-	 * @Id
-	 * @Column(type="integer", name="type_id")
-	 * @GeneratedValue(strategy="AUTO")
-	 */
-	private $id;
-
-	/**
-	 *
-	 * @var string
-	 * @Column(type="string", name="type_name", unique=true)
-	 */
-	private $type;
-
-	/**
-	 *
-	 * @var string
-	 * @Column(type="string", name="type_abbreviation", unique=true)
-	 */
-	private $abbreviation;
-
-	/**
-	 * @var kateglo\application\helpers\collections\ArrayCollection
-	 * @ManyToMany(targetEntity="Lemma")
-	 * @JoinTable(name="lemma_type",
-	 * 		joinColumns={@JoinColumn(name="type_id", referencedColumnName="type_id")},
-	 * 		inverseJoinColumns={@JoinColumn(name="lemma_id", referencedColumnName="lemma_id")}
-	 * )
-	 */
-	private $lemmas;
-
-	public function __construct(){
-		$this->lemmas = new ArrayCollection();
-	}
-
-	/**
-	 *
-	 * @return int
-	 */
-	public function getId(){
-		return $this->id;
-	}
-
-	/**
-	 *
-	 * @param string $type
-	 * @return void
-	 */
-	public function setType($type){
-		$this->type = $type;
-	}
-
-	/**
-	 *
-	 * @return string
-	 */
-	public function getType(){
-		return $this->type;
-	}
-
-	/**
-	 *
-	 * @param string $abbreviation
-	 * @return void
-	 */
-	public function setAbbreviation($abbreviation){
-		$this->abbreviation = $abbreviation;
-	}
-
-	/**
-	 *
-	 * @return string
-	 */
-	public function getAbbreviation(){
-		return $this->abbreviation;
-	}
-
-	/**
-	 *
-	 * @param kateglo\application\models\Lemma $lemma
-	 * @return void
-	 */
-	public function addLemma(Lemma $lemma)
-	{
-		if (!$this->lemmas->contains($lemma)) {
-			$this->lemmas[] = $lemma;
-			$lemma->addType($this);
-		}
-	}
-
-	/**
-	 *
-	 * @param kateglo\application\models\Lemma $lemma
-	 * @return void
-	 */
-	public function removeLEmma(Lemma $lemma)
-	{
-		$removed = $this->lemmas->removeElement($lemma);
-		if ($removed !== null) {
-			$removed->removeType($this);
-		}
-	}
-
-	/**
-	 *
-	 * @return kateglo\application\helpers\collections\ArrayCollection
-	 */
-	public function getCategories()
-	{
-		return $this->categories;
-	}
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     *
+     * @var int
+     * @Id
+     * @Column(type="integer", name="type_id")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     *
+     * @var string
+     * @Column(type="string", name="type_name", unique=true)
+     */
+    private $type;
+
+    /**
+     *
+     * @var string
+     * @Column(type="string", name="type_abbreviation", unique=true)
+     */
+    private $abbreviation;
+
+    /**
+     * @var kateglo\application\helpers\collections\ArrayCollection
+     * @ManyToMany(targetEntity="Lemma")
+     * @JoinTable(name="lemma_type",
+     * 		joinColumns={@JoinColumn(name="type_id", referencedColumnName="type_id")},
+     * 		inverseJoinColumns={@JoinColumn(name="lemma_id", referencedColumnName="lemma_id")}
+     * )
+     */
+    private $lemmas;
+
+    public function __construct(){
+        $this->lemmas = new ArrayCollection();
+    }
+
+    /**
+     *
+     * @return int
+     */
+    public function getId(){
+        return $this->id;
+    }
+
+    /**
+     *
+     * @param string $type
+     * @return void
+     */
+    public function setType($type){
+        $this->type = $type;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getType(){
+        return $this->type;
+    }
+
+    /**
+     *
+     * @param string $abbreviation
+     * @return void
+     */
+    public function setAbbreviation($abbreviation){
+        $this->abbreviation = $abbreviation;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getAbbreviation(){
+        return $this->abbreviation;
+    }
+
+    /**
+     *
+     * @param kateglo\application\models\Lemma $lemma
+     * @return void
+     */
+    public function addLemma(Lemma $lemma)
+    {
+        if (!$this->lemmas->contains($lemma)) {
+            $this->lemmas[] = $lemma;
+            $lemma->addType($this);
+        }
+    }
+
+    /**
+     *
+     * @param kateglo\application\models\Lemma $lemma
+     * @return void
+     */
+    public function removeLEmma(Lemma $lemma)
+    {
+        $removed = $this->lemmas->removeElement($lemma);
+        if ($removed !== null) {
+            $removed->removeType($this);
+        }
+    }
+
+    /**
+     *
+     * @return kateglo\application\helpers\collections\ArrayCollection
+     */
+    public function getCategories()
+    {
+        return $this->categories;
+    }
 
 }
 

Spacing +31 added lines, -31 removed lines

@@ -163,7 +163,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -172,7 +172,7 @@ 
 	 * @param string $lemma
 	 * @return void
 	 */
-	public function setLemma($lemma){
+	public function setLemma($lemma) {
 		$this->lemma = $lemma;
 	}
 
@@ -180,7 +180,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getLemma(){
+	public function getLemma() {
 		return $this->lemma;
 	}
 
@@ -189,8 +189,8 @@ 
      * @param kateglo\application\models\Type $type
      * @return void
      */
-	public function addType(Type $type){
-        if (!$this->types->contains($type)) {
+	public function addType(Type $type) {
+        if ( ! $this->types->contains($type)) {
             $this->types[] = $type;
             $type->addLemma($this);
         }
@@ -260,7 +260,7 @@ 
 	 */
 	private $lemmas;
 
-	public function __construct(){
+	public function __construct() {
 		$this->lemmas = new ArrayCollection();
 	}
 
@@ -268,7 +268,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -277,7 +277,7 @@ 
 	 * @param string $type
 	 * @return void
 	 */
-	public function setType($type){
+	public function setType($type) {
 		$this->type = $type;
 	}
 
@@ -285,7 +285,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getType(){
+	public function getType() {
 		return $this->type;
 	}
 
@@ -294,7 +294,7 @@ 
 	 * @param string $abbreviation
 	 * @return void
 	 */
-	public function setAbbreviation($abbreviation){
+	public function setAbbreviation($abbreviation) {
 		$this->abbreviation = $abbreviation;
 	}
 
@@ -302,7 +302,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAbbreviation(){
+	public function getAbbreviation() {
 		return $this->abbreviation;
 	}
 
@@ -313,7 +313,7 @@ 
 	 */
 	public function addLemma(Lemma $lemma)
 	{
-		if (!$this->lemmas->contains($lemma)) {
+		if ( ! $this->lemmas->contains($lemma)) {
 			$this->lemmas[] = $lemma;
 			$lemma->addType($this);
 		}
@@ -384,7 +384,7 @@ 
      * @param Definition $definition
      * @return void
      */
-    public function addDefinition(Definition $definition){
+    public function addDefinition(Definition $definition) {
         $this->definitions[] = $definition;
         $definition->setPhrase($this);
     }
@@ -392,7 +392,7 @@ 
     /**
      * @return int
      */
-    public function getId(){
+    public function getId() {
         return $this->id;
     }
 
@@ -400,14 +400,14 @@ 
      * @param string $phrase
      * @return void
      */
-    public function setPhrase($phrase){
+    public function setPhrase($phrase) {
         $this->phrase = $phrase;
     }
 
     /**
      * @return string
      */
-    public function getPhrase(){
+    public function getPhrase() {
         return $this->phrase;
     }
 
@@ -416,7 +416,7 @@ 
      * @param PhraseType $type
      * @return void
      */
-    public function setType(PhraseType $type){
+    public function setType(PhraseType $type) {
         $this->type = $type;
     }
 
@@ -424,7 +424,7 @@ 
      *
      * @return PhraseType
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
 
@@ -432,7 +432,7 @@ 
      *
      * @return ArrayCollection
      */
-    public function getDefinitions(){
+    public function getDefinitions() {
         return $this->definitions;
     }
 }
@@ -474,7 +474,7 @@ 
     /**
      * @return int
      */
-    public function getId(){
+    public function getId() {
         return $this->id;
     }
 
@@ -482,14 +482,14 @@ 
      * @param string $type
      * @return void
      */
-    public function setType($type){
+    public function setType($type) {
         $this->type = $type;
     }
 
     /**
      * @return string
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
 
@@ -497,14 +497,14 @@ 
      * @param string $abbreviation
      * @return void
      */
-    public function setAbbreviation($abbreviation){
+    public function setAbbreviation($abbreviation) {
         $this->abbreviation = $abbreviation;
     }
 
     /**
      * @return string
      */
-    public function getAbbreviation(){
+    public function getAbbreviation() {
         return $this->abbreviation;
     }
 
@@ -512,7 +512,7 @@ 
      * @param ArrayCollection $phrases
      * @return void
      */
-    public function setPhrases($phrases){
+    public function setPhrases($phrases) {
         $this->phrases = $phrases;
     }
 
@@ -520,7 +520,7 @@ 
      *
      * @return ArrayCollection
      */
-    public function getPhrases(){
+    public function getPhrases() {
         return $this->phrases;
     }
 
@@ -555,7 +555,7 @@ 
     /**
      * @return int
      */
-    public function getId(){
+    public function getId() {
         return $this->id;
     }
 
@@ -563,14 +563,14 @@ 
      * @param Phrase $phrase
      * @return void
      */
-    public function setPhrase(Phrase $phrase){
+    public function setPhrase(Phrase $phrase) {
         $this->phrase = $phrase;
     }
 
     /**
      * @return Phrase
      */
-    public function getPhrase(){
+    public function getPhrase() {
         return $this->phrase;
     }
 
@@ -587,14 +587,14 @@ 
      * @param string $definition
      * @return void
      */
-    public function setDefinition($definition){
+    public function setDefinition($definition) {
         $this->definition = $definition;
     }
 
     /**
      * @return string
      */
-    public function getDefinition(){
+    public function getDefinition() {
         return $this->definition;
     }
 }

tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php

Doc Comments +3 added lines

@@ -45,6 +45,9 @@
  */
 class ConvertDoctrine1SchemaTest extends OrmTestCase
 {
+    /**
+     * @param YamlDriver $metadataDriver
+     */
     protected function _createEntityManager($metadataDriver)
     {
         $driverMock = new DriverMock();

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
 use Doctrine\ORM\Mapping\Driver\YamlDriver;
 use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
 use Doctrine\ORM\Tools\ConvertDoctrine1Schema;
-use Doctrine\Tests\Mocks\MetadataDriverMock;
 use Doctrine\Tests\Mocks\EntityManagerMock;
 use Doctrine\Tests\Mocks\ConnectionMock;
 use Doctrine\Tests\Mocks\DriverMock;

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
     {
         $driverMock = new DriverMock();
         $config = new Configuration();
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
         $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
@@ -46,17 +46,17 @@ 
         }
 
         $cme = new ClassMetadataExporter();
-        $converter = new ConvertDoctrine1Schema(__DIR__ . '/doctrine1schema');
+        $converter = new ConvertDoctrine1Schema(__DIR__.'/doctrine1schema');
 
-        $exporter = $cme->getExporter('yml', __DIR__ . '/convert');
+        $exporter = $cme->getExporter('yml', __DIR__.'/convert');
         $exporter->setOverwriteExistingFiles(true);
         $exporter->setMetadata($converter->getMetadata());
         $exporter->export();
 
-        $this->assertTrue(file_exists(__DIR__ . '/convert/User.dcm.yml'));
-        $this->assertTrue(file_exists(__DIR__ . '/convert/Profile.dcm.yml'));
+        $this->assertTrue(file_exists(__DIR__.'/convert/User.dcm.yml'));
+        $this->assertTrue(file_exists(__DIR__.'/convert/Profile.dcm.yml'));
 
-        $metadataDriver = new YamlDriver(__DIR__ . '/convert');
+        $metadataDriver = new YamlDriver(__DIR__.'/convert');
         $em = $this->_createEntityManager($metadataDriver);
         $cmf = new DisconnectedClassMetadataFactory();
         $cmf->setEntityManager($em);
@@ -81,8 +81,8 @@ 
 
     public function tearDown()
     {
-        @unlink(__DIR__ . '/convert/User.dcm.yml');
-        @unlink(__DIR__ . '/convert/Profile.dcm.yml');
-        @rmdir(__DIR__ . '/convert');
+        @unlink(__DIR__.'/convert/User.dcm.yml');
+        @unlink(__DIR__.'/convert/Profile.dcm.yml');
+        @rmdir(__DIR__.'/convert');
     }
 }

tests/Doctrine/Performance/Mock/NonProxyLoadingEntityManager.php

Unused Use Statements -2 removed lines

@@ -4,9 +4,7 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Proxy\ProxyFactory;
-use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\ResultSetMapping;
-use Doctrine\Tests\ORM\Performance\MockUnitOfWork;
 
 /**
  * An entity manager mock that prevents lazy-loading of proxies

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php

Doc Comments +2 added lines, -2 removed lines

@@ -127,7 +127,7 @@ 
     }
 
     /**
-     * @param field_type $fooTitle
+     * @param string $fooTitle
      */
     public function setFooTitle($fooTitle)
     {
@@ -205,7 +205,7 @@ 
     }
 
     /**
-     * @param field_type $barTitle
+     * @param string $barTitle
      */
     public function setBarTitle($barTitle)
     {

lib/Doctrine/ORM/EntityRepository.php

Spacing +4 added lines, -4 removed lines

@@ -301,14 +301,14 @@
      */
     private function resolveMagicCall($method, $by, array $arguments)
     {
-        if (! $arguments) {
-            throw ORMException::findByRequiresParameter($method . $by);
+        if ( ! $arguments) {
+            throw ORMException::findByRequiresParameter($method.$by);
         }
 
         $fieldName = lcfirst(Inflector::classify($by));
 
-        if (! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
-            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method . $by);
+        if ( ! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
+            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method.$by);
         }
 
         return $this->$method([$fieldName => $arguments[0]], ...array_slice($arguments, 1));

tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php

Doc Comments -1 removed lines

@@ -33,7 +33,6 @@
     }
 
     /**
-     * @param \Doctrine\ORM\EntityManager $entityClassName
      * @return \Doctrine\ORM\Mapping\ClassMetadataFactory
      */
     protected function createClassMetadataFactory(EntityManager $em = null)

Indentation +79 added lines, -79 removed lines

@@ -739,7 +739,7 @@ 
         $this->assertEquals($guestGroups['isCascadeMerge'], $adminGroups['isCascadeMerge']);
         $this->assertEquals($guestGroups['isCascadeDetach'], $adminGroups['isCascadeDetach']);
 
-         // assert not override attributes
+            // assert not override attributes
         $this->assertEquals('ddc964_users_groups', $guestGroups['joinTable']['name']);
         $this->assertEquals('user_id', $guestGroups['joinTable']['joinColumns'][0]['name']);
         $this->assertEquals('group_id', $guestGroups['joinTable']['inverseJoinColumns'][0]['name']);
@@ -1166,8 +1166,8 @@ 
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
         $metadata->setPrimaryTable(
             [
-           'name' => 'cms_users',
-           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
+            'name' => 'cms_users',
+            'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
             ]
         );
         $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
@@ -1176,30 +1176,30 @@ 
         $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
         $metadata->mapField(
             [
-           'id' => true,
-           'fieldName' => 'id',
-           'type' => 'integer',
-           'columnName' => 'id',
-           'options' => ['foo' => 'bar', 'unsigned' => false],
+            'id' => true,
+            'fieldName' => 'id',
+            'type' => 'integer',
+            'columnName' => 'id',
+            'options' => ['foo' => 'bar', 'unsigned' => false],
             ]
         );
         $metadata->mapField(
             [
-           'fieldName' => 'name',
-           'type' => 'string',
-           'length' => 50,
-           'unique' => true,
-           'nullable' => true,
-           'columnName' => 'name',
-           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
+            'fieldName' => 'name',
+            'type' => 'string',
+            'length' => 50,
+            'unique' => true,
+            'nullable' => true,
+            'columnName' => 'name',
+            'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
             ]
         );
         $metadata->mapField(
             [
-           'fieldName' => 'email',
-           'type' => 'string',
-           'columnName' => 'user_email',
-           'columnDefinition' => 'CHAR(32) NOT NULL',
+            'fieldName' => 'email',
+            'type' => 'string',
+            'columnName' => 'user_email',
+            'columnDefinition' => 'CHAR(32) NOT NULL',
             ]
         );
         $mapping = ['fieldName' => 'version', 'type' => 'integer'];
@@ -1208,60 +1208,60 @@ 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
         $metadata->mapOneToOne(
             [
-           'fieldName' => 'address',
-           'targetEntity' => Address::class,
-           'cascade' =>
-           [
-           0 => 'remove',
-           ],
-           'mappedBy' => NULL,
-           'inversedBy' => 'user',
-           'joinColumns' =>
-           [
-           0 =>
-           [
+            'fieldName' => 'address',
+            'targetEntity' => Address::class,
+            'cascade' =>
+            [
+            0 => 'remove',
+            ],
+            'mappedBy' => NULL,
+            'inversedBy' => 'user',
+            'joinColumns' =>
+            [
+            0 =>
+            [
             'name' => 'address_id',
             'referencedColumnName' => 'id',
             'onDelete' => 'CASCADE',
-           ],
-           ],
-           'orphanRemoval' => false,
+            ],
+            ],
+            'orphanRemoval' => false,
             ]
         );
         $metadata->mapOneToMany(
             [
-           'fieldName' => 'phonenumbers',
-           'targetEntity' => Phonenumber::class,
-           'cascade' =>
-           [
-           1 => 'persist',
-           ],
-           'mappedBy' => 'user',
-           'orphanRemoval' => true,
-           'orderBy' =>
-           [
-           'number' => 'ASC',
-           ],
+            'fieldName' => 'phonenumbers',
+            'targetEntity' => Phonenumber::class,
+            'cascade' =>
+            [
+            1 => 'persist',
+            ],
+            'mappedBy' => 'user',
+            'orphanRemoval' => true,
+            'orderBy' =>
+            [
+            'number' => 'ASC',
+            ],
             ]
         );
         $metadata->mapManyToMany(
             [
-           'fieldName' => 'groups',
-           'targetEntity' => Group::class,
-           'cascade' =>
-           [
-           0 => 'remove',
-           1 => 'persist',
-           2 => 'refresh',
-           3 => 'merge',
-           4 => 'detach',
-           ],
-           'mappedBy' => NULL,
-           'joinTable' =>
-           [
-           'name' => 'cms_users_groups',
-           'joinColumns' =>
-           [
+            'fieldName' => 'groups',
+            'targetEntity' => Group::class,
+            'cascade' =>
+            [
+            0 => 'remove',
+            1 => 'persist',
+            2 => 'refresh',
+            3 => 'merge',
+            4 => 'detach',
+            ],
+            'mappedBy' => NULL,
+            'joinTable' =>
+            [
+            'name' => 'cms_users_groups',
+            'joinColumns' =>
+            [
             0 =>
             [
             'name' => 'user_id',
@@ -1269,18 +1269,18 @@ 
             'unique' => false,
             'nullable' => false,
             ],
-           ],
-           'inverseJoinColumns' =>
-           [
+            ],
+            'inverseJoinColumns' =>
+            [
             0 =>
             [
             'name' => 'group_id',
             'referencedColumnName' => 'id',
             'columnDefinition' => 'INT NULL',
             ],
-           ],
-           ],
-           'orderBy' => NULL,
+            ],
+            ],
+            'orderBy' => NULL,
             ]
         );
         $metadata->table['uniqueConstraints'] = [
@@ -1391,9 +1391,9 @@ 
     {
         $metadata->mapField(
             [
-           'id'                 => true,
-           'fieldName'          => 'id',
-           'columnDefinition'   => 'INT unsigned NOT NULL',
+            'id'                 => true,
+            'fieldName'          => 'id',
+            'columnDefinition'   => 'INT unsigned NOT NULL',
             ]
         );
 
@@ -1422,16 +1422,16 @@ 
      * @Column(type="integer")
      * @GeneratedValue(strategy="NONE")
      **/
-   public $id;
+    public $id;
 
-   public static function loadMetadata(ClassMetadataInfo $metadata)
+    public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-         $metadata->mapField(
-             [
-           'id'                 => true,
-           'fieldName'          => 'id',
-             ]
-         );
+            $metadata->mapField(
+                [
+            'id'                 => true,
+            'fieldName'          => 'id',
+                ]
+            );
 
         $metadata->setDiscriminatorColumn(
             [

Spacing +46 added lines, -46 removed lines

@@ -605,13 +605,13 @@ 
 
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
         $this->assertEquals('find-by-id', $findByIdQuery['name']);
-        $this->assertEquals(CmsAddress::class,$findByIdQuery['resultClass']);
-        $this->assertEquals('SELECT * FROM cms_addresses WHERE id = ?',  $findByIdQuery['query']);
+        $this->assertEquals(CmsAddress::class, $findByIdQuery['resultClass']);
+        $this->assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']);
 
         $countQuery = $class->getNamedNativeQuery('count');
         $this->assertEquals('count', $countQuery['name']);
         $this->assertEquals('mapping-count', $countQuery['resultSetMapping']);
-        $this->assertEquals('SELECT COUNT(*) AS count FROM cms_addresses',  $countQuery['query']);
+        $this->assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']);
 
         // result set mapping
         $this->assertCount(3, $class->sqlResultSetMappings);
@@ -622,9 +622,9 @@ 
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
         $this->assertEquals('mapping-find-all', $findAllMapping['name']);
         $this->assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']);
-        $this->assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
 
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
         $this->assertEquals('mapping-without-fields', $withoutFieldsMapping['name']);
@@ -650,62 +650,62 @@ 
         $this->assertCount(4, $userMetadata->getSqlResultSetMappings());
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress');
-        $this->assertEquals([],$mapping['columns']);
+        $this->assertEquals([], $mapping['columns']);
         $this->assertEquals('mappingJoinedAddress', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],                     $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],                 $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'status'],             $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals(['name'=>'address.zip','column'=>'zip'],           $mapping['entities'][0]['fields'][3]);
-        $this->assertEquals(['name'=>'address.city','column'=>'city'],         $mapping['entities'][0]['fields'][4]);
-        $this->assertEquals(['name'=>'address.country','column'=>'country'],   $mapping['entities'][0]['fields'][5]);
-        $this->assertEquals(['name'=>'address.id','column'=>'a_id'],           $mapping['entities'][0]['fields'][6]);
-        $this->assertEquals($userMetadata->name,                                    $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]);
+        $this->assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]);
+        $this->assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]);
+        $this->assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
 
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
-        $this->assertEquals([],$mapping['columns']);
+        $this->assertEquals([], $mapping['columns']);
         $this->assertEquals('mappingJoinedPhonenumber', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
-        $this->assertEquals($userMetadata->name,                                            $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
-        $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        $this->assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         $this->assertEquals('mappingUserPhonenumberCount', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals($userMetadata->name,                        $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
-        $this->assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        $this->assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         $this->assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']);
         $this->assertNull($mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
-        $this->assertEquals($userMetadata->name,                            $mapping['entities'][0]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]);
+        $this->assertEquals($userMetadata->name, $mapping['entities'][0]['entityClass']);
         $this->assertNull($mapping['entities'][1]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
-        $this->assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
-        $this->assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
-        $this->assertEquals(CmsAddress::class,         $mapping['entities'][1]['entityClass']);
+        $this->assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]);
+        $this->assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]);
+        $this->assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
+        $this->assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']);
 
         //person asserts
         $this->assertCount(1, $personMetadata->getSqlResultSetMappings());
 
         $mapping = $personMetadata->getSqlResultSetMapping('mappingFetchAll');
-        $this->assertEquals([],$mapping['columns']);
+        $this->assertEquals([], $mapping['columns']);
         $this->assertEquals('mappingFetchAll', $mapping['name']);
-        $this->assertEquals('discriminator',                            $mapping['entities'][0]['discriminatorColumn']);
-        $this->assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        $this->assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        $this->assertEquals($personMetadata->name,                      $mapping['entities'][0]['entityClass']);
+        $this->assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']);
+        $this->assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        $this->assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        $this->assertEquals($personMetadata->name, $mapping['entities'][0]['entityClass']);
     }
 
     /*
@@ -746,7 +746,7 @@ 
 
         $this->assertEquals(['user_id'=>'id'], $guestGroups['relationToSourceKeyColumns']);
         $this->assertEquals(['group_id'=>'id'], $guestGroups['relationToTargetKeyColumns']);
-        $this->assertEquals(['user_id','group_id'], $guestGroups['joinTableColumns']);
+        $this->assertEquals(['user_id', 'group_id'], $guestGroups['joinTableColumns']);
 
 
         $this->assertEquals('ddc964_users_admingroups', $adminGroups['joinTable']['name']);
@@ -755,7 +755,7 @@ 
 
         $this->assertEquals(['adminuser_id'=>'id'], $adminGroups['relationToSourceKeyColumns']);
         $this->assertEquals(['admingroup_id'=>'id'], $adminGroups['relationToTargetKeyColumns']);
-        $this->assertEquals(['adminuser_id','admingroup_id'], $adminGroups['joinTableColumns']);
+        $this->assertEquals(['adminuser_id', 'admingroup_id'], $adminGroups['joinTableColumns']);
 
 
         // assert address association mappings
@@ -833,8 +833,8 @@ 
         $this->assertTrue($adminMetadata->fieldMappings['id']['id']);
         $this->assertEquals('id', $adminMetadata->fieldMappings['id']['fieldName']);
         $this->assertEquals('user_id', $adminMetadata->fieldMappings['id']['columnName']);
-        $this->assertEquals(['user_id'=>'id','user_name'=>'name'], $adminMetadata->fieldNames);
-        $this->assertEquals(['id'=>'user_id','name'=>'user_name'], $adminMetadata->columnNames);
+        $this->assertEquals(['user_id'=>'id', 'user_name'=>'name'], $adminMetadata->fieldNames);
+        $this->assertEquals(['id'=>'user_id', 'name'=>'user_name'], $adminMetadata->columnNames);
         $this->assertEquals(150, $adminMetadata->fieldMappings['id']['length']);
 
 
@@ -848,8 +848,8 @@ 
         $this->assertTrue($guestMetadata->fieldMappings['id']['id']);
         $this->assertEquals('guest_id', $guestMetadata->fieldMappings['id']['columnName']);
         $this->assertEquals('id', $guestMetadata->fieldMappings['id']['fieldName']);
-        $this->assertEquals(['guest_id'=>'id','guest_name'=>'name'], $guestMetadata->fieldNames);
-        $this->assertEquals(['id'=>'guest_id','name'=>'guest_name'], $guestMetadata->columnNames);
+        $this->assertEquals(['guest_id'=>'id', 'guest_name'=>'name'], $guestMetadata->fieldNames);
+        $this->assertEquals(['id'=>'guest_id', 'name'=>'guest_name'], $guestMetadata->columnNames);
         $this->assertEquals(140, $guestMetadata->fieldMappings['id']['length']);
 
         $this->assertEquals('name', $guestMetadata->fieldMappings['name']['fieldName']);