Fix rector messages

AOEpeople · Feb 28, 2024 · 893fc52 · 893fc52
1 parent 06a71fc
commit 893fc52
Show file tree

Hide file tree

Showing 18 changed files with 112 additions and 104 deletions.
diff --git a/Classes/Controller/BanController.php b/Classes/Controller/BanController.php
@@ -102,6 +102,7 @@ public function banTagByNameAction(string $tagName): void
                 $this->addFlashMessage($result['reason'], '', AbstractMessage::ERROR);
             }
         }
+
         $this->redirect('index');
     }
 
@@ -130,6 +131,7 @@ public function banByRegexAction(string $regex): void
                 $this->addFlashMessage($result['reason'], '', AbstractMessage::ERROR);
             }
         }
+
         $this->redirect('index');
     }
 
@@ -139,6 +141,7 @@ private function isCriticalRegex(string $regex): bool
             $this->addFlashMessage('Bitte geben Sie einen spezifischeren RegEx ein!', '', AbstractMessage::ERROR);
             return true;
         }
+
         return false;
     }
 
@@ -148,6 +151,7 @@ private function isValidTagName(string $tagName): bool
             $this->addFlashMessage('Bitte geben Sie einen gültigen Tag-Namen ein! ', '', AbstractMessage::ERROR);
             return false;
         }
+
         return true;
     }
 }
diff --git a/Classes/Domain/Model/Tag/PageTag.php b/Classes/Domain/Model/Tag/PageTag.php
@@ -30,18 +30,12 @@
 
 class PageTag implements TagInterface
 {
-    /**
-     * @return string
-     */
-    public function getIdentifier()
+    public function getIdentifier(): string
     {
         return 'typo3_page';
     }
 
-    /**
-     * @return boolean
-     */
-    public function isValid()
+    public function isValid(): bool
     {
         return true;
     }

diff --git a/Classes/System/Header.php b/Classes/System/Header.php
@@ -50,6 +50,7 @@ public function sendHeaderForTag(TagInterface $tag): void
         if (!$tag->isValid()) {
             throw new \RuntimeException('Tag is not valid', 1_435_047_447);
         }
+
         header(sprintf(self::HEADER_TAGS, $tag->getIdentifier()), false);
     }
 

diff --git a/Classes/System/Http.php b/Classes/System/Http.php
@@ -78,6 +78,7 @@ public function wait(): array
                 if ($reason instanceof Exception) {
                     $reason = $reason->getMessage();
                 }
+
                 $phrases[] = [
                     'reason' => $reason,
                     'success' => false,
@@ -89,6 +90,7 @@ public function wait(): array
                 ];
             }
         }
+
         return $phrases;
     }
 }
