Merge pull request #51 from Niklan/issue-50

Issue #50. Remove or improve Drupal major version mentioning.

Author: Chi-teck

resources/fish-completion

@@ -26,19 +26,19 @@ complete -c dcg -f -n '__fish_dcg_no_subcommand' -a generate-completion -d 'Gene
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a help -d 'Displays help for a command'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a hook -d 'Generates a hook'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a install-file -d 'Generates an install file'
-complete -c dcg -f -n '__fish_dcg_no_subcommand' -a javascript -d 'Generates Drupal 8 JavaScript file'
+complete -c dcg -f -n '__fish_dcg_no_subcommand' -a javascript -d 'Generates Drupal JavaScript file'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a layout -d 'Generates a layout'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a list -d 'Lists commands'
-complete -c dcg -f -n '__fish_dcg_no_subcommand' -a module -d 'Generates Drupal 8 module'
+complete -c dcg -f -n '__fish_dcg_no_subcommand' -a module -d 'Generates Drupal module'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a module-file -d 'Generates a module file'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a navigation -d 'Command line code generator'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a plugin-manager -d 'Generates plugin manager'
-complete -c dcg -f -n '__fish_dcg_no_subcommand' -a render-element -d 'Generates Drupal 8 render element'
+complete -c dcg -f -n '__fish_dcg_no_subcommand' -a render-element -d 'Generates Drupal render element'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a service-provider -d 'Generates a service provider'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a template -d 'Generates a template'
-complete -c dcg -f -n '__fish_dcg_no_subcommand' -a theme -d 'Generates Drupal 8 theme'
+complete -c dcg -f -n '__fish_dcg_no_subcommand' -a theme -d 'Generates Drupal theme'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a theme-file -d 'Generates a theme file'
-complete -c dcg -f -n '__fish_dcg_no_subcommand' -a theme-settings -d 'Generates Drupal 8 theme-settings.php file'
+complete -c dcg -f -n '__fish_dcg_no_subcommand' -a theme-settings -d 'Generates Drupal theme-settings.php file'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a console:dcg-command -d 'Generates DCG command'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a console:drupal-console-command -d 'Generates Drupal Console command'
 complete -c dcg -f -n '__fish_dcg_no_subcommand' -a console:drush-command -d 'Generates Drush command'

resources/zsh-completion

@@ -19,7 +19,7 @@ _dcg()
         opts=("--help:Display this help message" "--quiet:Do not output any message" "--verbose:Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug" "--version:Display this application version" "--ansi:Force ANSI output" "--no-ansi:Disable ANSI output" "--no-interaction:Do not ask any interactive question")
     elif [[ $cur == $com ]]; then
         state="command"
