phpstan: Also analyze unit tests

qbus-agentur · Jan 28, 2019 · 58237f7 · 58237f7
1 parent f489bfb
commit 58237f7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ script:
   - find . -name \*.php ! -path "./.build/*" -exec php -l {} >/dev/null \;
   - if [[ "$ANALYSIS" != 'true' ]]; then .build/vendor/bin/phpunit ; fi
   - if [[ "$ANALYSIS" == 'true' ]]; then .build/vendor/bin/phpunit --coverage-text --coverage-clover clover.xml ; fi
-  - .build/vendor/bin/phpstan analyze
+  - if [[ "$ANALYSIS" == 'true' ]]; then .build/vendor/bin/phpstan analyze ; fi
 
 after_success:
   - if [[ "$ANALYSIS" == 'true' ]]; then travis_retry .build/vendor/bin/php-coveralls -v ; fi
diff --git a/Tests/Unit/SetPageCacheHookTest.php b/Tests/Unit/SetPageCacheHookTest.php
@@ -1,11 +1,11 @@
 <?php
 namespace Qbus\SkipPageIsBeingGenerated\Tests\Unit;
 
+use Prophecy\Prophecy\ObjectProphecy;
 use Qbus\SkipPageIsBeingGenerated\Hooks\SetPageCacheHook;
 use TYPO3\CMS\Core\Cache\Backend\RedisBackend;
 use TYPO3\CMS\Core\Cache\Backend\BackendInterface;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
-//use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
 /**
@@ -27,8 +27,9 @@ class SetPageCacheHookTest extends UnitTestCase
     protected $cacheBackendProphecy;
 
     /**
-     * @var params
+     * @var array
      */
+    protected $params = [];
 
     /**
      * @var SetPageCacheHook
@@ -50,7 +51,7 @@ class SetPageCacheHookTest extends UnitTestCase
      */
     protected $lifetime;
 
-    public function setUp()
+    public function setUp(): void
     {
         $cacheBackendProphecy = $this->prophesize();
         $cacheBackendProphecy->willImplement(BackendInterface::class);
@@ -82,65 +83,65 @@ public function setUp()
         ];
     }
 
-    public function testSetInvalidatesLifetime()
+    public function testSetInvalidatesLifetime(): void
     {
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(-1, $this->lifetime);
+        static::assertEquals(-1, $this->lifetime);
     }
 
-    public function testSetInvalidatesLifetimeForRedis()
+    public function testSetInvalidatesLifetimeForRedis(): void
     {
         $this->cacheBackendProphecy->willExtend(RedisBackend::class);
 
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(1, $this->lifetime);
-        $this->assertFalse($this->variable);
+        static::assertEquals(1, $this->lifetime);
+        static::assertFalse($this->variable);
     }
 
-    public function testSetDoesNothingForNonTemporaryPageCache()
+    public function testSetDoesNothingForNonTemporaryPageCache(): void
     {
         unset($this->variable['temp_content']);
 
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(30, $this->lifetime);
+        static::assertEquals(30, $this->lifetime);
     }
 
-    public function testSetDoesNothingForNonPageCache()
+    public function testSetDoesNothingForNonPageCache(): void
     {
         $this->cacheFrontendProphecy->getIdentifier()->willReturn('cache_pagesection');
 
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(30, $this->lifetime);
+        static::assertEquals(30, $this->lifetime);
     }
 
-    public function testSetDoesNothingForRedirectsPageCache()
+    public function testSetDoesNothingForRedirectsPageCache(): void
     {
         $this->entryIdentifier = 'redirects';
 
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(30, $this->lifetime);
+        static::assertEquals(30, $this->lifetime);
     }
 
-    public function testSetDoesNothingForTitleTagPageCache()
+    public function testSetDoesNothingForTitleTagPageCache(): void
     {
         $this->entryIdentifier .= '-titleTag-record';
 
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(30, $this->lifetime);
+        static::assertEquals(30, $this->lifetime);
     }
 
-    public function testSetDoesNothingForMetatagPageCache()
+    public function testSetDoesNothingForMetatagPageCache(): void
     {
         $this->entryIdentifier .= '-metatag-html5';
 
         $this->hook->set($this->params, $this->cacheFrontendProphecy->reveal());
 
-        $this->assertEquals(30, $this->lifetime);
+        static::assertEquals(30, $this->lifetime);
     }
 }
diff --git a/composer.json b/composer.json
@@ -22,9 +22,11 @@
     "require-dev": {
         "typo3/testing-framework": "^2.0 || ^4.9",
         "phpspec/prophecy": "^1.8",
-        "phpstan/phpstan": "^0.10",
-        "phpstan/phpstan-strict-rules": "^0.10",
-        "saschaegerer/phpstan-typo3": "^0.10.0",
+        "phpstan/phpstan": "^0.9 || ^0.10",
+        "phpstan/phpstan-strict-rules": "^0.9 || ^0.10",
+        "saschaegerer/phpstan-typo3": "0.9.x-dev || ^0.10.0",
+        "phpstan/phpstan-phpunit": "^0.9 || ^0.10",
+        "jangregor/phpstan-prophecy": "^0.1 || ^0.3",
         "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,8 +1,14 @@
 includes:
   - .build/vendor/saschaegerer/phpstan-typo3/extension.neon
   - .build/vendor/phpstan/phpstan-strict-rules/rules.neon
+  - .build/vendor/phpstan/phpstan-phpunit/extension.neon
+  - .build/vendor/jangregor/phpstan-prophecy/src/extension.neon
 
 parameters:
   level: max
+  ignoreErrors:
+    # phpstan-prophecy can not detect the implemented interface
+    - '^Parameter #2 \$frontend of method Qbus\\SkipPageIsBeingGenerated\\Hooks\\SetPageCacheHook::set()^'
   paths:
     - Classes
+    - Tests