Upgrade to 3.0.3

2019-03-05 10:55:03 +01:00
parent 8e3d86a590
commit 418db4b09b
40 changed files with 704 additions and 144 deletions
--- a/kirby/vendor/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php
+++ b/kirby/vendor/getkirby/composer-installer/src/ComposerInstaller/CmsInstaller.php
@@ -42,7 +42,16 @@ class CmsInstaller extends Installer
        }

        // use path from configuration, otherwise fall back to default
-        $path = $extra['kirby-cms-path'] ?? 'kirby';
+        if (isset($extra['kirby-cms-path'])) {
+            $path = $extra['kirby-cms-path'];
+        } else {
+            $path = 'kirby';
+        }
+
+        // if explicitly set to something invalid (e.g. `false`), install to vendor dir
+        if (!is_string($path)) {
+            return parent::getInstallPath($package);
+        }

        // don't allow unsafe directories
        $vendorDir = $this->composer->getConfig()->get('vendor-dir', Config::RELATIVE_PATHS) ?? 'vendor';