Merge branch '4.1' into 4.2

bolt · Jun 14, 2021 · 9067764 · 9067764
2 parents 3e38b7c + b7de90f
commit 9067764
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Command/ExtensionsConfigureCommand.php b/src/Command/ExtensionsConfigureCommand.php
@@ -5,6 +5,7 @@
 namespace Bolt\Command;
 
 use Bolt\Common\Str;
+use Bolt\Extension\BaseExtension;
 use Bolt\Extension\ExtensionRegistry;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -14,6 +15,7 @@
 
 class ExtensionsConfigureCommand extends Command
 {
+    /** @var string */
     protected static $defaultName = 'extensions:configure';
 
     /** @var ExtensionRegistry */
@@ -65,8 +67,8 @@ private function copyExtensionConfig(array $packages): void
         foreach ($packages as $package) {
             $path = $this->getPackagePath($package);
 
-            $this->copyConfig($this->getRelativePath($path) . '/config/config.yaml', $path);
-            $this->copyConfig($this->getRelativePath($path) . '/config/config.yml', $path);
+            $this->copyConfig($this->getRelativePath($path) . '/config/config.yaml', $package);
+            $this->copyConfig($this->getRelativePath($path) . '/config/config.yml', $package);
         }
     }
 
@@ -109,7 +111,7 @@ private function copyExtensionRoutesAndServices(array $packages): void
         array_map('unlink', $oldExtensionsServices);
     }
 
-    private function copyConfig(string $source, string $package): void
+    private function copyConfig(string $source, BaseExtension $package): void
     {
         [$namespace, $name] = explode('\\', mb_strtolower($this->getNamespace($package) . '\\'));
         $destination = $this->getExtensionConfigPath($namespace, $name);
@@ -178,14 +180,14 @@ private function getExtensionConfigPath(string $namespace, string $name): string
             $name);
     }
 
-    private function getPackagePath($package): string
+    private function getPackagePath(BaseExtension $package): string
     {
         $reflection = new \ReflectionClass($package);
 
         return dirname(dirname($reflection->getFilename()));
     }
 
-    private function getNamespace($package): string
+    private function getNamespace(BaseExtension $package): string
     {
         $reflection = new \ReflectionClass($package);