Skip to content
Snippets Groups Projects
Commit e8a440b0 authored by jurgenhaas's avatar jurgenhaas
Browse files

docker/l3d#58 Move project settings out of composer.json

parent c1ea3ffb
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,7 @@ class Handler extends BaseHandler { ...@@ -69,7 +69,7 @@ class Handler extends BaseHandler {
if ($projectName === NULL) { if ($projectName === NULL) {
$defaultName = str_replace([' ', '-', '_', '.'], '', basename(getcwd())) . '_theme'; $defaultName = str_replace([' ', '-', '_', '.'], '', basename(getcwd())) . '_theme';
$projectName = $this->env->receive('name', 'Name of custom theme', $defaultName); $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(); $fs = new Filesystem();
...@@ -118,7 +118,7 @@ class Handler extends BaseHandler { ...@@ -118,7 +118,7 @@ class Handler extends BaseHandler {
} }
$bowerAssets['dependencies'] = implode(",\n ", $dependencies); $bowerAssets['dependencies'] = implode(",\n ", $dependencies);
$bowerAssets['jsfiles'] = $jsFiles; $bowerAssets['jsfiles'] = $jsFiles;
$this->config->setValue(['bower_assets' => $bowerAssets]); $this->config->setValue('bower_assets', $bowerAssets);
} }
/** /**
...@@ -238,7 +238,7 @@ class Handler extends BaseHandler { ...@@ -238,7 +238,7 @@ class Handler extends BaseHandler {
* The file list. * The file list.
*/ */
protected function getIgnoredFiles(): array { 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', 'templates/README.md',
'README.md', 'README.md',
'{{ project_name }}.starterkit.yml', '{{ project_name }}.starterkit.yml',
...@@ -289,7 +289,6 @@ class Handler extends BaseHandler { ...@@ -289,7 +289,6 @@ class Handler extends BaseHandler {
* The processed string. * The processed string.
*/ */
protected function twig(string $string): string { protected function twig(string $string): string {
$this->init();
if (empty($string)) { if (empty($string)) {
return ''; return '';
} }
...@@ -432,12 +431,12 @@ class Handler extends BaseHandler { ...@@ -432,12 +431,12 @@ class Handler extends BaseHandler {
$baseThemePackage = $this->getPackage($baseTheme['package']); $baseThemePackage = $this->getPackage($baseTheme['package']);
if ($baseThemePackage && isset($baseTheme['starterkit'])) { if ($baseThemePackage && isset($baseTheme['starterkit'])) {
$starterkitRoot = $this->getInstallationManager()->getInstallPath($baseThemePackage) . DIRECTORY_SEPARATOR . $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. // 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')) { if ($fs->exists($destination . DIRECTORY_SEPARATOR . 'bower.json')) {
$fs->remove($destination . DIRECTORY_SEPARATOR . 'bower.json'); $fs->remove($destination . DIRECTORY_SEPARATOR . 'bower.json');
} }
...@@ -462,7 +461,7 @@ class Handler extends BaseHandler { ...@@ -462,7 +461,7 @@ class Handler extends BaseHandler {
} }
// Handle Bower if not installed globally. // 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) { if ($this->update) {
$this->bower('update'); $this->bower('update');
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment