satisfy scrutinizer

Author: jaapio

src/Specification/AndSpecification.php

@@ -17,7 +17,7 @@
 /**
  * Class AndSpecification
  */
-final class AndSpecification extends CompositeSpecification implements SpecificationInterface
+final class AndSpecification extends CompositeSpecification
 {
     /**
      * @var SpecificationInterface

src/Specification/IsHidden.php

@@ -27,6 +27,6 @@ class IsHidden extends CompositeSpecification
      */
     public function isSatisfiedBy(array $value): bool
     {
-        return isset($value['basename']) && substr($value['basename'], 0, 1) === '.' ? true : false;
+        return (isset($value['basename']) && substr($value['basename'], 0, 1) === '.');
     }
 }

tests/unit/FinderTest.php

@@ -12,6 +12,8 @@
 
 namespace Flyfinder;
 
+use Flyfinder\Specification\IsHidden;
+use League\Flysystem\Filesystem;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
@@ -52,8 +54,8 @@ public function testGetMethod()
      */
     public function testIfCorrectFilesAreBeingYielded()
     {
-        $isHidden = m::mock('Flyfinder\Specification\IsHidden');
-        $filesystem = m::mock('League\Flysystem\Filesystem');
+        $isHidden = m::mock(IsHidden::class);
+        $filesystem = m::mock(Filesystem::class);
 
         $listContents1 = [
             0 => [

tests/unit/Specification/AndSpecificationTest.php

@@ -21,10 +21,10 @@
  */
 class AndSpecificationTest extends TestCase
 {
-    /** @var HasExtension */
+    /** @var m\MockInterface|HasExtension */
     private $hasExtension;
 
-    /** @var IsHidden */
+    /** @var m\MockInterface|IsHidden */
     private $isHidden;
 
     /** @var AndSpecification */
@@ -35,8 +35,8 @@ class AndSpecificationTest extends TestCase
      */
     public function setUp()
     {
-        $this->hasExtension = m::mock('Flyfinder\Specification\HasExtension');
-        $this->isHidden = m::mock('Flyfinder\Specification\IsHidden');
+        $this->hasExtension = m::mock(HasExtension::class);
+        $this->isHidden = m::mock(IsHidden::class);
         $this->fixture = new AndSpecification($this->hasExtension, $this->isHidden);
     }
 

tests/unit/Specification/CompositeSpecificationTest.php

@@ -21,19 +21,19 @@
  */
 class CompositeSpecificationTest extends TestCase
 {
-    /** @var HasExtension */
+    /** @var m\MockInterface|HasExtension */
     private $hasExtension;
 
-    /** @var m::MockObject|CompositeSpecification */
+    /** @var CompositeSpecification */
     private $fixture;
 
     /**
      * Initializes the fixture for this test.
      */
     public function setUp()
     {
-        $this->hasExtension = m::mock('Flyfinder\Specification\HasExtension');
-        $this->fixture = $this->getMockForAbstractClass('Flyfinder\Specification\CompositeSpecification');
+        $this->hasExtension = m::mock(HasExtension::class);
+        $this->fixture = $this->getMockForAbstractClass(CompositeSpecification::class);
     }
 
     public function tearDown()
@@ -43,36 +43,36 @@ public function tearDown()
 
     /**
      * @covers ::andSpecification
-     * @uses Flyfinder\Specification\AndSpecification
+     * @uses \Flyfinder\Specification\AndSpecification
      */
     public function testAndSpecification()
     {
         $this->assertInstanceOf(
-            'Flyfinder\Specification\AndSpecification',
+            AndSpecification::class,
             $this->fixture->andSpecification($this->hasExtension)
         );
     }
 
     /**
      * @covers ::orSpecification
-     * @uses Flyfinder\Specification\OrSpecification
+     * @uses \Flyfinder\Specification\OrSpecification
      */
     public function testOrSpecification()
     {
         $this->assertInstanceOf(
-            'Flyfinder\Specification\OrSpecification',
+            OrSpecification::class,
             $this->fixture->orSpecification($this->hasExtension)
         );
     }
 
     /**
      * @covers ::notSpecification
-     * @uses Flyfinder\Specification\NotSpecification
+     * @uses \Flyfinder\Specification\NotSpecification
      */
     public function testNotSpecification()
     {
         $this->assertInstanceOf(
-            'Flyfinder\Specification\NotSpecification',
+            NotSpecification::class,
             $this->fixture->notSpecification()
         );
     }

tests/unit/Specification/InPathTest.php

@@ -35,7 +35,7 @@ public function tearDown()
      * @covers ::__construct
      * @covers ::isSatisfiedBy
      * @dataProvider validDirnames
-     * @uses Flyfinder\Path
+     * @uses \Flyfinder\Path
      */
     public function testExactMatch()
     {
@@ -60,9 +60,9 @@ private function useWildcardPath()
      * @covers ::__construct
      * @covers ::isSatisfiedBy
      * @dataProvider validDirnames
-     * @uses Flyfinder\Path
+     * @uses \Flyfinder\Path
      */
-    public function testIfSpecificationIsSatisfied($dirname)
+    public function testIfSpecificationIsSatisfied(string $dirname)
     {
         $this->useWildcardPath();
         $this->assertTrue($this->fixture->isSatisfiedBy(['dirname' => $dirname]));
@@ -72,9 +72,9 @@ public function testIfSpecificationIsSatisfied($dirname)
      * @covers ::__construct
      * @covers ::isSatisfiedBy
      * @dataProvider validDirnames
-     * @uses Flyfinder\Path
+     * @uses \Flyfinder\Path
      */
-    public function testWithSingleDotSpec($dirname)
+    public function testWithSingleDotSpec(string $dirname)
     {
         $spec = new InPath(new Path('.'));
         $this->assertTrue($spec->isSatisfiedBy(['dirname' => $dirname]));
@@ -84,9 +84,9 @@ public function testWithSingleDotSpec($dirname)
      * @covers ::__construct
      * @covers ::isSatisfiedBy
      * @dataProvider validDirnames
-     * @uses Flyfinder\Path
+     * @uses \Flyfinder\Path
      */
-    public function testWithCurrentDirSpec($dirname)
+    public function testWithCurrentDirSpec(string $dirname)
     {
         $spec = new InPath(new Path('./'));
         $this->assertTrue($spec->isSatisfiedBy(['dirname' => $dirname]));
@@ -112,20 +112,18 @@ public function validDirnames()
      * @covers ::__construct
      * @covers ::isSatisfiedBy
      * @dataProvider invalidDirnames
-     * @uses Flyfinder\Path
+     * @uses \Flyfinder\Path
      */
-    public function testIfSpecificationIsNotSatisfied($dirname)
+    public function testIfSpecificationIsNotSatisfied(string $dirname)
     {
         $this->useWildcardPath();
         $this->assertFalse($this->fixture->isSatisfiedBy(['dirname' => $dirname]));
     }
 
     /**
      * Data provider for testIfSpecificationIsNotSatisfied. Contains a few invalid directory names
-     *
-     * @return array
      */
-    public function invalidDirnames()
+    public function invalidDirnames(): array
     {
         return [
             ['/hiddendir/n'],

tests/unit/Specification/NotSpecificationTest.php

@@ -21,7 +21,7 @@
  */
 class NotSpecificationTest extends TestCase
 {
-    /** @var HasExtension */
+    /** @var m\MockInterface|HasExtension */
     private $hasExtension;
 
     /** @var NotSpecification */
@@ -32,7 +32,7 @@ class NotSpecificationTest extends TestCase
      */
     public function setUp()
     {
-        $this->hasExtension = m::mock('Flyfinder\Specification\HasExtension');
+        $this->hasExtension = m::mock(HasExtension::class);
         $this->fixture = new NotSpecification($this->hasExtension);
     }
 

tests/unit/Specification/OrSpecificationTest.php

@@ -21,10 +21,10 @@
  */
 class OrSpecificationTest extends TestCase
 {
-    /** @var HasExtension */
+    /** @var m\MockInterface|HasExtension */
     private $hasExtension;
 
-    /** @var IsHidden */
+    /** @var m\MockInterface|IsHidden */
     private $isHidden;
 
     /** @var OrSpecification */
@@ -35,8 +35,8 @@ class OrSpecificationTest extends TestCase
      */
     public function setUp()
     {
-        $this->hasExtension = m::mock('Flyfinder\Specification\HasExtension');
-        $this->isHidden = m::mock('Flyfinder\Specification\IsHidden');
+        $this->hasExtension = m::mock(HasExtension::class);
+        $this->isHidden = m::mock(IsHidden::class);
         $this->fixture = new OrSpecification($this->hasExtension, $this->isHidden);
     }