Updated doctrine/coding-standard to 6.0

composer.json

@@ -29,7 +29,7 @@
     },
     "require-dev": {
         "phpstan/phpstan": "^0.8",
-        "doctrine/coding-standard": "^5.0",
+        "doctrine/coding-standard": "^6.0",
         "phpunit/phpunit": "^7.0"
     },
     "conflict": {

lib/Doctrine/Persistence/Mapping/AbstractClassMetadataFactory.php

@@ -395,6 +395,7 @@ public function getReflectionService()
         if ($this->reflectionService === null) {
             $this->reflectionService = new RuntimeReflectionService();
         }
+
         return $this->reflectionService;
     }
 

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

@@ -180,6 +180,7 @@ public function isTransient($className)
                 return false;
             }
         }
+
         return true;
     }
 

lib/Doctrine/Persistence/Mapping/Driver/MappingDriverChain.php

@@ -75,12 +75,14 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
         foreach ($this->drivers as $namespace => $driver) {
             if (strpos($className, $namespace) === 0) {
                 $driver->loadMetadataForClass($className, $metadata);
+
                 return;
             }
         }
 
         if ($this->defaultDriver !== null) {
             $this->defaultDriver->loadMetadataForClass($className, $metadata);
+
             return;
         }
 

lib/Doctrine/Persistence/Mapping/StaticReflectionService.php

@@ -28,6 +28,7 @@ public function getClassShortName($className)
         if (strpos($className, '\\') !== false) {
             $className = substr($className, strrpos($className, '\\') + 1);
         }
+
         return $className;
     }
 
@@ -40,6 +41,7 @@ public function getClassNamespace($className)
         if (strpos($className, '\\') !== false) {
             $namespace = strrev(substr(strrev($className), strpos(strrev($className), '\\') + 1));
         }
+
         return $namespace;
     }
 

tests/Doctrine/Tests/Persistence/ManagerRegistryTest.php

@@ -81,7 +81,8 @@ public function testResetManager()
     private function getManagerFactory()
     {
         return function () {
-            $mock     = $this->createMock(ObjectManager::class);
+            $mock = $this->createMock(ObjectManager::class);
+
             $driver   = $this->createMock(MappingDriver::class);
             $metadata = $this->createMock(ClassMetadata::class);
             $mock->method('getMetadataFactory')->willReturn(new TestClassMetadataFactory($driver, $metadata));

tests/Doctrine/Tests/Persistence/Mapping/ClassMetadataFactoryTest.php

@@ -203,6 +203,7 @@ protected function getDriver()
     {
         return $this->driver;
     }
+
     protected function wakeupReflection(ClassMetadata $class, ReflectionService $reflService)
     {
     }

tests/Doctrine/Tests/Persistence/Mapping/FileDriverTest.php

@@ -142,6 +142,7 @@ private function newLocator()
         $locator = $this->createMock(FileLocator::class);
         $locator->expects($this->any())->method('getFileExtension')->will($this->returnValue('.yml'));
         $locator->expects($this->any())->method('getPaths')->will($this->returnValue([__DIR__ . '/_files']));
+
         return $locator;
     }
 }
@@ -153,6 +154,7 @@ protected function loadMappingFile($file)
         if (strpos($file, 'global.yml') !== false) {
             return ['stdGlobal' => 'stdGlobal', 'stdGlobal2' => 'stdGlobal2'];
         }
+
         return ['stdClass' => 'stdClass'];
     }
 

tests/Doctrine/Tests/Persistence/Mapping/SymfonyFileLocatorTest.php

@@ -159,7 +159,6 @@ public function testFindMappingFileWithCustomNsSeparator($separator, $dir, $file
         }
     }
 
-
     public function testFindMappingFile()
     {
         $path   = __DIR__ . '/_files';

tests/Doctrine/Tests/Persistence/PersistentObjectTest.php

@@ -184,6 +184,7 @@ class TestObjectMetadata implements ClassMetadata
     public function getAssociationMappedByTargetField($assocName)
     {
         $assoc = ['children' => 'parent'];
+
         return $assoc[$assocName];
     }
 
@@ -220,6 +221,7 @@ public function getReflectionClass()
     public function getTypeOfField($fieldName)
     {
         $types = ['id' => 'integer', 'name' => 'string'];
+
         return $types[$fieldName];
     }