-        coms=("composer:Generates a composer.json file" "configuration-entity:Generates configuration entity module" "content-entity:Generates content entity module" "controller:Generates a controller" "field:Generates a field" "generate-completion:Generates shell completion" "help:Displays help for a command" "hook:Generates a hook" "install-file:Generates an install file" "javascript:Generates Drupal 8 JavaScript file" "layout:Generates a layout" "list:Lists commands" "module:Generates Drupal 8 module" "module-file:Generates a module file" "navigation:Command line code generator" "plugin-manager:Generates plugin manager" "render-element:Generates Drupal 8 render element" "service-provider:Generates a service provider" "template:Generates a template" "theme:Generates Drupal 8 theme" "theme-file:Generates a theme file" "theme-settings:Generates Drupal 8 theme-settings.php file" "console\:dcg-command:Generates DCG command" "console\:drupal-console-command:Generates Drupal Console command" "console\:drush-command:Generates Drush command" "console\:symfony-command:Generates Symfony console command" "form\:config:Generates a configuration form" "form\:confirm:Generates a confirmation form" "form\:simple:Generates simple form" "misc\:apache-virtual-host:Generates an Apache site configuration file" "misc\:d7\:ctools-plugin\:access:Generates CTools access plugin" "misc\:d7\:ctools-plugin\:content-type:Generates CTools content type plugin" "misc\:d7\:ctools-plugin\:relationship:Generates CTools relationship plugin" "misc\:d7\:hook:Generates a hook" "misc\:d7\:install-file:Generates Drupal 7 install file" "misc\:d7\:javascript:Generates Drupal 7 JavaScript file" "misc\:d7\:module:Generates Drupal 7 module" "misc\:d7\:module-file:Generates Drupal 7 module file" "misc\:d7\:module-info:Generates Drupal 7 info file for a module" "misc\:d7\:settings.php:Generates Drupal 7 settings.php file" "misc\:d7\:template.php:Generates Drupal 7 template.php file" "misc\:d7\:test:Generates Drupal 7 test case" "misc\:d7\:theme:Generates Drupal 7 theme" "misc\:d7\:theme-info:Generates info file for a Drupal 7 theme" "misc\:d7\:views-plugin\:argument-default:Generates Drupal 7 argument default views plugin" "misc\:html-page:Generates a simple html page" "misc\:nginx-virtual-host:Generates an Nginx site configuration file" "misc\:project:Generates a composer project" "plugin\:action:Generates action plugin" "plugin\:block:Generates block plugin" "plugin\:ckeditor:Generates CKEditor plugin" "plugin\:condition:Generates condition plugin" "plugin\:constraint:Generates constraint plugin" "plugin\:entity-reference-selection:Generates entity reference selection plugin" "plugin\:field\:formatter:Generates field formatter plugin" "plugin\:field\:type:Generates field type plugin" "plugin\:field\:widget:Generates field widget plugin" "plugin\:filter:Generates filter plugin" "plugin\:menu-link:Generates menu-link plugin" "plugin\:migrate\:destination:Generates migrate destination plugin" "plugin\:migrate\:process:Generates migrate process plugin" "plugin\:migrate\:source:Generates migrate source plugin" "plugin\:queue-worker:Generates queue worker plugin" "plugin\:rest-resource:Generates rest resource plugin" "plugin\:views\:argument-default:Generates views default argument plugin" "plugin\:views\:field:Generates views field plugin" "plugin\:views\:style:Generates views style plugin" "service\:access-checker:Generates an access checker service" "service\:breadcrumb-builder:Generates a breadcrumb builder service" "service\:cache-context:Generates a cache context service" "service\:custom:Generates a custom Drupal service" "service\:event-subscriber:Generates an event subscriber" "service\:logger:Generates a logger service" "service\:middleware:Generates a middleware" "service\:param-converter:Generates a param converter service" "service\:path-processor:Generates a path processor service" "service\:request-policy:Generates a request policy service" "service\:response-policy:Generates a response policy service" "service\:route-subscriber:Generates a route subscriber" "service\:theme-negotiator:Generates a theme negotiator" "service\:twig-extension:Generates Twig extension service" "service\:uninstall-validator:Generates a uninstall validator service" "test\:browser:Generates a browser based test" "test\:kernel:Generates a kernel based test" "test\:nightwatch:Generates a nightwatch test" "test\:unit:Generates a unit test" "test\:webdriver:Generates a test that supports JavaScript" "yml\:breakpoints:Generates a breakpoints yml file" "yml\:links\:action:Generates a links.action yml file" "yml\:links\:contextual:Generates links.contextual yml file" "yml\:links\:menu:Generates a links.menu yml file" "yml\:links\:task:Generates a links.task yml file" "yml\:module-info:Generates a module info yml file" "yml\:module-libraries:Generates module libraries yml file" "yml\:permissions:Generates a permissions yml file" "yml\:routing:Generates a routing yml file" "yml\:services:Generates a services yml file" "yml\:theme-info:Generates a theme info yml file" "yml\:theme-libraries:Generates theme libraries yml file")
+        coms=("composer:Generates a composer.json file" "configuration-entity:Generates configuration entity module" "content-entity:Generates content entity module" "controller:Generates a controller" "field:Generates a field" "generate-completion:Generates shell completion" "help:Displays help for a command" "hook:Generates a hook" "install-file:Generates an install file" "javascript:Generates Drupal JavaScript file" "layout:Generates a layout" "list:Lists commands" "module:Generates Drupal module" "module-file:Generates a module file" "navigation:Command line code generator" "plugin-manager:Generates plugin manager" "render-element:Generates Drupal render element" "service-provider:Generates a service provider" "template:Generates a template" "theme:Generates Drupal theme" "theme-file:Generates a theme file" "theme-settings:Generates Drupal theme-settings.php file" "console\:dcg-command:Generates DCG command" "console\:drupal-console-command:Generates Drupal Console command" "console\:drush-command:Generates Drush command" "console\:symfony-command:Generates Symfony console command" "form\:config:Generates a configuration form" "form\:confirm:Generates a confirmation form" "form\:simple:Generates simple form" "misc\:apache-virtual-host:Generates an Apache site configuration file" "misc\:d7\:ctools-plugin\:access:Generates CTools access plugin" "misc\:d7\:ctools-plugin\:content-type:Generates CTools content type plugin" "misc\:d7\:ctools-plugin\:relationship:Generates CTools relationship plugin" "misc\:d7\:hook:Generates a hook" "misc\:d7\:install-file:Generates Drupal 7 install file" "misc\:d7\:javascript:Generates Drupal 7 JavaScript file" "misc\:d7\:module:Generates Drupal 7 module" "misc\:d7\:module-file:Generates Drupal 7 module file" "misc\:d7\:module-info:Generates Drupal 7 info file for a module" "misc\:d7\:settings.php:Generates Drupal 7 settings.php file" "misc\:d7\:template.php:Generates Drupal 7 template.php file" "misc\:d7\:test:Generates Drupal 7 test case" "misc\:d7\:theme:Generates Drupal 7 theme" "misc\:d7\:theme-info:Generates info file for a Drupal 7 theme" "misc\:d7\:views-plugin\:argument-default:Generates Drupal 7 argument default views plugin" "misc\:html-page:Generates a simple html page" "misc\:nginx-virtual-host:Generates an Nginx site configuration file" "misc\:project:Generates a composer project" "plugin\:action:Generates action plugin" "plugin\:block:Generates block plugin" "plugin\:ckeditor:Generates CKEditor plugin" "plugin\:condition:Generates condition plugin" "plugin\:constraint:Generates constraint plugin" "plugin\:entity-reference-selection:Generates entity reference selection plugin" "plugin\:field\:formatter:Generates field formatter plugin" "plugin\:field\:type:Generates field type plugin" "plugin\:field\:widget:Generates field widget plugin" "plugin\:filter:Generates filter plugin" "plugin\:menu-link:Generates menu-link plugin" "plugin\:migrate\:destination:Generates migrate destination plugin" "plugin\:migrate\:process:Generates migrate process plugin" "plugin\:migrate\:source:Generates migrate source plugin" "plugin\:queue-worker:Generates queue worker plugin" "plugin\:rest-resource:Generates rest resource plugin" "plugin\:views\:argument-default:Generates views default argument plugin" "plugin\:views\:field:Generates views field plugin" "plugin\:views\:style:Generates views style plugin" "service\:access-checker:Generates an access checker service" "service\:breadcrumb-builder:Generates a breadcrumb builder service" "service\:cache-context:Generates a cache context service" "service\:custom:Generates a custom Drupal service" "service\:event-subscriber:Generates an event subscriber" "service\:logger:Generates a logger service" "service\:middleware:Generates a middleware" "service\:param-converter:Generates a param converter service" "service\:path-processor:Generates a path processor service" "service\:request-policy:Generates a request policy service" "service\:response-policy:Generates a response policy service" "service\:route-subscriber:Generates a route subscriber" "service\:theme-negotiator:Generates a theme negotiator" "service\:twig-extension:Generates Twig extension service" "service\:uninstall-validator:Generates a uninstall validator service" "test\:browser:Generates a browser based test" "test\:kernel:Generates a kernel based test" "test\:nightwatch:Generates a nightwatch test" "test\:unit:Generates a unit test" "test\:webdriver:Generates a test that supports JavaScript" "yml\:breakpoints:Generates a breakpoints yml file" "yml\:links\:action:Generates a links.action yml file" "yml\:links\:contextual:Generates links.contextual yml file" "yml\:links\:menu:Generates a links.menu yml file" "yml\:links\:task:Generates a links.task yml file" "yml\:module-info:Generates a module info yml file" "yml\:module-libraries:Generates module libraries yml file" "yml\:permissions:Generates a permissions yml file" "yml\:routing:Generates a routing yml file" "yml\:services:Generates a services yml file" "yml\:theme-info:Generates a theme info yml file" "yml\:theme-libraries:Generates theme libraries yml file")
     fi
 
     case $state in