diff --git a/Classes/System/Varnish.php b/Classes/System/Varnish.php
@@ -54,17 +54,16 @@ public function __construct(Http $http, ExtensionConfiguration $extensionConfigu
     public function shutdown(): array
     {
         $phrases = $this->http->wait();
-        if (is_array($phrases)) {
-            foreach ($phrases as $phrase) {
-                if ($phrase['success']) {
-                    $this->logManager->getLogger(__CLASS__)
-                        ->info($phrase['reason']);
-                } else {
-                    $this->logManager->getLogger(__CLASS__)
-                        ->alert($phrase['reason']);
-                }
+        foreach ($phrases as $phrase) {
+            if ($phrase['success']) {
+                $this->logManager->getLogger(self::class)
+                    ->info($phrase['reason']);
+            } else {
+                $this->logManager->getLogger(self::class)
+                    ->alert($phrase['reason']);
             }
         }
+
         return $phrases;
     }
 
@@ -73,6 +72,7 @@ public function banByTag(TagInterface $tag): self
         if (!$tag->isValid()) {
             throw new \RuntimeException('Tag is not valid', 1_435_159_558);
         }
+
         $this->request('BAN', ['X-Ban-Tags' => $tag->getIdentifier()], $this->extensionConfiguration->getBanTimeout());
         return $this;
     }

diff --git a/Classes/TYPO3/Configuration/ExtensionConfiguration.php b/Classes/TYPO3/Configuration/ExtensionConfiguration.php
@@ -49,7 +49,7 @@ public function isDebug(): bool
     public function getHosts(): array
     {
         $hosts = explode(',', $this->get('hosts'));
-        array_walk($hosts, function (&$value): void {
+        array_walk($hosts, static function (&$value): void {
             if (!str_contains($value, 'https://') && !str_contains($value, 'http://')) {
                 $value = 'http://' . $value;
             }

diff --git a/Classes/TYPO3/Hooks/BackendAjaxHook.php b/Classes/TYPO3/Hooks/BackendAjaxHook.php
@@ -66,6 +66,6 @@ protected function isAuthorizedBackendSession(): bool
 
     protected function getBackendUser(): ?BackendUserAuthentication
     {
-        return isset($GLOBALS['BE_USER']) ? $GLOBALS['BE_USER'] : null;
+        return $GLOBALS['BE_USER'] ?? null;
     }
 }
diff --git a/Classes/TYPO3/Hooks/TceMainHook.php b/Classes/TYPO3/Hooks/TceMainHook.php
@@ -88,12 +88,15 @@ private function extractPageIdFromParameters(array $parameters): int
         ) {
             return (int) $parameters[self::UID];
         }
+
         if (isset($parameters[self::CACHE_CMD]) && is_numeric($parameters[self::CACHE_CMD])) {
             return (int) $parameters[self::CACHE_CMD];
         }
+
         if (isset($parameters[self::UID_PAGE]) && is_numeric($parameters[self::UID_PAGE])) {
             return (int) $parameters[self::UID_PAGE];
         }
+
         return 0;
     }
 

diff --git a/Tests/Unit/Domain/Model/Tag/PageIdTagTest.php b/Tests/Unit/Domain/Model/Tag/PageIdTagTest.php
@@ -34,33 +34,33 @@
  */
 class PageIdTagTest extends UnitTestCase
 {
-    public function testIsValidShouldFailWithNegativePageId()
+    public function testIsValidShouldFailWithNegativePageId(): void
     {
         $tag = new PageIdTag(-1);
-        self::assertFalse($tag->isValid());
+        $this->assertFalse($tag->isValid());
     }
 
-    public function testIsValidShouldFailWithPageIdZero()
+    public function testIsValidShouldFailWithPageIdZero(): void
     {
         $tag = new PageIdTag(0);
-        self::assertFalse($tag->isValid());
+        $this->assertFalse($tag->isValid());
     }
 
-    public function testIsValidShouldFailWithPageIdNotNumeric()
+    public function testIsValidShouldFailWithPageIdNotNumeric(): void
     {
         $tag = new PageIdTag('string');
-        self::assertFalse($tag->isValid());
+        $this->assertFalse($tag->isValid());
     }
 
-    public function testIsValidWithInteger()
+    public function testIsValidWithInteger(): void
     {
         $tag = new PageIdTag(11);
-        self::assertTrue($tag->isValid());
+        $this->assertTrue($tag->isValid());
     }
 
-    public function testGetIdentifier()
+    public function testGetIdentifier(): void
     {
         $tag = new PageIdTag(11);
-        self::assertSame('page_11', $tag->getIdentifier());
+        $this->assertSame('page_11', $tag->getIdentifier());
     }
 }
diff --git a/Tests/Unit/Domain/Model/Tag/PageTagTest.php b/Tests/Unit/Domain/Model/Tag/PageTagTest.php
@@ -34,15 +34,15 @@
  */
 class PageTagTest extends UnitTestCase
 {
-    public function testTagShouldBeValid()
+    public function testTagShouldBeValid(): void
     {
         $tag = new PageTag();
-        self::assertTrue($tag->isValid());
+        $this->assertTrue($tag->isValid());
     }
 
-    public function testShouldGetIdentifier()
+    public function testShouldGetIdentifier(): void
     {
         $tag = new PageTag();
-        self::assertSame('typo3_page', $tag->getIdentifier());
+        $this->assertSame('typo3_page', $tag->getIdentifier());
     }
 }
diff --git a/Tests/Unit/Domain/Model/Tag/TagTest.php b/Tests/Unit/Domain/Model/Tag/TagTest.php
@@ -34,21 +34,21 @@
  */
 class TagTest extends UnitTestCase
 {
-    public function testSsValidShouldFailWithEmptyIdentifier()
+    public function testSsValidShouldFailWithEmptyIdentifier(): void
     {
         $tag = new Tag('');
-        self::assertFalse($tag->isValid());
+        $this->assertFalse($tag->isValid());
     }
 
-    public function testShouldGetIdentifier()
+    public function testShouldGetIdentifier(): void
     {
         $tag = new Tag('myTag');
-        self::assertSame('myTag', $tag->getIdentifier());
+        $this->assertSame('myTag', $tag->getIdentifier());
     }
 
-    public function testShouldGetIsValidWithIdentifier()
+    public function testShouldGetIsValidWithIdentifier(): void
     {
         $tag = new Tag('myString');
-        self::assertTrue($tag->isValid());
+        $this->assertTrue($tag->isValid());
     }
 }
diff --git a/Tests/Unit/System/HeaderTest.php b/Tests/Unit/System/HeaderTest.php
@@ -43,7 +43,7 @@ protected function setUp(): void
         $this->header = new Header();
     }
 
-    public function testShouldThrowRuntimeExceptionWithInvalidTag()
+    public function testShouldThrowRuntimeExceptionWithInvalidTag(): void
     {
         $this->expectException(RuntimeException::class);
         $this->expectExceptionCode(1_435_047_447);

diff --git a/Tests/Unit/System/HttpTest.php b/Tests/Unit/System/HttpTest.php
@@ -30,16 +30,17 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\RequestOptions;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @covers \Aoe\Varnish\System\Http
  */
 class HttpTest extends UnitTestCase
 {
     /**
-     * @var Client|\PHPUnit\Framework\MockObject\MockObject
+     * @var Client
      */
-    private $client;
+    private MockObject $client;
 
     private Http $http;
 
@@ -53,7 +54,7 @@ protected function setUp(): void
         $this->http = new Http($this->client);
     }
 
-    public function testRequestShouldCallClientCorrectly()
+    public function testRequestShouldCallClientCorrectly(): void
     {
         $method = 'BAN';
         $url = 'domain.tld';
@@ -79,7 +80,7 @@ public function testRequestShouldCallClientCorrectly()
         );
     }
 
-    public function testRequestShouldCallClientWithDefaultParams()
+    public function testRequestShouldCallClientWithDefaultParams(): void
     {
         $method = 'BAN';
         $url = 'domain.tld';

diff --git a/Tests/Unit/System/VarnishTest.php b/Tests/Unit/System/VarnishTest.php
@@ -31,6 +31,7 @@
 use Aoe\Varnish\System\Varnish;
 use Aoe\Varnish\TYPO3\Configuration\ExtensionConfiguration;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 use RuntimeException;
 use TYPO3\CMS\Core\Log\Logger;
 use TYPO3\CMS\Core\Log\LogManager;
@@ -43,19 +44,19 @@ class VarnishTest extends UnitTestCase
     private Varnish $varnish;
 
     /**
-     * @var Http|\PHPUnit\Framework\MockObject\MockObject
+     * @var Http
      */
-    private $http;
+    private MockObject $http;
 
     /**
-     * @var ExtensionConfiguration|\PHPUnit\Framework\MockObject\MockObject
+     * @var ExtensionConfiguration
      */
-    private $extensionConfiguration;
+    private MockObject $extensionConfiguration;
 
     /**
-     * @var LogManager|\PHPUnit\Framework\MockObject\MockObject
+     * @var LogManager
      */
-    private $logManager;
+    private MockObject $logManager;
 
     protected function setUp(): void
     {
@@ -86,7 +87,7 @@ protected function setUp(): void
         $this->varnish = new Varnish($this->http, $this->extensionConfiguration, $this->logManager);
     }
 
-    public function testBanByTagShouldThrowExceptionOnInvalidTag()
+    public function testBanByTagShouldThrowExceptionOnInvalidTag(): void
     {
         $this->expectException(RuntimeException::class);
         $this->expectExceptionCode(1_435_159_558);
@@ -101,7 +102,7 @@ public function testBanByTagShouldThrowExceptionOnInvalidTag()
         $this->varnish->banByTag($tag);
     }
 
-    public function testBanByTagShouldCallHttpCorrectly()
+    public function testBanByTagShouldCallHttpCorrectly(): void
     {
         $this->http->expects(self::once())
             ->method('request')
@@ -111,7 +112,7 @@ public function testBanByTagShouldCallHttpCorrectly()
                 ['X-Ban-Tags' => 'my_identifier'],
                 10
             );
-        /** @var TagInterface|\PHPUnit\Framework\MockObject\MockObject $tag */
+        /** @var TagInterface|MockObject $tag */
         $tag = $this->getMockBuilder(TagInterface::class)
             ->onlyMethods(['isValid', 'getIdentifier'])
             ->getMock();
@@ -124,15 +125,15 @@ public function testBanByTagShouldCallHttpCorrectly()
         $this->varnish->banByTag($tag);
     }
 
-    public function testBanAllShouldCallHttpCorrectly()
+    public function testBanAllShouldCallHttpCorrectly(): void
     {
         $this->http->expects(self::once())
             ->method('request')
             ->with('BAN', 'domain.tld', ['X-Ban-All' => '1'], 10);
         $this->varnish->banAll();
     }
 
-    public function testBanByRegexShouldCallHttpCorrectly()
+    public function testBanByRegexShouldCallHttpCorrectly(): void
     {
         $this->http
             ->expects(self::once())
@@ -141,7 +142,7 @@ public function testBanByRegexShouldCallHttpCorrectly()
         $this->varnish->banByRegex('/*');
     }
 
-    public function testShouldLogOnShutdown()
+    public function testShouldLogOnShutdown(): void
     {
         $this->http->expects(self::once())
             ->method('wait')
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,7 @@ public function sendHeaderForTag(TagInterface $tag): void @@
             if (!$tag->isValid()) {
                 throw new \RuntimeException('Tag is not valid', 1_435_047_447);
             }
             header(sprintf(self::HEADER_TAGS, $tag->getIdentifier()), false);
         }
@@ Expand Down @@