Fix code style

Author: jaapio

src/Specification/AndSpecification.php

@@ -14,8 +14,6 @@
 namespace Flyfinder\Specification;
 
 /**
- * Class AndSpecification
- *
  * @psalm-immutable
  */
 final class AndSpecification extends CompositeSpecification

src/Specification/CompositeSpecification.php

@@ -14,7 +14,6 @@
 namespace Flyfinder\Specification;
 
 /**
- * Class CompositeSpecification
  * Base class for specifications, allows for combining specifications
  *
  * @psalm-immutable

src/Specification/Glob.php

@@ -84,11 +84,7 @@ public function isSatisfiedBy(array $value) : bool
             return false;
         }
 
-        if (preg_match($this->regex, $path)) {
-            return true;
-        }
-
-        return false;
+        return preg_match($this->regex, $path) === 1;
     }
 
     /**
@@ -118,6 +114,7 @@ private static function getStaticPrefix(string $glob) : string
                     if (self::isRecursiveWildcard($glob, $i)) {
                         break 2;
                     }
+
                     break;
                 case '*':
                 case '?':
@@ -134,6 +131,7 @@ private static function getStaticPrefix(string $glob) : string
                     break;
             }
         }
+
         return $prefix;
     }
 
@@ -151,6 +149,7 @@ private static function getBoundedPrefix(string $glob) : string
                     if (self::isRecursiveWildcard($glob, $i)) {
                         break 2;
                     }
+
                     break;
                 case '\\':
                     [$unescaped, $consumedChars] = self::scanBackslashSequence($glob, $i);
@@ -162,13 +161,15 @@ private static function getBoundedPrefix(string $glob) : string
                     break;
             }
         }
+
         return $prefix;
     }
 
     private static function getTotalPrefix(string $glob) : ?string
     {
         self::assertValidGlob($glob);
         $matches = [];
+
         return preg_match('~(?<!\\\\)/\\*\\*(?:/\\*\\*?)+$~', $glob, $matches)
             ? substr($glob, 0, strlen($glob)-strlen($matches[0]))
             : null;
@@ -202,6 +203,7 @@ private static function scanBackslashSequence(string $glob, int $offset) : array
             default:
                 $result .= '\\';
         }
+
         return [$result, $offset - $startOffset];
     }
 
@@ -268,6 +270,7 @@ private static function toRegEx(string $glob) : string
                     } else {
                         $regex .= '/';
                     }
+
                     break;
                 case '*':
                     $regex .= '[^/]*';
@@ -286,6 +289,7 @@ private static function toRegEx(string $glob) : string
                     } else {
                         $regex .= '}';
                     }
+
                     break;
                 case ',':
                     $regex .= $curlyLevels > 0 ? '|' : ',';
@@ -297,6 +301,7 @@ private static function toRegEx(string $glob) : string
                         $regex .= '^';
                         ++$i;
                     }
+
                     break;
                 case ']':
                     $regex   .= $inSquare ? ']' : '\\]';
@@ -326,24 +331,28 @@ private static function toRegEx(string $glob) : string
                                 $regex .= '\\\\';
                         }
                     }
+
                     break;
                 default:
                     $regex .= $c;
                     break;
             }
         }
+
         if ($inSquare) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid glob: missing ] in %s',
                 $glob
             ));
         }
+
         if ($curlyLevels > 0) {
             throw new InvalidArgumentException(sprintf(
                 'Invalid glob: missing } in %s',
                 $glob
             ));
         }
+
         return $delimiter . '^' . $regex . '$' . $delimiter;
     }
 
@@ -358,6 +367,7 @@ public function canBeSatisfiedBySomethingBelow(array $value) : bool
         $prefixValue               = $value;
         $prefixValue['path']       = $valuePathPrefix;
         $spec                      = new Glob($boundedPrefixGlob);
+
         return $spec->isSatisfiedBy($prefixValue);
     }
 
@@ -367,9 +377,11 @@ public function willBeSatisfiedByEverythingBelow(array $value) : bool
         if ($this->totalPrefix === null) {
             return false;
         }
+
         $spec                    = new Glob(rtrim($this->totalPrefix, '/') . '/**/*');
         $terminatedValue         = $value;
         $terminatedValue['path'] = rtrim($terminatedValue['path'], '/') . '/x/x';
+
         return $spec->isSatisfiedBy($terminatedValue);
     }
 }

src/Specification/HasExtension.php

@@ -16,7 +16,6 @@
 use function in_array;
 
 /**
- * Class HasExtension
  * Files and directories meet the specification if they have the given extension
  *
  * @psalm-immutable
@@ -41,6 +40,6 @@ public function __construct(array $extensions)
      */
     public function isSatisfiedBy(array $value) : bool
     {
-        return isset($value['extension']) && in_array($value['extension'], $this->extensions, false) ? true : false;
+        return isset($value['extension']) && in_array($value['extension'], $this->extensions, false);
     }
 }

src/Specification/InPath.php

@@ -24,8 +24,6 @@
 use function str_replace;
 
 /**
- * Class InPath
- *
  * Files *and directories* meet the specification if they are in the given path.
  * Note this behavior is different than in Finder, in that directories *can* meet the spec,
  * whereas Finder would never return a directory as "found".
@@ -98,6 +96,7 @@ public function canBeSatisfiedBySomethingBelow(array $value) : bool
         $valueSegments      = explode('/', $value['path']);
         $pathPrefixSegments = array_slice($pathSegments, 0, min(count($pathSegments), count($valueSegments)));
         $spec               = new InPath(new Path(implode('/', $pathPrefixSegments)));
+
         return $spec->isSatisfiedBy($value);
     }
 

src/Specification/IsHidden.php

@@ -16,7 +16,6 @@
 use function substr;
 
 /**
- * Class IsHidden
  * Files or directories meet the specification if they are hidden
  *
  * @psalm-immutable

src/Specification/NotSpecification.php

@@ -14,8 +14,6 @@
 namespace Flyfinder\Specification;
 
 /**
- * Class NotSpecification
- *
  * @psalm-immutable
  */
 final class NotSpecification extends CompositeSpecification

src/Specification/OrSpecification.php

@@ -14,8 +14,6 @@
 namespace Flyfinder\Specification;
 
 /**
- * Class OrSpecification
- *
  * @psalm-immutable
  */
 final class OrSpecification extends CompositeSpecification

tests/unit/FinderTest.php

@@ -165,7 +165,6 @@ public function testIfNegatedAndCullsExactMatches() : void
         );
     }
 
-
     /**
      * @covers ::handle
      * @covers ::setFilesystem
@@ -349,6 +348,7 @@ protected function generatorToFileList(Generator $generator) : array
             return $v['path'];
         }, iterator_to_array($generator)));
         sort($actual);
+
         return $actual;
     }
 
@@ -396,17 +396,21 @@ protected function mockFileTree(array $pathList) : array
                             'contents' => [],
                         ];
                     }
+
                     if ($child!==null) {
                         $result[$path]['contents'][] = $child;
                     }
+
                     if ($existed) {
                         break;
                     }
                 }
+
                 $child = $info['basename'];
                 $path  = $info['dirname'];
             }
         }
+
         return $result;
     }
 
@@ -421,13 +425,15 @@ protected function mockListContents(array $fileTreeMock, string $path) : array
         if (substr($path . '  ', 0, 2)==='./') {
             $path = substr($path, 2);
         }
+
         if ($path==='') {
             $path = '.';
         }
 
         if (!isset($fileTreeMock[$path]) || $fileTreeMock[$path]['type'] === 'file') {
             return [];
         }
+
         $result = [];
         foreach ($fileTreeMock[$path]['contents'] as $basename) {
             $childPath = ($path==='.' ? '' : $path . '/') . $basename;
@@ -437,6 +443,7 @@ protected function mockListContents(array $fileTreeMock, string $path) : array
 
             $result[$basename] = $fileTreeMock[$childPath];
         }
+
         return $result;
     }
 
@@ -452,8 +459,10 @@ protected function mockFileSystem(array $paths, array $pathsThatShouldNotBeListe
             ->zeroOrMoreTimes()
             ->andReturnUsing(function (string $path) use ($fsData, $pathsThatShouldNotBeListed) : array {
                 $this->assertNotContains($path, $pathsThatShouldNotBeListed);
+
                 return array_values($this->mockListContents($fsData, $path));
             });
+
         return $filesystem;
     }
 }

tests/unit/Specification/GlobTest.php

@@ -123,6 +123,7 @@ public function matchingPatternFileWithEscapeCharProvider() : Generator
 
         foreach ($escapeChars as $char) {
             $file = sprintf('/src/test\\%s.php', $char);
+
             yield $file => [
                 $file,
                 ['path' => sprintf('src/test%s.php', $char)],