Removed unused code, removed unused imports

laminas · Jul 17, 2023 · 82db7dd · 82db7dd
1 parent a1873b2
commit 82db7dd
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 25 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -77,8 +77,5 @@
             InjectorInterface::TYPE_MODULE,
         ])</code>
     </InvalidPropertyAssignmentValue>
-    <UnusedMethod>
-      <code>createDevelopmentWorkConfig</code>
-    </UnusedMethod>
   </file>
 </files>
diff --git a/src/Injector/AbstractInjector.php b/src/Injector/AbstractInjector.php
@@ -7,7 +7,6 @@
 use Laminas\ComponentInstaller\Exception;
 
 use function addslashes;
-use function assert;
 use function count;
 use function file_get_contents;
 use function file_put_contents;

diff --git a/src/Injector/ConfigAggregatorInjector.php b/src/Injector/ConfigAggregatorInjector.php
@@ -7,7 +7,6 @@
 use Laminas\ComponentInstaller\ConfigDiscovery\ConfigAggregator as ConfigAggregatorDiscovery;
 use Laminas\ComponentInstaller\ConfigDiscovery\DiscoveryInterface;
 
-use function assert;
 use function preg_quote;
 use function sprintf;
 

diff --git a/src/Injector/MezzioConfigInjector.php b/src/Injector/MezzioConfigInjector.php
@@ -7,7 +7,6 @@
 use Laminas\ComponentInstaller\ConfigDiscovery\DiscoveryInterface;
 use Laminas\ComponentInstaller\ConfigDiscovery\MezzioConfig as MezzioConfigDiscovery;
 
-use function assert;
 use function preg_quote;
 use function sprintf;
 

diff --git a/test/ComponentInstallerTest.php b/test/ComponentInstallerTest.php
@@ -30,13 +30,11 @@
 use function dirname;
 use function file_get_contents;
 use function implode;
-use function is_string;
 use function method_exists;
 use function mkdir;
 use function preg_match;
 use function preg_quote;
 use function sprintf;
-use function strpos;
 
 /**
  * @psalm-type ComponentInstallerConfiguration array{component?:string,module?:string}

diff --git a/test/ConfigDiscoveryTest.php b/test/ConfigDiscoveryTest.php
@@ -180,83 +180,107 @@ public function testGetAvailableConfigOptionsReturnsOptionsForEachSupportedPacka
 
     /**
      * @psalm-return array<array-key, array{
-     *     seedMethod: string,
+     *     seedMethod: callable(self): void,
      *     type: InjectorInterface::TYPE_*,
      *     expected: class-string<InjectorInterface>,
      *     chain: bool
      * }>
      */
-    public function configFileSubset(): array
+    public static function configFileSubset(): array
     {
         return [
             [
-                'seedMethod' => 'createApplicationConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createApplicationConfig();
+                },
                 'type'       => InjectorInterface::TYPE_COMPONENT,
                 'expected'   => Injector\ApplicationConfigInjector::class,
                 'chain'      => false,
             ],
             [
-                'seedMethod' => 'createApplicationConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createApplicationConfig();
+                },
                 'type'       => InjectorInterface::TYPE_MODULE,
                 'expected'   => Injector\ApplicationConfigInjector::class,
                 'chain'      => false,
             ],
             [
-                'seedMethod' => 'createAggregatorConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createAggregatorConfig();
+                },
                 'type'       => InjectorInterface::TYPE_CONFIG_PROVIDER,
                 'expected'   => Injector\ConfigAggregatorInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createAggregatorConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createAggregatorConfig();
+                },
                 'type'       => InjectorInterface::TYPE_CONFIG_PROVIDER,
                 'expected'   => Injector\ConfigAggregatorInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createDevelopmentConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createDevelopmentConfig();
+                },
                 'type'       => InjectorInterface::TYPE_COMPONENT,
                 'expected'   => Injector\DevelopmentConfigInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createDevelopmentConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createDevelopmentConfig();
+                },
                 'type'       => InjectorInterface::TYPE_MODULE,
                 'expected'   => Injector\DevelopmentConfigInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createDevelopmentWorkConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createDevelopmentWorkConfig();
+                },
                 'type'       => InjectorInterface::TYPE_COMPONENT,
                 'expected'   => Injector\DevelopmentWorkConfigInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createDevelopmentWorkConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createDevelopmentWorkConfig();
+                },
                 'type'       => InjectorInterface::TYPE_MODULE,
                 'expected'   => Injector\DevelopmentWorkConfigInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createMezzioConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createMezzioConfig();
+                },
                 'type'       => InjectorInterface::TYPE_CONFIG_PROVIDER,
                 'expected'   => Injector\MezzioConfigInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createMezzioConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createMezzioConfig();
+                },
                 'type'       => InjectorInterface::TYPE_CONFIG_PROVIDER,
                 'expected'   => Injector\MezzioConfigInjector::class,
                 'chain'      => true,
             ],
             [
-                'seedMethod' => 'createModulesConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createModulesConfig();
+                },
                 'type'       => InjectorInterface::TYPE_COMPONENT,
                 'expected'   => Injector\ModulesConfigInjector::class,
                 'chain'      => false,
             ],
             [
-                'seedMethod' => 'createModulesConfig',
+                'seedMethod' => static function (self $test): void {
+                    $test->createModulesConfig();
+                },
                 'type'       => InjectorInterface::TYPE_MODULE,
                 'expected'   => Injector\ModulesConfigInjector::class,
                 'chain'      => false,
@@ -266,16 +290,17 @@ public function configFileSubset(): array
 
     /**
      * @dataProvider configFileSubset
+     * @param (callable(self): void) $seedMethod
      * @param InjectorInterface::TYPE_* $type
      * @param class-string<InjectorInterface> $expected
      */
     public function testGetAvailableConfigOptionsCanReturnsSubsetOfOptionsBaseOnPackageType(
-        string $seedMethod,
+        callable $seedMethod,
         int $type,
         string $expected,
         bool $chain
     ): void {
-        $this->{$seedMethod}();
+        $seedMethod($this);
         $options = $this->discovery->getAvailableConfigOptions(new Collection([$type]), vfsStream::url('project'));
         $this->assertCount(2, $options);
 

diff --git a/test/RememberedAnswerQuestionAssertion.php b/test/RememberedAnswerQuestionAssertion.php
@@ -4,7 +4,6 @@
 
 namespace LaminasTest\ComponentInstaller;
 
-use function assert;
 use function sprintf;
 use function strpos;