From e8a440b0e36dc3a0b6c2097bb0b5812eefe9b1ff Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Sun, 27 Dec 2020 16:25:05 +0100
Subject: [PATCH] docker/l3d#58 Move project settings out of composer.json
---
src/Handler.php | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index 5a44cca..c540517 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -69,7 +69,7 @@ class Handler extends BaseHandler {
if ($projectName === NULL) {
$defaultName = str_replace([' ', '-', '_', '.'], '', basename(getcwd())) . '_theme';
$projectName = $this->env->receive('name', 'Name of custom theme', $defaultName);
- $this->config->setValue(['project_name' => $projectName]);
+ $this->config->setValue('project_name', $projectName);
}
$fs = new Filesystem();
@@ -118,7 +118,7 @@ class Handler extends BaseHandler {
}
$bowerAssets['dependencies'] = implode(",\n ", $dependencies);
$bowerAssets['jsfiles'] = $jsFiles;
- $this->config->setValue(['bower_assets' => $bowerAssets]);
+ $this->config->setValue('bower_assets', $bowerAssets);
}
/**
@@ -238,7 +238,7 @@ class Handler extends BaseHandler {
* The file list.
*/
protected function getIgnoredFiles(): array {
- return array_merge((empty($this->config->readValue('bower_assets')['dependencies']) ? ['bower.json'] : []), [
+ return array_merge((empty($this->config->readValue(['bower_assets', 'dependencies'])) ? ['bower.json'] : []), [
'templates/README.md',
'README.md',
'{{ project_name }}.starterkit.yml',
@@ -289,7 +289,6 @@ class Handler extends BaseHandler {
* The processed string.
*/
protected function twig(string $string): string {
- $this->init();
if (empty($string)) {
return '';
}
@@ -432,12 +431,12 @@ class Handler extends BaseHandler {
$baseThemePackage = $this->getPackage($baseTheme['package']);
if ($baseThemePackage && isset($baseTheme['starterkit'])) {
$starterkitRoot = $this->getInstallationManager()->getInstallPath($baseThemePackage) . DIRECTORY_SEPARATOR . $baseTheme['starterkit'];
- $this->config->setValue(['base_theme_files' => $this->copyFiles($fs, $starterkitRoot, $destination)]);
+ $this->config->setValue('base_theme_files', $this->copyFiles($fs, $starterkitRoot, $destination));
}
}
// Remove bower stuff if that's available globally.
- if ($this->config->readValue('bower_assets/dependencies') === NULL) {
+ if ($this->config->readValue(['bower_assets', 'dependencies']) === NULL) {
if ($fs->exists($destination . DIRECTORY_SEPARATOR . 'bower.json')) {
$fs->remove($destination . DIRECTORY_SEPARATOR . 'bower.json');
}
@@ -462,7 +461,7 @@ class Handler extends BaseHandler {
}
// Handle Bower if not installed globally.
- if ($fs->exists($destination . DIRECTORY_SEPARATOR . 'bower.json') && $this->config->readValue('bower_assets/dependencies') !== NULL) {
+ if ($fs->exists($destination . DIRECTORY_SEPARATOR . 'bower.json') && $this->config->readValue(['bower_assets', 'dependencies']) !== NULL) {
if ($this->update) {
$this->bower('update');
}
--
GitLab