ISSUE-337: fix cache:clear

Author: tatevikg1

composer.json

@@ -110,12 +110,12 @@
                 "Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle",
                 "Symfony\\Bundle\\MonologBundle\\MonologBundle",
                 "Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle",
-                "PhpList\\Core\\EmptyStartPageBundle\\PhpListEmptyStartPageBundle"
+                "PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle"
             ],
             "routes": {
                 "homepage": {
-                    "resource": "@PhpListEmptyStartPageBundle/Controller/",
-                    "type": "attribute"
+                    "resource": "@EmptyStartPageBundle/Controller/",
+                    "type": "annotation"
                 }
             }
         }

src/Composer/PackageRepository.php

@@ -58,7 +58,7 @@ private function removeDuplicates(array $packages): array
         /** @var bool[] $registeredPackages */
         $registeredPackages = [];
 
-        $result = array_filter(
+        return array_filter(
             $packages,
             function (PackageInterface $package) use (&$registeredPackages) {
                 $packageName = $package->getName();
@@ -70,8 +70,6 @@ function (PackageInterface $package) use (&$registeredPackages) {
                 return true;
             }
         );
-
-        return $result;
     }
 
     /**

…geBundle/PhpListEmptyStartPageBundle.php …StartPageBundle/EmptyStartPageBundle.phpsrc/EmptyStartPageBundle/PhpListEmptyStartPageBundle.php renamed to src/EmptyStartPageBundle/EmptyStartPageBundle.php src/EmptyStartPageBundle/PhpListEmptyStartPageBundle.php renamed to src/EmptyStartPageBundle/EmptyStartPageBundle.php

@@ -11,6 +11,6 @@
  *
  * @author Oliver Klee <[email protected]>
  */
-class PhpListEmptyStartPageBundle extends Bundle
+class EmptyStartPageBundle extends Bundle
 {
 }

tests/Integration/Composer/ScriptsTest.php

@@ -37,7 +37,7 @@ public function bundleClassNameDataProvider(): array
         return [
             'Symfony framework bundle' => ['Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'],
             'Doctrine bundle' => ['Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle'],
-            'empty start page bundle' => ['PhpList\\Core\\EmptyStartPageBundle\\PhpListEmptyStartPageBundle'],
+            'empty start page bundle' => ['PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle'],
         ];
     }
 

tests/Unit/Composer/ModuleFinderTest.php

@@ -197,15 +197,15 @@ public function modulesWithBundlesDataProvider(): array
                         'phplist/core' => [
                             'bundles' => [
                                 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle',
-                                'PhpList\\Core\\EmptyStartPageBundle\\PhpListEmptyStartPageBundle',
+                                'PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle',
                             ],
                         ],
                     ],
                 ],
                 [
                     'phplist/foo' => [
                         'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle',
-                        'PhpList\\Core\\EmptyStartPageBundle\\PhpListEmptyStartPageBundle',
+                        'PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle',
                     ],
                 ],
             ],
@@ -218,13 +218,13 @@ public function modulesWithBundlesDataProvider(): array
                     ],
                     'phplist/bar' => [
                         'phplist/core' => [
-                            'bundles' => ['PhpList\\Core\\EmptyStartPageBundle\\PhpListEmptyStartPageBundle'],
+                            'bundles' => ['PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle'],
                         ],
                     ],
                 ],
                 [
                     'phplist/foo' => ['Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'],
-                    'phplist/bar' => ['PhpList\\Core\\EmptyStartPageBundle\\PhpListEmptyStartPageBundle'],
+                    'phplist/bar' => ['PhpList\\Core\\EmptyStartPageBundle\\EmptyStartPageBundle'],
                 ],
             ],
         ];

tests/Unit/Core/ApplicationKernelTest.php

@@ -6,7 +6,7 @@
 use PhpList\Core\Core\ApplicationKernel;
 use PhpList\Core\Core\Bootstrap;
 use PhpList\Core\Core\Environment;
-use PhpList\Core\EmptyStartPageBundle\PhpListEmptyStartPageBundle;
+use PhpList\Core\EmptyStartPageBundle\EmptyStartPageBundle;
 use PhpList\Core\Tests\TestingSupport\Traits\ContainsInstanceAssertionTrait;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -28,12 +28,12 @@ class ApplicationKernelTest extends TestCase
      */
     private $subject = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new ApplicationKernel(Environment::TESTING, true);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         Bootstrap::purgeInstance();
     }
@@ -63,7 +63,7 @@ public function requiredBundlesDataProvider(): array
     {
         return [
             'framework' => [FrameworkBundle::class],
-            'phpList default bundle' => [PhpListEmptyStartPageBundle::class],
+            'phpList default bundle' => [EmptyStartPageBundle::class],
             'web server' => [WebServerBundle::class],
         ];
     }

tests/Unit/EmptyStartPageBundle/PhpListEmptyStartPageBundleTest.php

@@ -1,9 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace PhpList\Core\Tests\Unit\EmptyStartPageBundle;
 
-use PhpList\Core\EmptyStartPageBundle\PhpListEmptyStartPageBundle;
+use PhpList\Core\EmptyStartPageBundle\EmptyStartPageBundle;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -15,13 +16,13 @@
 class PhpListEmptyStartPageBundleTest extends TestCase
 {
     /**
-     * @var PhpListEmptyStartPageBundle
+     * @var EmptyStartPageBundle
      */
     private $subject = null;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->subject = new PhpListEmptyStartPageBundle();
+        $this->subject = new EmptyStartPageBundle();
     }
 
     /**