Apply CodeSniffer (#273)

.gitignore

@@ -12,6 +12,5 @@
 /vendor/
 /vendor-bin/*/vendor/
 /vendor-bin/*/bin/
-/.travis/
-!/.travis/.gitkeep
-!/.travis/secrets.tar.enc
+/.phpcs-cache
+/phpcs.xml

Makefile

@@ -23,7 +23,7 @@ CODE_SNIFFER_FIX=vendor-bin/code-sniffer/vendor/bin/phpcbf
 cs:	## Fixes CS
 cs: $(CODE_SNIFFER) $(CODE_SNIFFER_FIX)
 	$(PHPNOGC) $(CODE_SNIFFER_FIX) || true
-	$(PHPNOGC) $(PHP_CS_FIXER) fix
+	$(PHPNOGC) $(CODE_SNIFFER)
 
 .PHONY: build
 build:	## Build the PHAR

phpcs.xml.dist

@@ -10,10 +10,6 @@
     <arg name="colors"/>
     <arg value="ps"/>
 
-    <file>fixtures</file>
-    <exclude-pattern>default_stub\.php</exclude-pattern>
-    <exclude-pattern>/vendor/</exclude-pattern>
-    <exclude-pattern>/build/</exclude-pattern>
     <file>src</file>
     <file>tests</file>
 

src/Autoload/ScoperAutoloadGenerator.php

@@ -100,7 +100,7 @@ public function dump(string $prefix): string
     private function createClassAliasStatements(array $whitelistedClasses, bool $hasNamespacedFunctions): array
     {
         $statements = array_map(
-            function (string $prefixedClass): string {
+            static function (string $prefixedClass): string {
                 return sprintf(
                     'class_exists(\'%s\');',
                     $prefixedClass
@@ -118,7 +118,7 @@ function (string $prefixedClass): string {
 
         if ($hasNamespacedFunctions) {
             $statements = array_map(
-                function (string $statement): string {
+                static function (string $statement): string {
                     return str_repeat(' ', 4).$statement;
                 },
                 $statements
@@ -145,7 +145,7 @@ function (string $statement): string {
     private function createFunctionAliasStatements(array $whitelistedFunctions, bool $hasNamespacedFunctions): array
     {
         $statements = array_map(
-            function (array $node) use ($hasNamespacedFunctions): string {
+            static function (array $node) use ($hasNamespacedFunctions): string {
                 /**
                  * @var string
                  * @var string $alias

src/Configuration.php

@@ -499,7 +499,7 @@ private static function retrieveFilesFromPaths(array $paths): iterable
         $finder->files()
             ->in($pathsToSearch)
             ->append($filesToAppend)
-            ->filter(function (SplFileInfo $fileInfo): ?bool {
+            ->filter(static function (SplFileInfo $fileInfo): ?bool {
                 if ($fileInfo->isLink()) {
                     return false;
                 }
@@ -521,7 +521,7 @@ private static function retrieveFilesWithContents(Iterator $files): array
     {
         return array_reduce(
             iterator_to_array($files),
-            function (array $files, SplFileInfo $fileInfo): array {
+            static function (array $files, SplFileInfo $fileInfo): array {
                 $file = $fileInfo->getRealPath();
 
                 if (false === $file) {

src/Console/Command/AddPrefixCommand.php

@@ -215,7 +215,7 @@ private function scopeFiles(
 
         usort(
             $vendorDirs,
-            function ($a, $b) {
+            static function ($a, $b) {
                 return strlen($b) <=> strlen($a);
             }
         );
@@ -287,7 +287,7 @@ private function validatePaths(InputInterface $input): void
         $fileSystem = $this->fileSystem;
 
         $paths = array_map(
-            function (string $path) use ($cwd, $fileSystem) {
+            static function (string $path) use ($cwd, $fileSystem) {
                 if (false === $fileSystem->isAbsolutePath($path)) {
                     return $cwd.DIRECTORY_SEPARATOR.$path;
                 }

src/PhpParser/NodeTraverser.php

@@ -149,7 +149,7 @@ private function replaceGroupUseStatements(array $nodes): array
     private function createUses_(GroupUse $node): array
     {
         return array_map(
-            function (UseUse $use) use ($node): Use_ {
+            static function (UseUse $use) use ($node): Use_ {
                 $newUse = new UseUse(
                     Name::concat($node->prefix, $use->name, $use->name->getAttributes()),
                     $use->alias,

src/PhpParser/NodeVisitor/Collection/NamespaceStmtCollection.php

@@ -46,7 +46,7 @@ final class NamespaceStmtCollection implements IteratorAggregate, Countable
      * @param Namespace_ $node         New namespace, may have been prefixed.
      * @param Namespace_ $originalName Original unchanged namespace.
      */
-    public function add(Namespace_ $node, Namespace_ $originalName)
+    public function add(Namespace_ $node, Namespace_ $originalName): void
     {
         $this->nodes[] = $originalName;
 

src/Scoper/Composer/AutoloadPrefixer.php

@@ -17,6 +17,7 @@
 use Humbug\PhpScoper\Whitelist;
 use stdClass;
 use function array_map;
+use function is_array;
 
 /**
  * @private
@@ -104,11 +105,16 @@ private static function mergePSR0And4(array $psr0, array $psr4): array
         return $psr4;
     }
 
-    private static function updatePSR0Path($path, $namespace)
+    /**
+     * @param string|string[] $path
+     *
+     * @return string|string[]
+     */
+    private static function updatePSR0Path($path, string $namespace)
     {
         $namespaceForPsr = str_replace('\\', '/', $namespace);
 
-        if (!is_array($path)) {
+        if (false === is_array($path)) {
             if ('/' !== substr($path, -1)) {
                 $path .= '/';
             }
@@ -117,6 +123,7 @@ private static function updatePSR0Path($path, $namespace)
 
             return $path;
         }
+
         foreach ($path as $key => $item) {
             if ('/' !== substr($item, -1)) {
                 $item .= '/';
@@ -134,7 +141,7 @@ private static function updatePSR0Path($path, $namespace)
      *       PSR0 | PSR4
      * array      |
      * string     |
-     * or simply the namepace not existing as a psr-4 entry.
+     * or simply the namespace not existing as a psr-4 entry.
      *
      * @param string       $psr0Namespace
      * @param string|array $psr0Path
@@ -172,7 +179,7 @@ private static function mergeNamespaces(string $psr0Namespace, $psr0Path, $psr4)
     private static function prefixLaravelProviders(array $providers, string $prefix, Whitelist $whitelist): array
     {
         return array_map(
-            function (string $provider) use ($prefix, $whitelist): string {
+            static function (string $provider) use ($prefix, $whitelist): string {
                 return $whitelist->belongsToWhitelistedNamespace($provider)
                     ? $provider
                     : sprintf('%s\\%s', $prefix, $provider)

src/Scoper/PatchScoper.php

@@ -35,7 +35,7 @@ public function scope(string $filePath, string $contents, string $prefix, array
 
         return array_reduce(
             $patchers,
-            function (string $contents, callable $patcher) use ($filePath, $prefix): string {
+            static function (string $contents, callable $patcher) use ($filePath, $prefix): string {
                 return $patcher($filePath, $prefix, $contents);
             },
             $contents

src/Throwable/Exception/RuntimeException.php

@@ -14,6 +14,8 @@
 
 namespace Humbug\PhpScoper\Throwable\Exception;
 
-class RuntimeException extends \RuntimeException
+use RuntimeException as RootRuntimeException;
+
+class RuntimeException extends RootRuntimeException
 {
 }

src/Whitelist.php

@@ -118,7 +118,7 @@ public static function create(
     private static function assertValidPattern(string $element): void
     {
         if (1 !== preg_match('/^(([\p{L}_]+\\\\)+)?[\p{L}_]*\*$/u', $element)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 sprintf(
                     'Invalid whitelist pattern "%s".',
                     $element
@@ -272,7 +272,7 @@ public function getClassWhitelistArray(): array
     {
         return array_filter(
             $this->original,
-            function (string $name): bool {
+            static function (string $name): bool {
                 return '*' !== $name && '\*' !== substr($name, -2);
             }
         );

tests/Autoload/ScoperAutoloadGeneratorTest.php

@@ -14,6 +14,7 @@
 
 namespace Humbug\PhpScoper\Autoload;
 
+use Generator;
 use Humbug\PhpScoper\Whitelist;
 use PhpParser\Node\Name\FullyQualified;
 use PHPUnit\Framework\TestCase;
@@ -23,7 +24,7 @@ class ScoperAutoloadGeneratorTest extends TestCase
     /**
      * @dataProvider provideWhitelists
      */
-    public function test_generate_the_autoload(Whitelist $whitelist, string $expected)
+    public function test_generate_the_autoload(Whitelist $whitelist, string $expected): void
     {
         $prefix = 'Humbug';
 
@@ -34,7 +35,7 @@ public function test_generate_the_autoload(Whitelist $whitelist, string $expecte
         $this->assertSame($expected, $actual);
     }
 
-    public function provideWhitelists()
+    public function provideWhitelists(): Generator
     {
         yield 'empty whitelist' => [
             Whitelist::create(true, true, true),
@@ -51,7 +52,7 @@ public function provideWhitelists()
         ];
 
         yield 'whitelist with whitelisted global functions recorded' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true);
 
                 $whitelist->recordWhitelistedFunction(
@@ -92,7 +93,7 @@ function bar() {
         ];
 
         yield 'whitelist with whitelisted namespaced functions recorded' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true);
 
                 $whitelist->recordWhitelistedFunction(
@@ -167,7 +168,7 @@ function baz() {
         ];
 
         yield 'whitelist with whitelisted classes recorded' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true, 'A\Foo', 'B\Bar');
 
                 $whitelist->recordWhitelistedClass(
@@ -194,7 +195,7 @@ class_exists('Humbug\A\Foo');
         ];
 
         yield 'whitelist with whitelisted global classes recorded' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true);
 
                 $whitelist->recordWhitelistedClass(
@@ -227,7 +228,7 @@ class_exists('Humbug\Bar');
         ];
 
         yield 'complete whitelist' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true, 'A\Foo', 'B\Bar');
 
                 $whitelist->recordWhitelistedClass(
@@ -324,7 +325,7 @@ function baz() {
 
         // https://github.com/humbug/php-scoper/issues/267
         yield '__autoload global function with no namespaced functions' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true);
 
                 $whitelist->recordWhitelistedFunction(
@@ -356,7 +357,7 @@ function __autoload($className) {
 
         // https://github.com/humbug/php-scoper/issues/267
         yield '__autoload global function with namespaced functions' => [
-            (function () {
+            (static function () {
                 $whitelist = Whitelist::create(true, true, true);
 
                 $whitelist->recordWhitelistedFunction(

tests/Console/Command/AddPrefixCommandIntegrationTest.php

@@ -51,7 +51,7 @@ protected function setUp(): void
         file_put_contents('scoper.inc.php', '<?php return [];');
     }
 
-    public function test_scope_the_given_paths()
+    public function test_scope_the_given_paths(): void
     {
         $input = [
             'add-prefix',
@@ -71,7 +71,7 @@ public function test_scope_the_given_paths()
         $this->assertFilesAreSame(self::FIXTURE_PATH.'/../scoped', $this->tmp);
     }
 
-    public function test_scope_in_quiet_mode()
+    public function test_scope_in_quiet_mode(): void
     {
         $input = [
             'add-prefix',
@@ -93,7 +93,7 @@ public function test_scope_in_quiet_mode()
         $this->assertSame(0, $this->appTester->getStatusCode());
     }
 
-    public function test_scope_in_normal_mode()
+    public function test_scope_in_normal_mode(): void
     {
         $input = [
             'add-prefix',
@@ -138,7 +138,7 @@ public function test_scope_in_normal_mode()
         $this->assertSame(0, $this->appTester->getStatusCode());
     }
 
-    public function test_scope_in_verbose_mode()
+    public function test_scope_in_verbose_mode(): void
     {
         $input = [
             'add-prefix',
@@ -184,7 +184,7 @@ public function test_scope_in_verbose_mode()
         $this->assertSame(0, $this->appTester->getStatusCode());
     }
 
-    public function test_scope_in_very_verbose_mode()
+    public function test_scope_in_very_verbose_mode(): void
     {
         $input = [
             'add-prefix',
@@ -258,7 +258,7 @@ public function test_scope_in_very_verbose_mode()
         $this->assertSame(0, $this->appTester->getStatusCode());
     }
 
-    private function getNormalizeDisplay(string $display)
+    private function getNormalizeDisplay(string $display): string
     {
         $display = str_replace(realpath(self::FIXTURE_PATH), '/path/to', $display);
         $display = str_replace($this->tmp, '/path/to', $display);
@@ -283,7 +283,7 @@ private function getNormalizeDisplay(string $display)
         return implode("\n", $lines);
     }
 
-    private function assertFilesAreSame(string $expectedDir, string $actualDir)
+    private function assertFilesAreSame(string $expectedDir, string $actualDir): void
     {
         $expected = $this->collectFiles($expectedDir);
 
@@ -304,7 +304,7 @@ private function collectFiles(string $dir): array
 
         return array_reduce(
             iterator_to_array($files),
-            function (array $collectedFiles, SplFileInfo $file) use ($dir): array {
+            static function (array $collectedFiles, SplFileInfo $file) use ($dir): array {
                 $path = str_replace($dir, '', $file->getRealPath());
 
                 $collectedFiles[$path] = file_get_contents($file->getRealPath());