More fixes

leofeyer · leofeyer · commit 1fb0b96ffd1f · 2020-12-04T18:08:37.000+01:00
diff --git a/core-bundle/README.md b/core-bundle/README.md
@@ -58,7 +58,7 @@ framework:
 ```
 
 Add the Contao routes to your `config/routing.yaml` file, and be sure to load
-the `ContaoCoreBundle` at the very end, so the catch all route does not catch
+the `ContaoCoreBundle` at the very end, so the catch-all route does not catch
 your application routes.
 
 ```yml
diff --git a/core-bundle/src/Command/InstallCommand.php b/core-bundle/src/Command/InstallCommand.php
@@ -33,11 +33,6 @@ class InstallCommand extends Command
      */
     private $fs;
 
-    /**
-     * @var SymfonyStyle
-     */
-    private $io;
-
     /**
      * @var array
      */
@@ -83,14 +78,14 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->fs = new Filesystem();
-        $this->io = new SymfonyStyle($input, $output);
         $this->webDir = rtrim($input->getArgument('target'), '/');
 
         $this->addEmptyDirs();
 
         if (!empty($this->rows)) {
-            $this->io->newLine();
-            $this->io->listing($this->rows);
+            $io = new SymfonyStyle($input, $output);
+            $io->newLine();
+            $io->listing($this->rows);
         }
 
         return 0;
diff --git a/core-bundle/src/Command/ResizeImagesCommand.php b/core-bundle/src/Command/ResizeImagesCommand.php
@@ -191,7 +191,7 @@ private function resizeImage(string $path, bool $quiet = false): int
         return 0;
     }
 
