doctrine / orm

tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php

Doc Comments +9 added lines, -1 removed lines

@@ -57,6 +57,9 @@ 
         return EntityManagerMock::create($connection, $config, $eventManager);
     }
 
+    /**
+     * @param string $path
+     */
     protected function createMetadataDriver($type, $path)
     {
         $mappingDriver = [
@@ -75,6 +78,9 @@ 
         return $driver;
     }
 
+    /**
+     * @param EntityManagerMock $em
+     */
     protected function createClassMetadataFactory($em, $type)
     {
         $factory = ($type === 'annotation')
@@ -294,7 +300,6 @@ 
 
     /**
      * @depends testOneToManyAssociationsAreExported
-     * @param ClassMetadata $metadata
      */
     public function testManyToManyAssociationsAreExported($class)
     {
@@ -406,6 +411,9 @@ 
 #        $this->deleteDirectory(__DIR__ . '/export/'.$this->getType());
     }
 
+    /**
+     * @param string $path
+     */
     protected function deleteDirectory($path)
     {
         if (is_file($path)) {

Indentation +1 added lines, -1 removed lines

@@ -381,7 +381,7 @@
 
         self::assertEquals('user', $property->getInversedBy());
     }
-	/**
+    /**
      * @depends testExportDirectoryAndFilesAreCreated
      */
     public function testCascadeAllCollapsed()

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
-use Doctrine\ORM\Mapping\Driver\PHPDriver;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\OneToManyAssociationMetadata;
 use Doctrine\ORM\Proxy\Factory\ProxyFactory;

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
@@ -65,7 +65,7 @@ 
             'xml'        => XmlDriver::class,
         ];
 
-        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
+        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '".$type."'.");
 
         $class  = $mappingDriver[$type];
         $driver = ($type === 'annotation')
@@ -88,10 +88,10 @@ 
 
     public function testExportDirectoryAndFilesAreCreated()
     {
-        $this->deleteDirectory(__DIR__ . '/export/'.$this->getType());
+        $this->deleteDirectory(__DIR__.'/export/'.$this->getType());
 
         $type = $this->getType();
-        $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/' . $type);
+        $metadataDriver = $this->createMetadataDriver($type, __DIR__.'/'.$type);
         $em = $this->createEntityManager($metadataDriver);
         $cmf = $this->createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -103,7 +103,7 @@ 
 
         $type = $this->getType();
         $cme = new ClassMetadataExporter();
-        $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
+        $exporter = $cme->getExporter($type, __DIR__.'/export/'.$type);
 
         if ($type === 'annotation') {
             $exporter->setEntityGenerator(new EntityGenerator());
@@ -115,9 +115,9 @@ 
         $exporter->export();
 
         if ($type == 'annotation') {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->extension));
         } else {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension));
         }
     }
 
