Clean up after the upstream merge

Author: leofeyer

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);

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()));
 

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

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();
 

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);

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;
             }

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
     {

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(

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;
             }

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();