Merge pull request #78 from cakephp/2.x-cs-cleanup

cleanup CS

Author: LordSimal

.gitignore

@@ -2,3 +2,4 @@
 /composer.lock
 /tools
 .phpunit.result.cache
+.phpcs.cache

composer.json

@@ -43,8 +43,8 @@
             "@cs-check",
             "@test"
         ],
-        "cs-check": "phpcs --colors --parallel=16 -p",
-        "cs-fix": "phpcbf --colors --parallel=16 -p",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "phpstan": "tools/phpstan analyse",
         "stan": "@phpstan",
         "stan-tests": "phpstan.phar analyze -c tests/phpstan.neon",

phpcs.xml

@@ -3,4 +3,8 @@
     <file>src/</file>
     <file>tests/</file>
     <rule ref="CakePHP" />
+    <arg value="nps"/>
+    <arg name="colors"/>
+    <arg name="parallel" value="4"/>
+    <arg name="cache" value=".phpcs.cache"/>
 </ruleset>

src/Plugin.php

@@ -138,7 +138,7 @@ public function postAutoloadDump(Event $event): void
     public function findPlugins(
         array $packages,
         array $pluginDirs = ['plugins'],
-        string $vendorDir = 'vendor'
+        string $vendorDir = 'vendor',
     ): array {
         $plugins = [];
 
@@ -217,7 +217,7 @@ public function writeConfigFile(string $configFile, array $plugins, ?string $roo
             $pluginPath = str_replace(
                 DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR,
                 DIRECTORY_SEPARATOR,
-                $pluginPath
+                $pluginPath,
             );
 
             // Namespaced plugins should use /
@@ -248,7 +248,7 @@ public function writeConfigFile(string $configFile, array $plugins, ?string $roo
         $root = str_replace(
             DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR,
             DIRECTORY_SEPARATOR,
-            $root
+            $root,
         );
 
         // Normalize to *nix paths.
@@ -313,8 +313,8 @@ public function getPrimaryNamespace(PackageInterface $package): string
                     'Unable to get primary namespace for package %s.' .
                     "\nEnsure you have added proper 'autoload' section to your plugin's config" .
                     ' as stated in README on https://github.com/cakephp/plugin-installer',
-                    $package->getName()
-                )
+                    $package->getName(),
+                ),
             );
         }
 

tests/TestCase/PluginTest.php

@@ -84,7 +84,7 @@ public function setUp(): void
         $rm = new RepositoryManager(
             $this->io,
             $config,
-            $httpDownloader
+            $httpDownloader,
         );
         $this->composer->setRepositoryManager($rm);
 
@@ -302,7 +302,7 @@ public function testFindPlugins()
         $return = $this->plugin->findPlugins(
             $packages,
             [$this->path . '/doesnt-exist'],
-            $this->path . '/vendor'
+            $this->path . '/vendor',
         );
 
         $expected = [
@@ -314,7 +314,7 @@ public function testFindPlugins()
         $return = $this->plugin->findPlugins(
             $packages,
             [$this->path . '/plugins'],
-            $this->path . '/vendor'
+            $this->path . '/vendor',
         );
 
         $expected = [
@@ -330,7 +330,7 @@ public function testFindPlugins()
         $return = $this->plugin->findPlugins(
             $packages,
             [$this->path . '/plugins', $this->path . '/app_plugins'],
-            $this->path . '/vendor'
+            $this->path . '/vendor',
         );
 
         $expected = [
@@ -369,22 +369,22 @@ public function testWriteConfigFile()
         $this->assertStringContainsString(
             "'Fee' => \$baseDir . '/plugins/Fee/'",
             $contents,
-            'paths should be relative for app-plugins'
+            'paths should be relative for app-plugins',
         );
         $this->assertStringContainsString(
             "'Princess' => \$baseDir . '/vendor/cakephp/princess/'",
             $contents,
-            'paths should be relative for vendor-plugins'
+            'paths should be relative for vendor-plugins',
         );
         $this->assertStringContainsString(
             "'OddOneOut' => '/some/other/path/'",
             $contents,
-            'paths should stay absolute if it\'s not under the application root'
+            'paths should stay absolute if it\'s not under the application root',
         );
         $this->assertStringContainsString(
             "'Vendor/Plugin' => \$baseDir . '/vendor/vendor/plugin/'",
             $contents,
-            'Plugin namespaces should use forward slash'
+            'Plugin namespaces should use forward slash',
         );
 
         // Ensure all plugin paths are slash terminated
@@ -403,7 +403,7 @@ public function testWriteConfigFile()
         $this->assertSame(
             $expected,
             $result,
-            'The evaluated result should be the same as the input except for namespaced plugin'
+            'The evaluated result should be the same as the input except for namespaced plugin',
         );
     }
 }