@@ -128,7 +128,7 @@ 
     {
         $type = $this->getType();
 
-        $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/export/' . $type);
+        $metadataDriver = $this->createMetadataDriver($type, __DIR__.'/export/'.$type);
         $em = $this->createEntityManager($metadataDriver);
         $cmf = $this->createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -381,7 +381,7 @@ 
         $type = $this->getType();
 
         if ($type === 'xml') {
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
 
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:one-to-many[@field='interests']/d:cascade/d:*");
@@ -405,10 +405,10 @@ 
         if (is_file($path)) {
             return unlink($path);
         } else if (is_dir($path)) {
-            $files = glob(rtrim($path,'/').'/*');
+            $files = glob(rtrim($path, '/').'/*');
 
             if (is_array($files)) {
-                foreach ($files as $file){
+                foreach ($files as $file) {
                     $this->deleteDirectory($file);
                 }
             }

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

Doc Comments +12 added lines

@@ -654,6 +654,9 @@ 
         return $this->items;
     }
 
+    /**
+     * @param string $value
+     */
     public function setTransient($value) {
         if ($value != $this->transient) {
             $this->onPropertyChanged('transient', $this->transient, $value);
@@ -665,6 +668,9 @@ 
         return $this->data;
     }
 
+    /**
+     * @param string $data
+     */
     public function setData($data) {
         if ($data != $this->data) {
             $this->onPropertyChanged('data', $this->data, $data);
@@ -677,6 +683,9 @@ 
         $this->listeners[] = $listener;
     }
 
+    /**
+     * @param string $propName
+     */
     protected function onPropertyChanged($propName, $oldValue, $newValue) {
         if ($this->listeners) {
             foreach ($this->listeners as $listener) {
@@ -707,6 +716,9 @@ 
         return $this->owner;
     }
 
+    /**
+     * @param NotifyChangedEntity|null $owner
+     */
     public function setOwner($owner) {
         $this->owner = $owner;
     }

Unused Use Statements -3 removed lines

@@ -7,10 +7,8 @@ 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\EventManager;
 use Doctrine\Common\NotifyPropertyChanged;
-use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
 use Doctrine\Common\PropertyChangedListener;
 use Doctrine\ORM\Annotation as ORM;
-use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataBuildingContext;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
@@ -24,7 +22,6 @@ 
 use Doctrine\Tests\Mocks\EntityPersisterMock;
 use Doctrine\Tests\Mocks\UnitOfWorkMock;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
-use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\Forum\ForumAvatar;
 use Doctrine\Tests\Models\Forum\ForumUser;
 use Doctrine\Tests\Models\GeoNames\City;

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM;
 
@@ -450,7 +450,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, ''],
         ];
@@ -481,7 +481,7 @@ 
 
     public function entitiesWithInvalidIdentifiersProvider()
     {
-        $firstNullString  = new EntityWithCompositeStringIdentifier();
+        $firstNullString = new EntityWithCompositeStringIdentifier();
 
         $firstNullString->id2 = uniqid('id2', true);
 

tests/Doctrine/Tests/OrmTestCase.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -67,7 +67,7 @@ 
     {
         $reader = new Annotations\CachedReader(new Annotations\AnnotationReader(), new ArrayCache());
 
-        Annotations\AnnotationRegistry::registerFile(__DIR__ . "/../../../lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php");
+        Annotations\AnnotationRegistry::registerFile(__DIR__."/../../../lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php");
 
         return new AnnotationDriver($reader, (array) $paths);
     }
@@ -106,7 +106,7 @@ 
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache')
+                realpath(__DIR__.'/Models/Cache')
             ])
         );
 

tests/Doctrine/Tests/TestInit.php

Spacing +9 added lines, -9 removed lines

@@ -2,28 +2,28 @@
 /*
  * This file bootstraps the test environment.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
 error_reporting(E_ALL | E_STRICT);
 date_default_timezone_set('UTC');
 
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
+if (file_exists(__DIR__.'/../../../vendor/autoload.php')) {
     // dependencies were installed via composer - this is the main project
-    require __DIR__ . '/../../../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
+    require __DIR__.'/../../../vendor/autoload.php';
+} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) {
     // installed as a dependency in `vendor`
-    require __DIR__ . '/../../../../../autoload.php';
+    require __DIR__.'/../../../../../autoload.php';
 } else {
     throw new \Exception('Can\'t find autoload.php. Did you install dependencies via composer?');
 }
 
-if ( ! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
-    throw new \Exception("Could not create " . __DIR__."/Proxies Folder.");
+if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) {
+    throw new \Exception("Could not create ".__DIR__."/Proxies Folder.");
 }
 
-if ( ! file_exists(__DIR__ . '/ORM/Proxy/generated') &&  ! mkdir(__DIR__ . '/ORM/Proxy/generated')) {
-    throw new \Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.');
+if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) {
+    throw new \Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.');
 }
 

tests/Doctrine/Tests/DbalTestCase.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Braces +5 added lines, -1 removed lines

@@ -786,7 +786,11 @@
             foreach ($last25queries as $i => $query) {
                 $params = array_map(
                     function($p) {
-                        if (is_object($p)) return get_class($p); else return var_export($p, true);
+                        if (is_object($p)) {
+                            return get_class($p);
+                        } else {
+                            return var_export($p, true);
+                        }
                     },
                     $query['params'] ?: []
                 );

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -402,7 +402,7 @@ 
             $conn->executeUpdate('DELETE FROM RoutingLocation');
         }
 
-        if(isset($this->usedModelSets['navigation'])) {
+        if (isset($this->usedModelSets['navigation'])) {
             $conn->executeUpdate('DELETE FROM navigation_tour_pois');
             $conn->executeUpdate('DELETE FROM navigation_photos');
             $conn->executeUpdate('DELETE FROM navigation_pois');
@@ -410,7 +410,7 @@ 
             $conn->executeUpdate('DELETE FROM navigation_countries');
         }
         if (isset($this->usedModelSets['directorytree'])) {
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file"));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeUpdate('DELETE FROM Directory');
@@ -500,12 +500,12 @@ 
                 )
             );
 
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-group"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-phone"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-user"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-address"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
         }
 
         if (isset($this->usedModelSets['vct_onetoone'])) {
@@ -640,15 +640,15 @@ 
     {
         $this->setUpDBALTypes();
 
-        if (! isset(static::$sharedConn)) {
+        if ( ! isset(static::$sharedConn)) {
             static::$sharedConn = TestUtil::getConnection();
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
             } else if (static::$sharedConn->getDatabasePlatform()->getName() === "oracle") {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
             }
         }
 
@@ -658,7 +658,7 @@ 
         }
 
         foreach ($this->usedModelSets as $setName => $bool) {
-            if (! isset(static::$tablesCreated[$setName])) {
+            if ( ! isset(static::$tablesCreated[$setName])) {
                 $this->setUpEntitySchema(static::$modelSets[$setName]);
 
                 static::$tablesCreated[$setName] = true;
@@ -733,8 +733,8 @@ 
 
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames')
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames')
             ])
         );
 
@@ -798,9 +798,9 @@ 
             $trace = $e->getTrace();
             $traceMsg = "";
 
-            foreach($trace AS $part) {
-                if(isset($part['file'])) {
-                    if(strpos($part['file'], "PHPUnit/") !== false) {
+            foreach ($trace AS $part) {
+                if (isset($part['file'])) {
+                    if (strpos($part['file'], "PHPUnit/") !== false) {
                         // Beginning with PHPUnit files we don't print the trace anymore.
                         break;
                     }
@@ -811,7 +811,7 @@ 
 
             $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg;
 
-            throw new \Exception($message, (int)$e->getCode(), $e);
+            throw new \Exception($message, (int) $e->getCode(), $e);
         }
 
         throw $e;

tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM;
 

tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Utility;
 

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;