Clean up after the upstream merge

contao · Dec 11, 2020 · 950581e · 950581e
1 parent 5eb206f
commit 950581e
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 27 deletions.
diff --git a/core-bundle/src/EventListener/DataContainer/ContentCompositionListener.php b/core-bundle/src/EventListener/DataContainer/ContentCompositionListener.php
@@ -195,7 +195,7 @@ public function renderArticlePasteButton(DataContainer $dc, array $row, string $
         return $this->renderArticlePasteAfterButton($dc, $row, $cr, $clipboard);
     }
 
-    private function renderArticlePasteIntoButton(DataContainer $dc, array $row, bool $cr, array $clipboard = null)
+    private function renderArticlePasteIntoButton(DataContainer $dc, array $row, bool $cr, array $clipboard = null): string
     {
         $pageModel = $this->framework->createInstance(PageModel::class);
         $pageModel->preventSaving(false);
@@ -218,7 +218,7 @@ private function renderArticlePasteIntoButton(DataContainer $dc, array $row, boo
         );
     }
 
-    private function renderArticlePasteAfterButton(DataContainer $dc, array $row, bool $cr, array $clipboard = null)
+    private function renderArticlePasteAfterButton(DataContainer $dc, array $row, bool $cr, array $clipboard = null): string
     {
         /** @var PageModel $pageAdapter */
         $pageAdapter = $this->framework->getAdapter(PageModel::class);

diff --git a/core-bundle/src/EventListener/DataContainer/PageTypeOptionsListener.php b/core-bundle/src/EventListener/DataContainer/PageTypeOptionsListener.php
@@ -47,7 +47,7 @@ public function __construct(PageRegistry $pageRegistry, Security $security, Even
         $this->eventDispatcher = $eventDispatcher;
     }
 
-    public function __invoke(DataContainer $dc)
+    public function __invoke(DataContainer $dc): array
     {
         $options = array_unique(array_merge(array_keys($GLOBALS['TL_PTY']), $this->pageRegistry->keys()));
 

diff --git a/core-bundle/src/Resources/contao/library/Contao/Search.php b/core-bundle/src/Resources/contao/library/Contao/Search.php
@@ -349,7 +349,7 @@ public static function indexPage($arrData)
 					tl_search_index.pid,
 					SQRT(SUM(POW(
 						(1 + LOG(relevance)) * LOG((
-							" . (int) ($objDatabase->query("SELECT COUNT(*) as count FROM tl_search")->count + 1) . "
+							" . ($objDatabase->query("SELECT COUNT(*) as count FROM tl_search")->count + 1) . "
 						) / GREATEST(1, documentFrequency)),
 						2
 					))) as vectorLength

diff --git a/core-bundle/src/Routing/Page/PageRegistry.php b/core-bundle/src/Routing/Page/PageRegistry.php
@@ -95,7 +95,6 @@ public function getPathRegex(): array
     {
         $prefixes = [];
 
-        /** @var RouteConfig $config */
         foreach ($this->routeConfigs as $type => $config) {
             $regex = $config->getPathRegex();
 

diff --git a/core-bundle/src/ServiceAnnotation/Page.php b/core-bundle/src/ServiceAnnotation/Page.php
@@ -91,7 +91,7 @@ public function __construct(array $data)
             $method = 'set'.str_replace('_', '', $key);
 
             if (!method_exists($this, $method)) {
-                throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, static::class));
+                throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, self::class));
             }
 
             $this->$method($value);

diff --git a/core-bundle/src/Util/SimpleTokenParser.php b/core-bundle/src/Util/SimpleTokenParser.php
@@ -254,7 +254,7 @@ private function getVariables(string $expression): array
 
         $variables = [];
 