src/Command/JavaScript.php

@@ -8,7 +8,7 @@
 final class JavaScript extends ModuleGenerator {
 
   protected $name = 'javascript';
-  protected $description = 'Generates Drupal 8 JavaScript file';
+  protected $description = 'Generates Drupal JavaScript file';
 
   /**
    * {@inheritdoc}

src/Command/Module.php

@@ -8,7 +8,7 @@
 final class Module extends ModuleGenerator {
 
   protected $name = 'module';
-  protected $description = 'Generates Drupal 8 module';
+  protected $description = 'Generates Drupal module';
   protected $isNewExtension = TRUE;
 
   /**

src/Command/RenderElement.php

@@ -8,7 +8,7 @@
 final class RenderElement extends ModuleGenerator {
 
   protected $name = 'render-element';
-  protected $description = 'Generates Drupal 8 render element';
+  protected $description = 'Generates Drupal render element';
   protected $nameQuestion = NULL;
 
   /**

src/Command/Theme.php

@@ -12,7 +12,7 @@
 final class Theme extends ThemeGenerator {
 
   protected $name = 'theme';
-  protected $description = 'Generates Drupal 8 theme';
+  protected $description = 'Generates Drupal theme';
   protected $isNewExtension = TRUE;
 
   /**

src/Command/ThemeSettings.php

@@ -8,7 +8,7 @@
 final class ThemeSettings extends ThemeGenerator {
 
   protected $name = 'theme-settings';
-  protected $description = 'Generates Drupal 8 theme-settings.php file';
+  protected $description = 'Generates Drupal theme-settings.php file';
 
   /**
    * {@inheritdoc}

templates/misc/nginx-virtual-host/host.twig

@@ -63,7 +63,7 @@ server {
         return 404;
     }
 
-    # In Drupal 8, we must also match new paths where the '.php' appears in
+    # Since Drupal 8, we must also match new paths where the '.php' appears in
     # the middle, such as update.php/selection. The rule we use is strict,
     # and only allows this pattern with the update.php front controller.
     # This allows legacy path aliases in the form of

templates/module-file/module.twig

@@ -3,8 +3,4 @@
 /**
  * @file
  * Primary module hooks for {{ name }} module.
- *
- * @DCG
- * This file is no longer required in Drupal 8.
- * @see https://www.drupal.org/node/2217931
  */

tests/dcg/Generator/Misc/_nginx_virtual_host

@@ -61,7 +61,7 @@ server {
         return 404;
     }
 
-    # In Drupal 8, we must also match new paths where the '.php' appears in
+    # Since Drupal 8, we must also match new paths where the '.php' appears in
     # the middle, such as update.php/selection. The rule we use is strict,
     # and only allows this pattern with the update.php front controller.
     # This allows legacy path aliases in the form of