From c6e27425247dceb2d07588c476247a09a5373242 Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Wed, 16 Jul 2014 08:41:50 -0700
Subject: [PATCH 1/2] Rename variable service to services

---
 src/Resources/skeleton/base/class.php.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/skeleton/base/class.php.twig b/src/Resources/skeleton/base/class.php.twig
index 4ae7fe749..dd886d5ca 100644
--- a/src/Resources/skeleton/base/class.php.twig
+++ b/src/Resources/skeleton/base/class.php.twig
@@ -11,7 +11,7 @@
 
 {% block use_class %}{% endblock %}
 {% block use_class_services %}
-{% if service is defined %}
+{% if services is defined %}
 {% for service in services %}
 use {{ service.class }};
 {% endfor %}
@@ -21,7 +21,7 @@ use {{ service.class }};
 {% block class_declaration %}{% endblock %}
 {
 {% block class_properties %}
-{% if service is defined %}
+{% if services is defined %}
 {% for service in services %}
 
   /**

From df294fabdcdea67664d23c61e6b8d785d8db505b Mon Sep 17 00:00:00 2001
From: Jesus Manuel Olivas <jesus.olivas@gmail.com>
Date: Wed, 16 Jul 2014 08:58:25 -0700
Subject: [PATCH 2/2] Implement twig blocks from base on form.php.twig

---
 .../skeleton/module/src/Form/form.php.twig    | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/Resources/skeleton/module/src/Form/form.php.twig b/src/Resources/skeleton/module/src/Form/form.php.twig
index c337e2def..fbce8274a 100644
--- a/src/Resources/skeleton/module/src/Form/form.php.twig
+++ b/src/Resources/skeleton/module/src/Form/form.php.twig
@@ -1,40 +1,52 @@
-<?php
+{% extends "base/class.php.twig" %}
 
-/**
- * @file
- * Contains \Drupal\{{module_name}}\Form\{{ class_name }}.
- */
+{% block file_path %}
+Drupal\{{module_name}}\Form\{{ class_name }}.
+{% endblock %}
 
+{% block namespace_class %}
 namespace Drupal\{{module_name}}\Form;
+{% endblock %}
 
+{% block use_class %}
 use Drupal\Core\Form\ConfigFormBase;
 {% if services is not empty %}
 use Drupal\Core\Config\ConfigFactoryInterface;
-{% include 'skeleton/module/shared/services-use-operator.php.twig' %}
+use Symfony\Component\DependencyInjection\ContainerInterface;
 {% endif %}
+{% endblock %}
 
+{% block class_declaration %}
 class {{ class_name }} extends ConfigFormBase
-{
-{% if services is not empty %}
-{% include 'skeleton/module/shared/services-class-properties-declaration.php.twig' %}
+{% endblock %}
 
+{% block class_construct %}
+{% if services is not empty %}
   public function __construct(
     ConfigFactoryInterface $config_factory,
-    {{ servicesAsParameters(services)|join(', \n') }}
+    {{ servicesAsParameters(services)|join(',\n    ') }}
   )
   {
     parent::__construct($config_factory);
-{% include 'skeleton/module/shared/services-class-properties-initialization.php.twig' %}
+{{ serviceClassInitialization(services) }}
   }
 
+{% endif %}
+{% endblock %}
+
+{% block class_create %}
+{% if services is not empty %}
   public static function create(ContainerInterface $container) {
     return new static(
-        $container->get('config.factory'),
-{% include 'skeleton/module/shared/services-class-properties-injection.php.twig' %}
+      $container->get('config.factory'),
+{{ serviceClassInjection(services) }}
     );
   }
+
 {% endif %}
+{% endblock %}
 
+{% block class_methods %}
   /**
    * {@inheritdoc}
    */
@@ -81,4 +93,4 @@ class {{ class_name }} extends ConfigFormBase
     {% endfor %}
     ->save();
   }
-}
+{% endblock %}