-        for ($i = 0; $i < \count($tokens); ++$i) {
+        for ($i = 0, $c = \count($tokens); $i < $c; ++$i) {
             if (!$tokens[$i]->test(Token::NAME_TYPE)) {
                 continue;
             }

diff --git a/core-bundle/tests/Command/MigrateCommandTest.php b/core-bundle/tests/Command/MigrateCommandTest.php
@@ -18,6 +18,7 @@
 use Contao\CoreBundle\Migration\MigrationResult;
 use Contao\CoreBundle\Tests\TestCase;
 use Contao\InstallationBundle\Database\Installer;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Filesystem\Filesystem;
@@ -176,6 +177,7 @@ public function testDoesNotAbortIfMigrationFails(): void
      * @param array<array<string>>          $pendingMigrations
      * @param array<array<MigrationResult>> $migrationResults
      * @param array<array<string>>          $runonceFiles
+     * @param Installer&MockObject          $installer
      */
     private function getCommand(array $pendingMigrations = [], array $migrationResults = [], array $runonceFiles = [], Installer $installer = null): MigrateCommand
     {

diff --git a/core-bundle/tests/Command/ResizeImagesCommandTest.php b/core-bundle/tests/Command/ResizeImagesCommandTest.php
@@ -19,6 +19,7 @@
 use Contao\Image\DeferredImageStorageInterface;
 use Contao\Image\DeferredResizerInterface;
 use Contao\Image\ImageInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Bridge\PhpUnit\ClockMock;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Filesystem\Filesystem;
@@ -132,6 +133,11 @@ function () {
         $this->assertNotRegExp('/image2.jpg/', $display);
     }
 
+    /**
+     * @param ImageFactoryInterface&MockObject         $factory
+     * @param DeferredResizerInterface&MockObject      $resizer
+     * @param DeferredImageStorageInterface&MockObject $storage
+     */
     private function getCommand(ImageFactoryInterface $factory = null, DeferredResizerInterface $resizer = null, DeferredImageStorageInterface $storage = null): ResizeImagesCommand
     {
         return new ResizeImagesCommand(

diff --git a/core-bundle/tests/EventListener/FilterPageTypeListenerTest.php b/core-bundle/tests/EventListener/FilterPageTypeListenerTest.php
@@ -135,10 +135,7 @@ public function testRemovesErrorTypesAlreadyPresentInTheRootPage(): void
     private function mockDataContainer(?int $pid, int $id = null): DataContainer
     {
         $activeRecord = array_filter(
-            [
-                'id' => $id,
-                'pid' => $pid,
-            ],
+            compact('id', 'pid'),
             static function ($v): bool {
                 return null !== $v;
             }

diff --git a/core-bundle/tests/Framework/ContaoFrameworkTest.php b/core-bundle/tests/Framework/ContaoFrameworkTest.php
@@ -693,6 +693,9 @@ public function testDelegatesTheResetCalls(): void
         $this->assertCount(0, $registry);
     }
 
+    /**
+     * @param TokenChecker&MockObject $tokenChecker
+     */
     private function mockFramework(Request $request = null, ScopeMatcher $scopeMatcher = null, TokenChecker $tokenChecker = null): ContaoFramework
     {
         $requestStack = new RequestStack();

diff --git a/core-bundle/tests/Functional/RoutingTest.php b/core-bundle/tests/Functional/RoutingTest.php
@@ -15,7 +15,6 @@
 use Contao\Config;
 use Contao\System;
 use Contao\TestCase\FunctionalTestCase;
-use Symfony\Component\HttpFoundation\Response;
 
 class RoutingTest extends FunctionalTestCase
 {
@@ -62,8 +61,6 @@ public function testResolvesAliases(array $fixtures, string $request, int $statu
 
         $crawler = $client->request('GET', "http://$host$request");
         $title = trim($crawler->filterXPath('//head/title')->text());
-
-        /** @var Response $response */
         $response = $client->getResponse();
 
         $this->assertSame($statusCode, $response->getStatusCode());
@@ -384,8 +381,6 @@ public function testResolvesAliasesWithLocale(array $fixtures, string $request,
 
         $crawler = $client->request('GET', "http://$host$request");
         $title = trim($crawler->filterXPath('//head/title')->text());
-
-        /** @var Response $response */
         $response = $client->getResponse();
 
         $this->assertSame($statusCode, $response->getStatusCode());
@@ -712,8 +707,6 @@ public function testResolvesAliasesWithoutUrlSuffix(array $fixtures, string $req
 
         $crawler = $client->request('GET', "http://$host$request");
         $title = trim($crawler->filterXPath('//head/title')->text());
-
-        /** @var Response $response */
         $response = $client->getResponse();
 
         $this->assertSame($statusCode, $response->getStatusCode());
@@ -1061,8 +1054,6 @@ public function testResolvesTheRootPageWithLocale(array $fixtures, string $reque
 
         $crawler = $client->request('GET', "http://$host$request");
         $title = trim($crawler->filterXPath('//head/title')->text());
-
-        /** @var Response $response */
         $response = $client->getResponse();
 
         $this->assertSame($statusCode, $response->getStatusCode());

diff --git a/core-bundle/tests/Image/Studio/FigureBuilderTest.php b/core-bundle/tests/Image/Studio/FigureBuilderTest.php
@@ -45,7 +45,7 @@ public function testFromFilesModel(): void
 
         $studio = $this->getStudioMockForImage($absoluteFilePath);
 
-        $this->getFigureBuilder($studio, null)->fromFilesModel($model)->build();
+        $this->getFigureBuilder($studio)->fromFilesModel($model)->build();
     }
 
     public function testFromFilesModelFailsWithInvalidDBAFSType(): void

diff --git a/core-bundle/tests/Image/Studio/ImageResultTest.php b/core-bundle/tests/Image/Studio/ImageResultTest.php
@@ -269,7 +269,7 @@ public function testGetFilePathFromPathResource(): void
         $projectDir = 'project/dir';
         $filePath = 'project/dir/file/path';
 
-        $locator = $this->getLocatorMock(null);
+        $locator = $this->getLocatorMock();
         $imageResult = new ImageResult($locator, $projectDir, $filePath);
 
         $this->assertSame('file/path', $imageResult->getFilePath());

diff --git a/core-bundle/tests/Routing/RouteProviderTest.php b/core-bundle/tests/Routing/RouteProviderTest.php
@@ -498,8 +498,8 @@ public function testSortsTheRootRoutes(array $pages, array $languages, array $ex
     public function getRootRoutes(): \Generator
     {
         $pages = [
-            2 => $this->createRootPage('en', 'english-root', true),
-            1 => $this->createPage('en', 'index', true),
+            2 => $this->createRootPage('en', 'english-root'),
+            1 => $this->createPage('en', 'index'),
             0 => $this->createRootPage('de', 'german-root', false),
         ];
 
@@ -516,8 +516,8 @@ public function getRootRoutes(): \Generator
         ];
 
         $pages = [
-            2 => $this->createRootPage('en', 'english-root', true),
-            1 => $this->createPage('en', 'index', true),
+            2 => $this->createRootPage('en', 'english-root'),
+            1 => $this->createPage('en', 'index'),
             0 => $this->createRootPage('de', 'german-root', false),
         ];
 

diff --git a/newsletter-bundle/src/DependencyInjection/ContaoNewsletterExtension.php b/newsletter-bundle/src/DependencyInjection/ContaoNewsletterExtension.php
@@ -19,7 +19,7 @@
 
 class ContaoNewsletterExtension extends Extension
 {
-    public function load(array $mergedConfig, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader(
             $container,