Merge pull request #121 from carusogabriel/task/bump-cs

Update to doctrine/cs v5
Roave · Apr 22, 2019 · 0e78dbd · 0e78dbd
2 parents aefb49b + 95aecd6
commit 0e78dbd
Show file tree

Hide file tree

Showing 58 changed files with 189 additions and 176 deletions.
diff --git a/bin/roave-backward-compatibility-check.php b/bin/roave-backward-compatibility-check.php
@@ -32,8 +32,8 @@
 use Symfony\Component\Console\Output\ConsoleOutput;
 use function file_exists;
 
-(function () : void {
-    (function () : void {
+(static function () : void {
+    (static function () : void {
         $autoloaderLocations = [
             __DIR__ . '/../vendor/autoload.php', // Installed by cloning the project and running `composer install`
             __DIR__ . '/../../../autoload.php',  // Installed via `composer require`
@@ -65,7 +65,7 @@
         new GetVersionCollectionFromGitRepository(),
         new PickLastMinorVersionFromCollection(),
         new LocateDependenciesViaComposer(
-            function (string $installationPath) use ($composerIo) : Installer {
+            static function (string $installationPath) use ($composerIo) : Installer {
                 return Installer::create(
                     $composerIo,
                     (new Factory())->createComposer(

diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
         }
     ],
     "require-dev": {
-        "doctrine/coding-standard": "^4.0",
+        "doctrine/coding-standard": "^5.0",
         "infection/infection": "^0.9.1",
         "phpstan/phpstan": "^0.10.3",
         "phpstan/phpstan-beberlei-assert": "^0.10",
         "phpstan/phpstan-phpunit": "^0.10",
         "phpunit/phpunit": "^7.0",
         "roave/security-advisories": "dev-master",
-        "squizlabs/php_codesniffer": "^3.2",
+        "squizlabs/php_codesniffer": "^3.4",
         "vimeo/psalm": "^2.0"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/CompareClasses.php b/src/CompareClasses.php
@@ -45,12 +45,12 @@ public function __invoke(
         ClassReflector $newSourcesWithDependencies
     ) : Changes {
         $definedApiClassNames = array_map(
-            function (ReflectionClass $class) : string {
+            static function (ReflectionClass $class) : string {
                 return $class->getName();
             },
             array_filter(
                 $definedSymbols->getAllClasses(),
-                function (ReflectionClass $class) : bool {
+                static function (ReflectionClass $class) : bool {
                     return ! $class->isAnonymous();
                 }
             )

diff --git a/src/DetectChanges/BCBreak/ClassBased/ConstantRemoved.php b/src/DetectChanges/BCBreak/ClassBased/ConstantRemoved.php
@@ -23,7 +23,7 @@ public function __invoke(ReflectionClass $fromClass, ReflectionClass $toClass) :
             $this->accessibleConstants($toClass)
         );
 
-        return Changes::fromList(...array_values(array_map(function (ReflectionClassConstant $constant) use ($fromClass) : Change {
+        return Changes::fromList(...array_values(array_map(static function (ReflectionClassConstant $constant) use ($fromClass) : Change {
             return Change::removed(
                 sprintf('Constant %s::%s was removed', $fromClass->getName(), $constant->getName()),
                 true
@@ -34,7 +34,7 @@ public function __invoke(ReflectionClass $fromClass, ReflectionClass $toClass) :
     /** @return ReflectionClassConstant[] */
     private function accessibleConstants(ReflectionClass $class) : array
     {
-        return array_filter($class->getReflectionConstants(), function (ReflectionClassConstant $constant) : bool {
+        return array_filter($class->getReflectionConstants(), static function (ReflectionClassConstant $constant) : bool {
             return $constant->isPublic() || $constant->isProtected();
         });
     }

diff --git a/src/DetectChanges/BCBreak/ClassBased/MethodChanged.php b/src/DetectChanges/BCBreak/ClassBased/MethodChanged.php
@@ -49,7 +49,7 @@ private function methods(ReflectionClass $class) : array
         $methods = $class->getMethods();
 
         return array_combine(
-            array_map(function (ReflectionMethod $method) : string {
+            array_map(static function (ReflectionMethod $method) : string {
                 return strtolower($method->getName());
             }, $methods),
             $methods

diff --git a/src/DetectChanges/BCBreak/ClassBased/MethodRemoved.php b/src/DetectChanges/BCBreak/ClassBased/MethodRemoved.php
@@ -46,12 +46,12 @@ public function __invoke(ReflectionClass $fromClass, ReflectionClass $toClass) :
     /** @return ReflectionMethod[] */
     private function accessibleMethods(ReflectionClass $class) : array
     {
-        $methods = array_filter($class->getMethods(), function (ReflectionMethod $method) : bool {
+        $methods = array_filter($class->getMethods(), static function (ReflectionMethod $method) : bool {
             return $method->isPublic() || $method->isProtected();
         });
 
         return array_combine(
-            array_map(function (ReflectionMethod $method) : string {
+            array_map(static function (ReflectionMethod $method) : string {
                 return $method->getName();
             }, $methods),
             $methods

diff --git a/src/DetectChanges/BCBreak/ClassBased/PropertyRemoved.php b/src/DetectChanges/BCBreak/ClassBased/PropertyRemoved.php
@@ -45,7 +45,7 @@ public function __invoke(ReflectionClass $fromClass, ReflectionClass $toClass) :
     /** @return ReflectionProperty[] */
     private function accessibleProperties(ReflectionClass $class) : array
     {
-        return array_filter($class->getProperties(), function (ReflectionProperty $property) : bool {
+        return array_filter($class->getProperties(), static function (ReflectionProperty $property) : bool {
             return $property->isPublic() || $property->isProtected();
         });
     }

diff --git a/src/DetectChanges/BCBreak/FunctionBased/ParameterDefaultValueChanged.php b/src/DetectChanges/BCBreak/FunctionBased/ParameterDefaultValueChanged.php
@@ -69,13 +69,13 @@ private function defaultParameterValues(ReflectionFunctionAbstract $function) :
     {
         $optionalParameters = array_values(array_filter(
             $function->getParameters(),
-            function (ReflectionParameter $parameter) : bool {
+            static function (ReflectionParameter $parameter) : bool {
                 return $parameter->isDefaultValueAvailable();
             }
         ));
 
         return array_combine(
-            array_map(function (ReflectionParameter $parameter) : int {
+            array_map(static function (ReflectionParameter $parameter) : int {
                 return $parameter->getPosition();
             }, $optionalParameters),
             $optionalParameters

diff --git a/src/DetectChanges/BCBreak/InterfaceBased/MethodAdded.php b/src/DetectChanges/BCBreak/InterfaceBased/MethodAdded.php
@@ -27,7 +27,7 @@ public function __invoke(ReflectionClass $fromInterface, ReflectionClass $toInte
             return Changes::empty();
         }
 
-        return Changes::fromList(...array_values(array_map(function (ReflectionMethod $method) use (
+        return Changes::fromList(...array_values(array_map(static function (ReflectionMethod $method) use (
             $fromInterface
         ) : Change {
             return Change::added(
@@ -47,7 +47,7 @@ private function methods(ReflectionClass $interface) : array
         $methods = $interface->getMethods();
 
         return array_combine(
-            array_map(function (ReflectionMethod $method) : string {
+            array_map(static function (ReflectionMethod $method) : string {
                 return strtolower($method->getName());
             }, $methods),
             $methods

diff --git a/src/DetectChanges/Variance/TypeIsCovariant.php b/src/DetectChanges/Variance/TypeIsCovariant.php
@@ -6,6 +6,7 @@
 
 use Roave\BackwardCompatibility\Support\ArrayHelpers;
 use Roave\BetterReflection\Reflection\ReflectionType;
+use Traversable;
 use function strtolower;
 
 /**
@@ -57,7 +58,7 @@ public function __invoke(
         }
 
         if (strtolower($typeAsString) === 'iterable' && ! $comparedType->isBuiltin()) {
-            if ($comparedType->targetReflectionClass()->implementsInterface(\Traversable::class)) {
+            if ($comparedType->targetReflectionClass()->implementsInterface(Traversable::class)) {
                 // `iterable` can be restricted via any `Iterator` implementation
                 return true;
             }

diff --git a/src/Factory/DirectoryReflectorFactory.php b/src/Factory/DirectoryReflectorFactory.php
@@ -14,11 +14,11 @@
 use Roave\BetterReflection\SourceLocator\Type\SourceLocator;
 
 /**
- * @codeCoverageIgnore
- *
  * @deprecated this class builds a simplistic reflector with a DirectoriesSourceLocator around a given
  *             path: that is no longer the preferred approach.
  *             Please use {@see \Roave\BackwardCompatibilityCheck\Factory\ComposerInstallationReflectorFactory} instead.
+ *
+ * @codeCoverageIgnore
  */
 final class DirectoryReflectorFactory
 {