Drupal coding standars

.travis.yml

@@ -5,4 +5,9 @@ php:
   - 5.6
 
 before_script:
-  - composer install
+  - composer install --dev --prefer-source
+
+after_success:
+  - ./bin/phpcs --standard=vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml /tmp/modules/*
+  #- if ./bin/phpcs --standard=vendor/drupal/coder/coder_sniffer/Drupal/ruleset.xml /tmp/modules/* | egrep "FOUND ([1-9]+) ERRORS" --quiet; then echo "\nErrors in coding standards\n"; exit 1; fi
+  - rm -r /tmp/modules

Tests/Generator/CommandGeneratorTest.php

@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\AppConsole\Test\Generator\CommandGeneratorTest.
+ */
+
+namespace Drupal\AppConsole\Test\Generator;
+
+
+use Drupal\AppConsole\Generator\CommandGenerator;
+
+class CommandGeneratorTest extends GeneratorTest
+{
+  /**
+   * @dataProvider commandData
+   */
+  public function testCommandGenerator($parameters)
+  {
+    list($module, $command, $class_name, $container) = $parameters;
+
+    $generator = $this->getGenerator();
+
+    $dir_module = $this->dir . '/' . $module;
+
+    $generator->expects($this->once())
+      ->method('getCommandPath')
+      ->will(
+        $this->returnValue(
+          $dir_module . '/src/Command'
+        )
+      );
+
+    // Generate command
+    $generator->generate($module, $command, $class_name, $container);
+
+    $this->assertTrue(
+      is_file($dir_module . '/src/Command/' . $class_name . '.php'),
+      'Command class generated'
+    );
+  }
+
+  public function commandData()
+  {
+    return [
+      [
+        ['command_' . rand(), 'command:default', 'CommandDefault', false]
+      ],
+      [
+        ['command_' . rand(), 'command:default', 'CommandDefault', true]
+      ],
+    ];
+  }
+
+  protected function getGenerator()
+  {
+    $generator = $this->getMockBuilder('\Drupal\AppConsole\Generator\CommandGenerator')
+      ->setMethods(['getCommandPath'])
+      ->getMock();
+
+    $generator->setSkeletonDirs($this->getSkeletonDirs());
+
+    return $generator;
+  }
+}

Tests/Generator/ControllerGeneratorTest.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: dmouse
+ * Date: 7/27/14
+ * Time: 2:50 PM
+ */
+
+namespace Drupal\AppConsole\Test\Generator;
+
+
+class ControllerGeneratorTest extends GeneratorTest
+{
+
+  /**
+   * @dataProvider commandData
+   */
+  public function testGenerateController($parameters)
+  {
+    list($module, $class_name, $method_name, $route, $test, $services, $class_machine_name) = $parameters;
+
+    $generator = $this->getGenerator();
+
+    $generator->expects($this->once())
+      ->method('getControllerPath')
+      ->will(
+        $this->returnValue(
+          $this->getModulePath($module) . '/src/Controller'
+        )
+      );
+
+    $generator->expects($this->once())
+      ->method('getModulePath')
+      ->will(
+        $this->returnValue(
+          $this->getModulePath($module)
+        )
+      );
+
+    $generator->expects($this->any())
+      ->method('getTestPath')
+      ->will(
+        $this->returnValue(
+          $this->getModulePath($module) . '/Tests/Controller'
+        )
+      );
+
+    $generator->generate($module, $class_name, $method_name, $route, $test, $services, $class_machine_name);
+
+    $this->assertTrue(
+      is_file($this->getModulePath($module) . '/src/Controller/' . $class_name . '.php'),
+      'Generate controller class'
+    );
+
+    $this->assertTrue(
+      is_file($this->getModulePath($module) . '/' . $module . '.routing.yml'),
+      'Generate routing file'
+    );
+
+    if ($test) {
+      $this->assertTrue(
+        is_file($this->getModulePath($module) . '/Tests/Controller/' . $class_name . 'Test.php'),
+        'Generate test class'
+      );
+    }
+  }
+
+  public function commandData()
+  {
+    $services = [
+      'twig' => [
+        'name' => 'twig',
+        'machine_name' => 'twig',
+        'class' => 'Twig_Environment',
+        'short'=>'Twig_Environment',
+      ]
+    ];
+
+    return [
+      [
+        ['controller_' . rand(), 'DefaultController', 'index', '/index', false, null, 'default_controller']
+      ],
+      [
+        ['controller_' . rand(), 'DefaultController', 'index', '/index', true, $services, 'default_controller']
+      ],
+    ];
+  }
+
+  protected function getGenerator()
+  {
+    $generator = $this->getMockBuilder('\Drupal\AppConsole\Generator\ControllerGenerator')
+      ->setMethods(['getControllerPath', 'getModulePath', 'getTestPath'])
+      ->getMock();
+
+    $generator->setSkeletonDirs($this->getSkeletonDirs());
+
+    return $generator;
+  }
+} 

