Fix the coding style

Tastaturberuf · Jan 3, 2020 · c25eeb8 · c25eeb8
1 parent 0494791
commit c25eeb8
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 27 deletions.
diff --git a/core-bundle/src/Search/Escargot/Subscriber/BrokenLinkCheckerSubscriber.php b/core-bundle/src/Search/Escargot/Subscriber/BrokenLinkCheckerSubscriber.php
@@ -45,6 +45,7 @@ public function shouldRequest(CrawlUri $crawlUri): string
     {
         // Only check URIs that are part of our base collection or were found on one
         $fromBaseUriCollection = $this->escargot->getBaseUris()->containsHost($crawlUri->getUri()->getHost());
+
         $foundOnBaseUriCollection = null !== $crawlUri->getFoundOn()
             && ($originalCrawlUri = $this->escargot->getCrawlUri($crawlUri->getFoundOn()))
             && $this->escargot->getBaseUris()->containsHost($originalCrawlUri->getUri()->getHost());
@@ -53,7 +54,7 @@ public function shouldRequest(CrawlUri $crawlUri): string
             $this->escargot->log(
                 LogLevel::DEBUG,
                 $crawlUri->createLogMessage('Did not check because it is not part of the base URI collection or was not found on one of that is.'),
-                ['source' => \get_class($this)]
+                ['source' => static::class]
             );
 
             return SubscriberInterface::DECISION_NEGATIVE;
@@ -129,11 +130,8 @@ private function logError(CrawlUri $crawlUri, string $message): void
 
         $this->escargot->log(
             LogLevel::ERROR,
-            $crawlUri->createLogMessage(sprintf(
-                'Broken link! %s.',
-                $message
-            )),
-            ['source' => \get_class($this)]
+            $crawlUri->createLogMessage(sprintf('Broken link! %s.', $message)),
+            ['source' => static::class]
         );
     }
 }
diff --git a/core-bundle/tests/DependencyInjection/ContaoCoreExtensionTest.php b/core-bundle/tests/DependencyInjection/ContaoCoreExtensionTest.php
@@ -98,6 +98,7 @@
 use Contao\CoreBundle\Routing\ScopeMatcher;
 use Contao\CoreBundle\Routing\UrlGenerator;
 use Contao\CoreBundle\Search\Escargot\Factory;
+use Contao\CoreBundle\Search\Escargot\Subscriber\BrokenLinkCheckerSubscriber;
 use Contao\CoreBundle\Search\Escargot\Subscriber\SearchIndexSubscriber;
 use Contao\CoreBundle\Search\Indexer\IndexerInterface;
 use Contao\CoreBundle\Security\Authentication\AuthenticationEntryPoint;
@@ -1580,7 +1581,22 @@ public function testRegistersTheSearchEscargotFactory(): void
         $this->assertSame('contao.framework', (string) $definition->getArgument(1));
     }
 
-    public function testRegistersTheSearchEscargotSubscriber(): void
+    public function testRegistersTheSearchEscargotBrokenLinkCheckerSubscriber(): void
+    {
+        $this->assertTrue($this->container->has('contao.search.escargot_subscriber.broken_link_checker'));
+
+        $definition = $this->container->getDefinition('contao.search.escargot_subscriber.broken_link_checker');
+
+        $this->assertSame(BrokenLinkCheckerSubscriber::class, $definition->getClass());
+        $this->assertTrue($definition->isPrivate());
+        $this->assertSame([], $definition->getArguments());
+
+        $tags = $definition->getTags();
+
+        $this->assertArrayHasKey('contao.escargot_subscriber', $tags);
+    }
+
+    public function testRegistersTheSearchEscargotSearchIndexSubscriber(): void
     {
         $this->assertTrue($this->container->has('contao.search.escargot_subscriber.search_index'));
 

diff --git a/core-bundle/tests/Search/Escargot/Subscriber/BrokenLinkCheckerSubscriberTest.php b/core-bundle/tests/Search/Escargot/Subscriber/BrokenLinkCheckerSubscriberTest.php
@@ -15,6 +15,7 @@
 use Contao\CoreBundle\Search\Escargot\Subscriber\BrokenLinkCheckerSubscriber;
 use Contao\CoreBundle\Search\Escargot\Subscriber\SubscriberResult;
 use Nyholm\Psr7\Uri;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -35,6 +36,7 @@ class BrokenLinkCheckerSubscriberTest extends TestCase
     public function testName(): void
     {
         $subscriber = new BrokenLinkCheckerSubscriber();
+
         $this->assertSame('broken-link-checker', $subscriber->getName());
     }
 
@@ -204,13 +206,7 @@ public function testOnException(ExceptionInterface $exception, ResponseInterface
 
         $subscriber = new BrokenLinkCheckerSubscriber();
         $subscriber->setEscargot($escargot);
-
-        $subscriber->onException(
-            new CrawlUri(new Uri('https://contao.org'), 0),
-            $exception,
-            $response,
-            $chunk
-        );
+        $subscriber->onException(new CrawlUri(new Uri('https://contao.org'), 0), $exception, $response, $chunk);
 
         $previousResult = null;
 
@@ -255,32 +251,36 @@ public function onExceptionProvider(): \Generator
         ];
     }
 
+    /**
+     * @return ResponseInterface&MockObject
+     */
     private function getResponse(int $statusCode = 200): ResponseInterface
     {
         $response = $this->createMock(ResponseInterface::class);
-
         $response
-            ->expects($this->any())
             ->method('getStatusCode')
             ->willReturn($statusCode)
         ;
 
         $response
-            ->expects($this->any())
             ->method('getInfo')
-            ->willReturnCallback(static function (string $key) use ($statusCode) {
-                if ('http_code' === $key) {
-                    return $statusCode;
-                }
+            ->willReturnCallback(
+                static function (string $key) use ($statusCode) {
+                    if ('http_code' === $key) {
+                        return $statusCode;
+                    }
 
-                if ('url' === $key) {
-                    return '';
-                }
+                    if ('url' === $key) {
+                        return '';
+                    }
+
+                    if ('response_headers' === $key) {
+                        return [];
+                    }
 
-                if ('response_headers' === $key) {
-                    return [];
+                    throw new \InvalidArgumentException('Invalid key: '.$key);
                 }
-            })
+            )
         ;
 
         return $response;