Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / chi-teck / drupal-code-generator / src / Command / Drupal_8 / Theme.php

diff --git a/vendor/chi-teck/drupal-code-generator/src/Command/Drupal_8/Theme.php b/vendor/chi-teck/drupal-code-generator/src/Command/Drupal_8/Theme.php
index bfadd8d9f9ba7f4b4c17fc23980101bc925ba26f..638cf646d0a1bd15ea7d3ea7ef15a129e136f047 100644 (file)
--- a/vendor/chi-teck/drupal-code-generator/src/Command/Drupal_8/Theme.php
+++ b/vendor/chi-teck/drupal-code-generator/src/Command/Drupal_8/Theme.php
@@ -6,12 +6,13 @@ use DrupalCodeGenerator\Command\BaseGenerator;
 use DrupalCodeGenerator\Utils;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
 
 /**
  * Implements d8:theme command.
  *
- * @TODO: Create a test for this.
+ * @TODO: Create a SUT test for this.
  */
 class Theme extends BaseGenerator {
 
@@ -29,6 +30,9 @@ class Theme extends BaseGenerator {
     $questions['base_theme'] = new Question('Base theme', 'classy');
     $questions['description'] = new Question('Description', 'A flexible theme with a responsive, mobile-first layout.');
     $questions['package'] = new Question('Package', 'Custom');
+    $questions['sass'] = new ConfirmationQuestion('Would you like to use SASS to compile style sheets?', FALSE);
+    $questions['breakpoints'] = new ConfirmationQuestion('Would you like to create breakpoints?', FALSE);
+    $questions['theme_settings'] = new ConfirmationQuestion('Would you like to create theme settings form?', FALSE);
 
     $vars = $this->collectVars($input, $output, $questions);
     $vars['base_theme'] = Utils::human2machine($vars['base_theme']);
@@ -43,10 +47,6 @@ class Theme extends BaseGenerator {
       ->path($prefix . '.libraries.yml')
       ->template('d8/yml/theme-libraries.twig');
 
-    $this->addFile()
-      ->path($prefix . '.breakpoints.yml')
-      ->template('d8/yml/breakpoints.twig');
-
     $this->addFile()
       ->path($prefix . '.theme')
       ->template('d8/theme.twig');
@@ -55,48 +55,81 @@ class Theme extends BaseGenerator {
       ->path('{machine_name}/js/' . str_replace('_', '-', $vars['machine_name']) . '.js')
       ->template('d8/javascript.twig');
 
-    $this->addFile()
-      ->path('{machine_name}/theme-settings.php')
-      ->template('d8/theme-settings-form.twig');
+    if ($vars['breakpoints']) {
+      $this->addFile()
+        ->path($prefix . '.breakpoints.yml')
+        ->template('d8/yml/breakpoints.twig');
+    }
 
-    $this->addFile()
-      ->path('{machine_name}/config/install/{machine_name}.settings.yml')
-      ->template('d8/theme-settings-config.twig');
+    if ($vars['theme_settings']) {
+      $this->addFile()
+        ->path('{machine_name}/theme-settings.php')
+        ->template('d8/theme-settings-form.twig');
 
-    $this->addFile()
-      ->path('{machine_name}/config/schema/{machine_name}.schema.yml')
-      ->template('d8/theme-settings-schema.twig');
+      $this->addFile()
+        ->path('{machine_name}/config/install/{machine_name}.settings.yml')
+        ->template('d8/theme-settings-config.twig');
+
+      $this->addFile()
+        ->path('{machine_name}/config/schema/{machine_name}.schema.yml')
+        ->template('d8/theme-settings-schema.twig');
+    }
 
     $this->addFile()
       ->path('{machine_name}/logo.svg')
       ->template('d8/theme-logo.twig');
 
+    // Templates directory structure.
+    $this->addDirectory()
+      ->path('{machine_name}/templates/page');
+
+    $this->addDirectory()
+      ->path('{machine_name}/templates/node');
+
+    $this->addDirectory()
+      ->path('{machine_name}/templates/field');
+
+    $this->addDirectory()
+      ->path('{machine_name}/templates/view');
+
     $this->addDirectory()
-      ->path('{machine_name}/templates');
+      ->path('{machine_name}/templates/block');
+
+    $this->addDirectory()
+      ->path('{machine_name}/templates/menu');
 
     $this->addDirectory()
       ->path('{machine_name}/images');
 
-    $css_files = [
-      'base/elements.css',
-      'components/block.css',
-      'components/breadcrumb.css',
-      'components/field.css',
-      'components/form.css',
-      'components/header.css',
-      'components/menu.css',
-      'components/messages.css',
-      'components/node.css',
-      'components/sidebar.css',
-      'components/table.css',
-      'components/tabs.css',
-      'components/buttons.css',
-      'layouts/layout.css',
-      'theme/print.css',
+    $this->addFile()
+      ->path('{machine_name}/package.json')
+      ->template('d8/theme-package.json.twig');
+
+    // Style sheets directory structure.
+    $this->addDirectory()
+      ->path('{machine_name}/css');
+
+    $style_sheets = [
+      'base/elements',
+      'components/block',
+      'components/breadcrumb',
+      'components/field',
+      'components/form',
+      'components/header',
+      'components/menu',
+      'components/messages',
+      'components/node',
+      'components/sidebar',
+      'components/table',
+      'components/tabs',
+      'components/buttons',
+      'layouts/layout',
+      'theme/print',
     ];
-    foreach ($css_files as $file) {
+
+    foreach ($style_sheets as $file) {
       $this->addFile()
-        ->path('{machine_name}/css/' . $file)
+        ->path('{machine_name}/' . ($vars['sass'] ? "scss/$file.scss" : "css/$file.css"))
         ->content('');
     }