-    private function resizeImages(float $timeLimit, float $concurrent, bool $noSubProcess)
+    private function resizeImages(float $timeLimit, float $concurrent, bool $noSubProcess): int
     {
         if (!$noSubProcess && $this->supportsSubProcesses()) {
             return $this->executeConcurrent($timeLimit, $concurrent);
diff --git a/core-bundle/src/Command/SymlinksCommand.php b/core-bundle/src/Command/SymlinksCommand.php
@@ -36,11 +36,6 @@ class SymlinksCommand extends Command
 {
     protected static $defaultName = 'contao:symlinks';
 
-    /**
-     * @var SymfonyStyle
-     */
-    private $io;
-
     /**
      * @var array
      */
@@ -102,14 +97,14 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $this->io = new SymfonyStyle($input, $output);
         $this->webDir = rtrim($input->getArgument('target'), '/');
 
         $this->generateSymlinks();
 
         if (!empty($this->rows)) {
-            $this->io->newLine();
-            $this->io->table(['', 'Symlink', 'Target / Error'], $this->rows);
+            $io = new SymfonyStyle($input, $output);
+            $io->newLine();
+            $io->table(['', 'Symlink', 'Target / Error'], $this->rows);
         }
 
         return $this->statusCode;
diff --git a/core-bundle/src/Routing/Matcher/UrlMatcher.php b/core-bundle/src/Routing/Matcher/UrlMatcher.php
@@ -29,7 +29,7 @@ public function __construct()
         parent::__construct(new RouteCollection(), new RequestContext());
     }
 
-    public function finalMatch(RouteCollection $collection, Request $request)
+    public function finalMatch(RouteCollection $collection, Request $request): array
     {
         $this->routes = $collection;
 
diff --git a/core-bundle/tests/Contao/Database/ResultTest.php b/core-bundle/tests/Contao/Database/ResultTest.php
@@ -93,7 +93,7 @@ public function testSingleRow(): void
             $this->assertSame(['field' => 'new value'], $result->row());
             $this->assertSame(['new value'], $result->row(true));
             $this->assertSame('value1', $result->fetchField());
-            $this->assertSame('value1', $result->fetchField(0));
+            $this->assertSame('value1', $result->fetchField());
         }
 
         $this->expectException(PHP_MAJOR_VERSION < 8 ? Notice::class : Warning::class);
@@ -141,7 +141,7 @@ public function testMultipleRows(): void
             $this->assertSame(['field' => 'new value'], $result->row());
             $this->assertSame(['new value'], $result->row(true));
             $this->assertSame('value2', $result->fetchField());
-            $this->assertSame('value2', $result->fetchField(0));
+            $this->assertSame('value2', $result->fetchField());
         }
 
         $this->expectException(PHP_MAJOR_VERSION < 8 ? Notice::class : Warning::class);
diff --git a/core-bundle/tests/Contao/GdImageTest.php b/core-bundle/tests/Contao/GdImageTest.php
@@ -266,7 +266,7 @@ public function testRecognizesSemitransparentImages(): void
 
     private function assertIsGdResource($resource): void
     {
-        if (\is_object($resource)) {
+        if (PHP_MAJOR_VERSION >= 8) {
             // PHP >= 8.0
             $this->assertInstanceOf(\GdImage::class, $resource);
         } else {
diff --git a/core-bundle/tests/Contao/SearchTest.php b/core-bundle/tests/Contao/SearchTest.php
@@ -42,12 +42,7 @@ public function testCompareUrls($moreCanonicalUrl, $lessCanonicalUrl): void
         $this->assertSame(0, $compareUrls->invokeArgs(null, [$lessCanonicalUrl, $lessCanonicalUrl]));
     }
 
-    /**
-     * Provides the data for the testCompareUrls() method.
-     *
-     * @return array
-     */
-    public function compareUrlsProvider()
+    public function compareUrlsProvider(): array
     {
         return [
             ['foo/bar.html', 'foo/bar.html?query'],
diff --git a/core-bundle/tests/EventListener/PreviewToolbarListenerTest.php b/core-bundle/tests/EventListener/PreviewToolbarListenerTest.php
@@ -143,7 +143,7 @@ public function testDoesNotInjectTheToolbarOnContentDispositionAttachment(): voi
 
         $event = new ResponseEvent(
             $this->createMock(HttpKernelInterface::class),
-            $this->getRequestMock(false, 'html'),
+            $this->getRequestMock(),
             HttpKernelInterface::MASTER_REQUEST,
             $response
         );
diff --git a/core-bundle/tests/EventListener/SearchIndexListenerTest.php b/core-bundle/tests/EventListener/SearchIndexListenerTest.php
@@ -91,31 +91,31 @@ public function getRequestResponse(): \Generator
         ];
 
         yield 'Should be ignored because the response was not successful (404) but there was no ld+json data' => [
-            Request::create('/foobar', 'GET'),
+            Request::create('/foobar'),
             new Response('', 404),
             SearchIndexListener::FEATURE_DELETE | SearchIndexListener::FEATURE_INDEX,
             false,
             false,
         ];
 
         yield 'Should be deleted because the response was not successful (404)' => [
-            Request::create('/foobar', 'GET'),
+            Request::create('/foobar'),
             new Response('<html><body><script type="application/ld+json">{"@context":"https:\/\/contao.org\/","@type":"Page","pageId":2,"noSearch":false,"protected":false,"groups":[],"fePreview":false}</script></body></html>', 404),
             SearchIndexListener::FEATURE_DELETE | SearchIndexListener::FEATURE_INDEX,
             false,
             true,
         ];
 
         yield 'Should be deleted because the response was not successful (403)' => [
-            Request::create('/foobar', 'GET'),
+            Request::create('/foobar'),
             new Response('<html><body><script type="application/ld+json">{"@context":"https:\/\/contao.org\/","@type":"Page","pageId":2,"noSearch":false,"protected":false,"groups":[],"fePreview":false}</script></body></html>', 403),
             SearchIndexListener::FEATURE_DELETE | SearchIndexListener::FEATURE_INDEX,
             false,
             true,
         ];
 
         yield 'Should not be deleted because even though the response was not successful (403), it was disabled by the feature flag ' => [
-            Request::create('/foobar', 'GET'),
+            Request::create('/foobar'),
             new Response('<html><body><script type="application/ld+json">{"@context":"https:\/\/contao.org\/","@type":"Page","pageId":2,"noSearch":false,"protected":false,"groups":[],"fePreview":false}</script></body></html>', 403),
             SearchIndexListener::FEATURE_INDEX,
             false,
diff --git a/core-bundle/tests/Image/ImageFactoryTest.php b/core-bundle/tests/Image/ImageFactoryTest.php
@@ -114,7 +114,7 @@ function (ResizeOptions $options): bool {
         $path = $this->getFixturesDir().'/assets/images/dummy.svg';
 
         if (!$this->filesystem->exists(\dirname($path))) {
-            $this->filesystem->mkdir(\dirname($path), 0777);
+            $this->filesystem->mkdir(\dirname($path));
         }
 
         $this->filesystem->dumpFile($path, '');
@@ -698,7 +698,7 @@ public static function executeResizeHookCallback(ContaoImage $imageObj): string
         $projectDir = System::getContainer()->getParameter('kernel.project_dir');
 
         if (!$fs->exists(\dirname($projectDir.'/'.$path))) {
-            $fs->mkdir(\dirname($projectDir.'/'.$path), 0777);
+            $fs->mkdir(\dirname($projectDir.'/'.$path));
         }
 
         $fs->dumpFile($projectDir.'/'.$path, '');
@@ -786,7 +786,7 @@ public static function getImageHookCallback(string $originalPath, int $targetWid
         $projectDir = System::getContainer()->getParameter('kernel.project_dir');
 
         if (!$fs->exists(\dirname($projectDir.'/'.$path))) {
-            $fs->mkdir(\dirname($projectDir.'/'.$path), 0777);
+            $fs->mkdir(\dirname($projectDir.'/'.$path));
         }
 
         $fs->dumpFile($projectDir.'/'.$path, '');
diff --git a/core-bundle/tests/Image/ImageSizesTest.php b/core-bundle/tests/Image/ImageSizesTest.php
@@ -15,7 +15,6 @@
 use Contao\BackendUser;
 use Contao\CoreBundle\Event\ContaoCoreEvents;
 use Contao\CoreBundle\Event\ImageSizesEvent;
-use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\CoreBundle\Image\ImageSizes;
 use Contao\CoreBundle\Tests\TestCase;
 use Doctrine\DBAL\Connection;
@@ -41,16 +40,6 @@ class ImageSizesTest extends TestCase
      */
     private $imageSizes;
 
-    /**
-     * @var ContaoFramework&MockObject
-     */
-    private $framework;
-
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -69,14 +58,12 @@ protected function setUp(): void
 
         $this->connection = $this->createMock(Connection::class);
         $this->eventDispatcher = $this->createMock(EventDispatcherInterface::class);
-        $this->framework = $this->mockContaoFramework();
-        $this->translator = $this->createMock(TranslatorInterface::class);
 
         $this->imageSizes = new ImageSizes(
             $this->connection,
             $this->eventDispatcher,
-            $this->framework,
-            $this->translator
+            $this->mockContaoFramework(),
+            $this->createMock(TranslatorInterface::class)
         );
     }
 
diff --git a/core-bundle/tests/Picker/TablePickerProviderTest.php b/core-bundle/tests/Picker/TablePickerProviderTest.php
@@ -259,7 +259,7 @@ public function testGetUrlWithoutValue(): void
             'picker' => 'foobar',
         ];
 
-        $config = $this->mockPickerConfig('tl_article', '');
+        $config = $this->mockPickerConfig('tl_article');
 
         $provider = $this->createTableProvider(
             null,
@@ -422,7 +422,7 @@ public function testGetUrlAddsTableIfItsNotFirstInModule(): void
             'table' => 'tl_content',
         ];
 
-        $config = $this->mockPickerConfig('tl_content', '');
+        $config = $this->mockPickerConfig('tl_content');
 
         $provider = $this->createTableProvider(
             null,
diff --git a/core-bundle/tests/Routing/RouteProviderTest.php b/core-bundle/tests/Routing/RouteProviderTest.php
@@ -445,10 +445,10 @@ public function getRoutes(): \Generator
 
         yield 'Sorts by alias if all of the languages are fallback' => [
             [
-                1 => $this->createPage('en', 'foo', true),
-                2 => $this->createPage('ru', 'foo', true),
-                3 => $this->createPage('fr', 'foo', true),
-                0 => $this->createPage('en', 'foo/bar', true),
+                1 => $this->createPage('en', 'foo'),
+                2 => $this->createPage('ru', 'foo'),
+                3 => $this->createPage('fr', 'foo'),
+                0 => $this->createPage('en', 'foo/bar'),
             ],
             ['de'],
         ];
diff --git a/core-bundle/tests/Search/DocumentTest.php b/core-bundle/tests/Search/DocumentTest.php
@@ -22,7 +22,7 @@ class DocumentTest extends TestCase
 {
     public function testCreatesADocumentFromRequestAndResponse(): void
     {
-        $request = Request::create('https://example.com/foo?bar=baz', 'GET');
+        $request = Request::create('https://example.com/foo?bar=baz');
         $response = new Response('body', 200, ['content-type' => ['text/html']]);
         $document = Document::createFromRequestResponse($request, $response);
 
diff --git a/core-bundle/tests/Security/Authentication/AuthenticationSuccessHandlerTest.php b/core-bundle/tests/Security/Authentication/AuthenticationSuccessHandlerTest.php
@@ -104,7 +104,7 @@ public function testThrowsExceptionIfTargetPathParameterIsMissing(): void
 
         $this->expectException(BadRequestHttpException::class);
 
-        $handler = $this->getHandler(null, null);
+        $handler = $this->getHandler();
         $handler->onAuthenticationSuccess($request, $token);
     }
 
diff --git a/core-bundle/tests/Security/Authentication/ContaoLoginAuthenticationListenerTest.php b/core-bundle/tests/Security/Authentication/ContaoLoginAuthenticationListenerTest.php
@@ -171,7 +171,7 @@ public function testHandlesTwoFactorAuthentication(): void
             ->willReturn(null)
         ;
 
-        $request = $this->mockRequest(true);
+        $request = $this->mockRequest();
         $request->request->set('FORM_SUBMIT', 'tl_login');
         $request->request->set('verify', '123456');
 
diff --git a/core-bundle/tests/Security/Authentication/RememberMe/ExpiringTokenBasedRememberMeServicesTest.php b/core-bundle/tests/Security/Authentication/RememberMe/ExpiringTokenBasedRememberMeServicesTest.php
@@ -36,11 +36,6 @@ class ExpiringTokenBasedRememberMeServicesTest extends TestCase
      */
     private $repository;
 
-    /**
-     * @var UserProviderInterface&MockObject
-     */
-    private $userProvider;
-
     /**
      * @var ExpiringTokenBasedRememberMeServices
      */
@@ -61,27 +56,27 @@ class ExpiringTokenBasedRememberMeServicesTest extends TestCase
     protected function setUp(): void
     {
         $this->repository = $this->createMock(RememberMeRepository::class);
-        $this->userProvider = $this->createMock(UserProviderInterface::class);
+        $userProvider = $this->createMock(UserProviderInterface::class);
 
         $user = $this->createMock(UserInterface::class);
         $user
             ->method('getRoles')
             ->willReturn([])
         ;
 
-        $this->userProvider
+        $userProvider
             ->method('supportsClass')
             ->willReturn(true)
         ;
 
-        $this->userProvider
+        $userProvider
             ->method('loadUserByUsername')
             ->willReturn($user)
         ;
 
         $this->listener = new ExpiringTokenBasedRememberMeServices(
             $this->repository,
-            [$this->userProvider],
+            [$userProvider],
             self::SECRET,
             'contao_frontend',
             self::$options
diff --git a/core-bundle/tests/Security/User/ContaoUserProviderTest.php b/core-bundle/tests/Security/User/ContaoUserProviderTest.php
@@ -219,7 +219,7 @@ public function testUpgradesPasswords(): void
             ->method('save')
         ;
 
-        $userProvider = $this->getProvider(null, BackendUser::class);
+        $userProvider = $this->getProvider();
         $userProvider->upgradePassword($user, 'newsuperhash');
 
         $this->assertSame('newsuperhash', $user->password);
diff --git a/installation-bundle/src/ContaoManager/Plugin.php b/installation-bundle/src/ContaoManager/Plugin.php
@@ -20,21 +20,22 @@
 use Contao\ManagerPlugin\Routing\RoutingPluginInterface;
 use Symfony\Component\Config\Loader\LoaderResolverInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Routing\RouteCollection;
 
 /**
  * @internal
  */
 class Plugin implements BundlePluginInterface, RoutingPluginInterface
 {
-    public function getBundles(ParserInterface $parser)
+    public function getBundles(ParserInterface $parser): array
     {
         return [
             BundleConfig::create(ContaoInstallationBundle::class)
                 ->setLoadAfter([ContaoCoreBundle::class]),
         ];
     }
 
-    public function getRouteCollection(LoaderResolverInterface $resolver, KernelInterface $kernel)
+    public function getRouteCollection(LoaderResolverInterface $resolver, KernelInterface $kernel): RouteCollection
     {
         return $resolver
             ->resolve(__DIR__.'/../Resources/config/routing.yml')
diff --git a/listing-bundle/README.md b/listing-bundle/README.md
@@ -3,7 +3,7 @@
 [![](https://img.shields.io/packagist/v/contao/listing-bundle.svg?style=flat-square)](https://packagist.org/packages/contao/listing-bundle)
 [![](https://img.shields.io/packagist/dt/contao/listing-bundle.svg?style=flat-square)](https://packagist.org/packages/contao/listing-bundle)
 
-The listing bundle allows to list arbitrary data in the Contao 4 front end.
+The listing bundle allows listing arbitrary data in the Contao 4 front end.
 
 Contao is an Open Source PHP Content Management System for people who want a
 professional website that is easy to maintain. Visit the [project website][1]
diff --git a/manager-bundle/src/ContaoManager/Plugin.php b/manager-bundle/src/ContaoManager/Plugin.php
@@ -86,7 +86,7 @@ public function getPackageDependencies(): array
         return ['contao/core-bundle'];
     }
 
-    public function getBundles(ParserInterface $parser)
+    public function getBundles(ParserInterface $parser): array
     {
         $configs = [
             BundleConfig::create(FrameworkBundle::class),
diff --git a/manager-bundle/src/HttpKernel/ContaoKernel.php b/manager-bundle/src/HttpKernel/ContaoKernel.php

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ private function resizeImage(string $path, bool $quiet = false): int`
`191`	`191`	`return 0;`
`192`	`192`	`}`
`193`	`193`
`194`		`- private function resizeImages(float $timeLimit, float $concurrent, bool $noSubProcess)`
	`194`	`+ private function resizeImages(float $timeLimit, float $concurrent, bool $noSubProcess): int`
`195`	`195`	`{`
`196`	`196`	`if (!$noSubProcess && $this->supportsSubProcesses()) {`
`197`	`197`	`return $this->executeConcurrent($timeLimit, $concurrent);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct()`
`29`	`29`	`parent::__construct(new RouteCollection(), new RequestContext());`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function finalMatch(RouteCollection $collection, Request $request)`
	`32`	`+ public function finalMatch(RouteCollection $collection, Request $request): array`
`33`	`33`	`{`
`34`	`34`	`$this->routes = $collection;`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ public function testRecognizesSemitransparentImages(): void`
`266`	`266`
`267`	`267`	`private function assertIsGdResource($resource): void`
`268`	`268`	`{`
`269`		`- if (\is_object($resource)) {`
	`269`	`+ if (PHP_MAJOR_VERSION >= 8) {`
`270`	`270`	`// PHP >= 8.0`
`271`	`271`	`$this->assertInstanceOf(\GdImage::class, $resource);`
`272`	`272`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,7 @@ public function testCompareUrls($moreCanonicalUrl, $lessCanonicalUrl): void`
`42`	`42`	`$this->assertSame(0, $compareUrls->invokeArgs(null, [$lessCanonicalUrl, $lessCanonicalUrl]));`
`43`	`43`	`}`
`44`	`44`
`45`		`- /**`
`46`		`- * Provides the data for the testCompareUrls() method.`
`47`		`- *`
`48`		`- * @return array`
`49`		`- */`
`50`		`- public function compareUrlsProvider()`
	`45`	`+ public function compareUrlsProvider(): array`
`51`	`46`	`{`
`52`	`47`	`return [`
`53`	`48`	`['foo/bar.html', 'foo/bar.html?query'],`