Merge branch 'improvements' of https://github.com/cordoval/puphpet into cordoval-improvements

Conflicts:
	LICENSE

Author: jtreminio

.gitignore

@@ -1,10 +1,10 @@
-/web/bundles/
+/web/bundles
 /app/bootstrap.php.cache
-/app/cache/*
+/app/cache
 /app/config/parameters.yml
-/app/logs/*
-/build/
-/vendor/
+/app/logs
+/build
+/vendor
 /bin/*
 !/bin/librarian
 /composer.phar

.travis.yml

@@ -12,7 +12,7 @@ notifications:
 env:
   - PUPPET_VERSION=3.3.1
 
-before_script:
+install:
   - composer install
 
 # PHPUnit tests only, rake spec could not be done within the same travis worker

LICENSE

@@ -1,6 +1,7 @@
 The MIT License
 
 Copyright (c) 2013-2014 Juan Treminio and other contributors
+https://puphpet.com
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

app/phpunit.xml.dist

@@ -19,9 +19,6 @@ class PuphpetExtensionApacheExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }

src/Puphpet/Extension/ApacheBundle/DependencyInjection/Configuration.php

@@ -4,7 +4,7 @@ services:
     puphpet.extension.apache.configure:
         class: Puphpet\Extension\ApacheBundle\Configure
         arguments:
-            - "@service_container"
+            - @service_container
 
     puphpet.extension.apache.front_controller:
         class: Puphpet\Extension\ApacheBundle\Controller\FrontController

src/Puphpet/Extension/ApacheBundle/DependencyInjection/PuphpetExtensionApacheExtension.php

@@ -19,9 +19,6 @@ class PuphpetExtensionBeanstalkdExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }

src/Puphpet/Extension/ApacheBundle/Resources/config/services.yml

@@ -4,7 +4,7 @@ services:
     puphpet.extension.beanstalkd.configure:
         class: Puphpet\Extension\BeanstalkdBundle\Configure
         arguments:
-            - "@service_container"
+            - @service_container
 
     puphpet.extension.beanstalkd.front_controller:
         class: Puphpet\Extension\BeanstalkdBundle\Controller\FrontController

src/Puphpet/Extension/BeanstalkdBundle/DependencyInjection/Configuration.php

@@ -19,9 +19,6 @@ class PuphpetExtensionDrushExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }

src/Puphpet/Extension/BeanstalkdBundle/DependencyInjection/PuphpetExtensionBeanstalkdExtension.php

@@ -4,7 +4,7 @@ services:
     puphpet.extension.drush.configure:
         class: Puphpet\Extension\DrushBundle\Configure
         arguments:
-            - "@service_container"
+            - @service_container
 
     puphpet.extension.drush.front_controller:
         class: Puphpet\Extension\DrushBundle\Controller\FrontController

src/Puphpet/Extension/BeanstalkdBundle/Resources/config/services.yml

@@ -10,7 +10,6 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        
         return $this->render('PuphpetExtensionElasticSearchBundle:form:ElasticSearch.html.twig', [
             'elastic_search' => $data,
         ]);

src/Puphpet/Extension/DrushBundle/DependencyInjection/Configuration.php

@@ -19,9 +19,6 @@ class PuphpetExtensionElasticSearchExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }

src/Puphpet/Extension/DrushBundle/DependencyInjection/PuphpetExtensionDrushExtension.php

@@ -4,7 +4,7 @@ services:
     puphpet.extension.elastic_search.configure:
         class: Puphpet\Extension\ElasticSearchBundle\Configure
         arguments:
-            - "@service_container"
+            - @service_container
 
     puphpet.extension.elastic_search.front_controller:
         class: Puphpet\Extension\ElasticSearchBundle\Controller\FrontController

src/Puphpet/Extension/DrushBundle/Resources/config/services.yml

@@ -19,9 +19,6 @@ class PuphpetExtensionFirewallExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }

src/Puphpet/Extension/ElasticSearchBundle/Controller/FrontController.php

@@ -4,7 +4,7 @@ services:
     puphpet.extension.firewall.configure:
         class: Puphpet\Extension\FirewallBundle\Configure
         arguments:
-            - "@service_container"
+            - @service_container
 
     puphpet.extension.firewall.front_controller:
         class: Puphpet\Extension\FirewallBundle\Controller\FrontController

src/Puphpet/Extension/ElasticSearchBundle/DependencyInjection/Configuration.php

@@ -19,9 +19,6 @@ class PuphpetExtensionHhvmExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
     }

src/Puphpet/Extension/ElasticSearchBundle/DependencyInjection/PuphpetExtensionElasticSearchExtension.php

@@ -4,7 +4,7 @@ services:
     puphpet.extension.hhvm.configure:
         class: Puphpet\Extension\HhvmBundle\Configure
         arguments:
-            - "@service_container"
+            - @service_container
 
     puphpet.extension.hhvm.front_controller:
         class: Puphpet\Extension\HhvmBundle\Controller\FrontController