Merge branch 'development'

Author: Chi-teck

.travis.yml

@@ -1,12 +1,12 @@
 language: php
 
 php:
+  - 7.1
   - 7.0
   - 5.6
-  - 5.5
 
 before_script:
-  - composer global require "phpunit/phpunit=4.*"
+  - composer global require "phpunit/phpunit"
   - composer install
 
 script:  ~/.composer/vendor/bin/phpunit

DEVELOPMENT.md

@@ -25,8 +25,7 @@ To make _dcg_ avaible in any system location append this line to your _.bashrc_
 Then after you have logged out and in the _dcg_ will be accessible through _$dcg_ global shell variable.
 
 ## Testing
-We stick to PHPUnit 4 because PHP 5.5 is not supported by PHPUnit 5. You can
-install it as follows:
+Install PHPUnit globally:
 ```shell
 composer global require "phpunit/phpunit=4.*"
 ```

composer.json

@@ -3,10 +3,10 @@
   "description": "Drupal code generator",
   "require": {
     "php": ">=5.5.9",
-    "symfony/console": "~3.0",
-    "symfony/filesystem": "~3.0",
-    "twig/twig": "~1.0",
-    "symfony/yaml": "~3.0"
+    "symfony/console": "~3.1",
+    "symfony/filesystem": "~3.1",
+    "twig/twig": "~1.24",
+    "symfony/yaml": "~3.1"
   },
   "autoload": {
     "files": ["src/bootstrap.php"],

src/Commands/BaseGenerator.php

@@ -55,21 +55,21 @@ abstract class BaseGenerator extends Command implements GeneratorInterface {
   /**
    * The file system utility.
    *
-   * @var Filesystem
+   * @var \Symfony\Component\Filesystem\Filesystem
    */
   protected $filesystem;
 
   /**
    * The twig environment.
    *
-   * @var Twig_Environment
+   * @var \Twig_Environment
    */
   protected $twig;
 
   /**
    * The yaml dumper.
    *
-   * @var Dumper
+   * @var \Symfony\Component\Yaml\Dumper
    */
   protected $yamlDumper;
 
@@ -96,6 +96,13 @@ abstract class BaseGenerator extends Command implements GeneratorInterface {
 
   /**
    * Constructs a generator command.
+   *
+   * @param \Symfony\Component\Filesystem\Filesystem $filesystem
+   *   The file system utility.
+   * @param \Twig_Environment $twig
+   *   The twig environment.
+   * @param \Symfony\Component\Yaml\Dumper $yaml_dumper
+   *   The yaml dumper.
    */
   public function __construct(Filesystem $filesystem, Twig_Environment $twig, Dumper $yaml_dumper) {
     parent::__construct();
@@ -142,15 +149,15 @@ protected function configure() {
   }
 
   /**
-   * Renders file.
+   * Renders a template.
    *
    * @param string $template
    *   Twig template.
    * @param array $vars
    *   Template variables.
    *
    * @return string
-   *   The rendered file.
+   *   A strign representing the rendered output.
    */
   protected function render($template, array $vars) {
     return $this->twig->render($template, $vars);
@@ -159,9 +166,9 @@ protected function render($template, array $vars) {
   /**
    * Asks the user for template variables.
    *
-   * @param InputInterface $input
+   * @param \Symfony\Component\Console\Input\InputInterface $input
    *   Input instance.
-   * @param OutputInterface $output
+   * @param \Symfony\Component\Console\Output\OutputInterface $output
    *   Output instance.
    * @param array $questions
    *   List of questions that the user should answer.
@@ -306,17 +313,17 @@ protected function execute(InputInterface $input, OutputInterface $output) {
   /**
    * Asks a question to the user.
    *
-   * @param InputInterface $input
+   * @param \Symfony\Component\Console\Input\InputInterface $input
    *   Input instance.
-   * @param OutputInterface $output
+   * @param \Symfony\Component\Console\Output\OutputInterface $output
    *   Output instance.
    * @param string $question_text
    *   The text of the question.
    * @param string $default_value
    *   Default value for the question.
    *
    * @return string
-   *   The user anwser.
+   *   The user answer.
    */
   protected function ask(InputInterface $input, OutputInterface $output, $question_text, $default_value) {
     /** @var \Symfony\Component\Console\Helper\QuestionHelper $helper */

src/Commands/Drupal_7/CToolsPlugin/Access.php

@@ -10,5 +10,6 @@ class Access extends BasePlugin {
   protected $name = 'd7:ctools-plugin:access';
   protected $description = 'Generates CTools access plugin';
   protected $template = 'd7/ctools-access-plugin.twig';
+  protected $directory = 'plugins/access';
 
 }

src/Commands/Drupal_7/CToolsPlugin/BasePlugin.php

@@ -13,15 +13,19 @@
 abstract class BasePlugin extends BaseGenerator {
 
   protected $template;
+  protected $directory;
 
   /**
    * {@inheritdoc}
    */
   protected function interact(InputInterface $input, OutputInterface $output) {
 
     $questions = [
-      'name' => ['Plugin name', [$this, 'defaultName']],
-      'machine_name' => ['Plugin machine name', [$this, 'defaultMachineName']],
+      'machine_name' => ['Module machine name', [$this, 'defaultMachineName']],
+      'plugin_name' => ['Plugin name', [$this, 'defaultName']],
+      'plugin_machine_name' => [
+        'Plugin machine name', [$this, 'defaultPluginMachineName'],
+      ],
       'description' => ['Plugin description', 'TODO: Write description for the plugin'],
       'package' => ['Package', 'custom'],
     ];
@@ -37,8 +41,15 @@ protected function interact(InputInterface $input, OutputInterface $output) {
       ->getHelper('question')
       ->ask($input, $output, $question);
 
-    $this->files[$vars['machine_name'] . '.inc'] = $this->render($this->template, $vars);
+    $this->files[$this->directory . '/' . $vars['plugin_machine_name'] . '.inc'] = $this->render($this->template, $vars);
 
   }
 
+  /**
+   * Returns default value for the plugin machine name question.
+   */
+  protected function defaultPluginMachineName($vars) {
+    return self::human2machine($vars['plugin_name']);
+  }
+
 }

src/Commands/Drupal_7/CToolsPlugin/ContentType.php

@@ -10,5 +10,6 @@ class ContentType extends BasePlugin {
   protected $name = 'd7:ctools-plugin:content-type';
   protected $description = 'Generates CTools content type plugin';
   protected $template = 'd7/ctools-content-type-plugin.twig';
+  protected $directory = 'plugins/content_types';
 
 }

src/Commands/Drupal_7/CToolsPlugin/Relationship.php

@@ -10,5 +10,6 @@ class Relationship extends BasePlugin {
   protected $name = 'd7:ctools-plugin:relationship';
   protected $description = 'Generates CTools relationship plugin';
   protected $template = 'd7/ctools-relationship-plugin.twig';
+  protected $directory = 'plugins/relationships';
 
 }

src/Commands/Drupal_7/ViewsPlugin/ArgumentDefault.php

@@ -23,7 +23,9 @@ protected function interact(InputInterface $input, OutputInterface $output) {
       'name' => ['Module name', [$this, 'defaultName']],
       'machine_name' => ['Module machine name', [$this, 'defaultMachineName']],
       'plugin_name' => ['Plugin name', 'Example'],
-      'plugin_machine_name' => ['Plugin machine name', [$this, 'defaultPluginMachineName']],
+      'plugin_machine_name' => [
+        'Plugin machine name', [$this, 'defaultPluginMachineName'],
+      ],
     ];
 
     $vars = $this->collectVars($input, $output, $questions);

src/Commands/Drupal_8/BreadcrumbBuilder.php

@@ -36,7 +36,7 @@ protected function interact(InputInterface $input, OutputInterface $output) {
         [
           'name' => 'breadcrumb_builder',
           'priority' => 1000,
-        ]
+        ],
       ],
     ];