Tests/Generator/GeneratorTest.php

@@ -6,8 +6,6 @@
 
 namespace Drupal\AppConsole\Test\Generator;
 
-use Symfony\Component\Filesystem\Filesystem;
-
 abstract class GeneratorTest extends \PHPUnit_Framework_TestCase 
 {
   var $dir;
@@ -19,15 +17,7 @@ public function setUp()
 
   public function setUpTemporalDirectory()
   {
-    $this->dir = sys_get_temp_dir() . "/module";
-
-    $this->filesystem = new Filesystem();
-    $this->filesystem->remove($this->dir);
-  }
-
-  public function tearDown()
-  {
-    $this->filesystem->remove($this->dir);
+    $this->dir = sys_get_temp_dir() . "/modules";
   }
 
   public function getSkeletonDirs()
@@ -38,4 +28,9 @@ public function getSkeletonDirs()
 
     return $skeletonDirs;
   }
-}
+
+  public function getModulePath($module)
+  {
+    return $this->dir . '/' . $module;
+  }
+}

Tests/Generator/ModuleGeneratorTest.php

@@ -42,77 +42,77 @@ public function testGenerateModule($parameters)
     );
 
     $files = [
-      'foo/foo.info.yml',
-      'foo/foo.module',
+      $machine_name . '.info.yml',
+      $machine_name . '.module',
     ];
 
     foreach ($files as $file) {
       $this->assertTrue(
-        file_exists($this->dir . '/' . $file),
-        sprintf('%s has been generated', $this->dir . '/' .$dir)
+        file_exists($dir . '/' . $machine_name . '/' . $file),
+        sprintf('%s has been generated', $dir . '/' . $machine_name . '/' . $file)
       );
     }
 
     if ($controller) {
       $this->assertTrue(
-        file_exists($this->dir . '/foo/src/Controller/DefaultController.php'),
+        file_exists($dir . '/' .$machine_name . '/src/Controller/DefaultController.php'),
         sprintf('%s has been generated',
-          $this->dir . '/foo/src/Controller/DefaultController.php'
+          $dir . $machine_name . '/src/Controller/DefaultController.php'
         )
       );
       $this->assertTrue(
-        file_exists($this->dir . '/foo/foo.routing.yml'),
+        file_exists($dir . '/' . $machine_name . "/$machine_name.routing.yml"),
         sprintf('%s has been generated',
-          $this->dir . '/foo/foo.routing.yml'
+          $dir . '/' . $machine_name . "/$machine_name.routing.yml"
         )
       );
 
       if ($tests) {
         $this->assertTrue(
-          file_exists($this->dir . '/foo/Tests/Controller/DefaultControllerTest.php'),
+          file_exists($dir . '/' . $machine_name . '/Tests/Controller/DefaultControllerTest.php'),
           sprintf('%s has been generated',
-            $this->dir . '/foo/Tests/Controller/DefaultControllerTest.php'
+            $dir . '/' . $machine_name  . '/Tests/Controller/DefaultControllerTest.php'
           )
         );
       }
     }
 
-    $dirs = [
-      'foo',
-      'foo/src',
-      'foo/Tests',
-      'foo/templates',
-      'foo/src/Controller',
-      'foo/src/Form',
-      'foo/src/Plugin',
+    $folders = [
+      '',
+      'src',
+      'Tests',
+      'templates',
+      'src/Controller',
+      'src/Form',
+      'src/Plugin',
     ];
 
     if ($structure) {
-      foreach ($dirs as $dir) {
+      foreach ($folders as $folder) {
         $this->assertTrue(
-          is_dir($this->dir . '/' . $dir),
-          sprintf('%s has been generated', $this->dir . '/' .$dir)
+          is_dir($dir . '/' . $machine_name . '/' . $folder),
+          sprintf('%s has been generated', $dir . '/' . $machine_name . '/' . $folder)
         );
       }
     }
   }
 
   public function commandData()
   {
-    $this->dir = sys_get_temp_dir() . "/module";
+    $this->setUpTemporalDirectory();
 
     return [
       [
-        ['Foo', 'foo', $this->dir, 'Description', '8.x', 'Other', true, true, true],
+        ['Foo', 'foo' . rand(), $this->dir, 'Description', '8.x', 'Other', false, false, false],
       ],
       [
-        ['Foo', 'foo', $this->dir, 'Description', '8.x', 'Other', false, true, true],
+        ['Foo', 'foo' . rand(), $this->dir, 'Description', '8.x', 'Other', false, true, true],
       ],
       [
-        ['Foo', 'foo', $this->dir, 'Description', '8.x', 'Other', false, false, true],
+        ['Foo', 'foo' . rand(), $this->dir, 'Description', '8.x', 'Other', false, false, true],
       ],
       [
-        ['Foo', 'foo', $this->dir, 'Description', '8.x', 'Other', false, false, false],
+        ['Foo', 'foo' . rand(), $this->dir, 'Description', '8.x', 'Other', true, true, true],
       ],
     ];
   }
@@ -123,4 +123,4 @@ protected function getGenerator()
     $generator->setSkeletonDirs(__DIR__.'/../../src/Resources/skeleton');
     return $generator;
   }
-}
+}

Tests/Generator/PluginBlockGeneratorTest.php

@@ -17,12 +17,26 @@ public function testGeneratePluginBlock($parameters)
   {
     $this->setUpTemporalDirectory();
 
+    // Get parameters
     list($module, $class_name, $plugin_label, $plugin_id, $services, $inputs) = $parameters;
-    $this->getGenerator()->generate($module, $class_name, $plugin_label, $plugin_id, $services, $inputs);
+
+    // Get generator
+    $generator = $this->getGenerator();
+
+    $dir_module = $this->dir . '/' . $module;
+    // Set plugin path.
+    $generator->expects($this->once())
+      ->method('getPluginPath')
+      ->will($this->returnValue(
+          $dir_module . '/src/Plugin/Block')
+      );
+
+    // Generate plugin block
+    $generator->generate($module, $class_name, $plugin_label, $plugin_id, $services, $inputs);
 
     $this->assertTrue(
-      file_exists($this->dir . '/src/Plugin/Block/' . $class_name .'.php'),
-      sprintf('%s has been generated', $this->dir . '/src/Plugin/Block/'.$class_name.'.php')
+      file_exists($dir_module . '/src/Plugin/Block/' . $class_name .'.php'),
+      sprintf('%s has been generated', $dir_module . '/src/Plugin/Block/'.$class_name.'.php')
     );
 
     $contains = [
@@ -51,7 +65,7 @@ public function testGeneratePluginBlock($parameters)
       ];
     }
 
-    $content = file_get_contents($this->dir . '/src/Plugin/Block/' . $class_name .'.php');
+    $content = file_get_contents($dir_module . '/src/Plugin/Block/' . $class_name .'.php');
     foreach ($contains as $contain) {
       $this->assertContains($contain, $content);
     }
@@ -78,16 +92,16 @@ public function commandData()
 
     return [
       [
-        ['foo', 'FooBlock', 'Foo Block', 'foo_block', null, []]
+        ['plugin_block' . rand(), 'FooBlock', 'Foo Block', 'foo_block', null, []]
       ],
       [
-        ['foo', 'FooBlock', 'Foo Block', 'foo_block', $services, []]
+        ['plugin_block' . rand(), 'FooBlock', 'Foo Block', 'foo_block', $services, []]
       ],
       [
-        ['foo', 'FooBlock', 'Foo Block', 'foo_block', null, $inputs]
+        ['plugin_block' . rand(), 'FooBlock', 'Foo Block', 'foo_block', null, $inputs]
       ],
       [
-        ['foo', 'FooBlock', 'Foo Block', 'foo_block', $services, $inputs]
+        ['plugin_block' . rand(), 'FooBlock', 'Foo Block', 'foo_block', $services, $inputs]
       ],
     ];
   }
@@ -100,10 +114,6 @@ protected function getGenerator()
 
     $generator->setSkeletonDirs($this->getSkeletonDirs());
 
-    $generator->expects($this->once())
-      ->method('getPluginPath')
-      ->will($this->returnValue($this->dir . '/src/Plugin/Block'));
-
     return $generator;
   }
 }