Merge branch 'release/1.0.1'

rdrenth · Nov 22, 2015 · a918451 · a918451
2 parents 85845e2 + 8039fad
commit a918451
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 phpunit.xml
 vendor/
 composer.lock
-.idea/*
+.idea/*
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,4 @@ matrix:
     - php: hhvm
 notifications:
   email:
-    - [email protected]
+    - [email protected]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Changelog
-
+
+## 1.0.1
+* Update code style
+* Removed `encoding` configuration parameter
+* Add badges to README
+
 ## 1.0.0
 * Initial version of the `rdrenth/twig-extension-bundle` bundle.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -3,7 +3,6 @@
 namespace Rdrenth\Bundle\TwigExtensionBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

diff --git a/DependencyInjection/RdrenthTwigExtensionExtension.php b/DependencyInjection/RdrenthTwigExtensionExtension.php
@@ -66,7 +66,6 @@ private function registerStringyConfiguration(array $config, ContainerBuilder $c
 
         $definition = $container->findDefinition('rdrenth_twig_extension.stringy');
         $definition->addTag('twig.extension')
-            ->addArgument($filters)
-            ->addArgument($config['encoding']);
+            ->addArgument($filters);
     }
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 RdrenthTwigExtensionBundle
 =============
 
+[![Build Status](https://travis-ci.org/rdrenth/twig-extension-bundle.svg?branch=master)](https://travis-ci.org/rdrenth/twig-extension-bundle) [![Latest Stable Version](https://poser.pugx.org/rdrenth/twig-extension-bundle/v/stable)](https://packagist.org/packages/rdrenth/twig-extension-bundle) [![Total Downloads](https://poser.pugx.org/rdrenth/twig-extension-bundle/downloads)](https://packagist.org/packages/rdrenth/twig-extension-bundle) [![Latest Unstable Version](https://poser.pugx.org/rdrenth/twig-extension-bundle/v/unstable)](https://packagist.org/packages/rdrenth/twig-extension-bundle) [![License](https://poser.pugx.org/rdrenth/twig-extension-bundle/license)](https://packagist.org/packages/rdrenth/twig-extension-bundle) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/0545e7a1-6179-48df-8628-9e5b0afc13bb/mini.png)](https://insight.sensiolabs.com/projects/0545e7a1-6179-48df-8628-9e5b0afc13bb)
+
 ## About
 This is a Symfony2 Bundle that provides you with some extensions to Twig!
 

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -12,4 +12,4 @@
         <service id="rdrenth_twig_extension.stringy" class="%rdrenth_twig_extension.stringy.class%"/>
     </services>
 
-</container>
+</container>
diff --git a/Twig/StringyExtension.php b/Twig/StringyExtension.php
@@ -16,21 +16,14 @@ class StringyExtension extends \Twig_Extension
      */
     private $filters;
 
-    /**
-     * @type string|null
-     */
-    private $encoding;
-
     /**
      * StringyExtension constructor.
      *
      * @param array $filters
-     * @param null|string $encoding
      */
-    public function __construct(array $filters = array(), $encoding = null)
+    public function __construct(array $filters = array())
     {
         $this->filters = $filters;
-        $this->encoding = $encoding;
     }
 
     /**
@@ -57,4 +50,4 @@ public function getFilters()
 
         return $filters;
     }
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -16,4 +16,4 @@
             <directory>vendor</directory>
         </blacklist>
     </filter>
-</phpunit>
+</phpunit>