Merge branch 'release/1.1.0'

rdrenth · Jul 22, 2016 · d3e2615 · d3e2615
2 parents cb0d603 + 00f41d6
commit d3e2615
Show file tree

Hide file tree

Showing 14 changed files with 2,996 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 phpunit.xml
 vendor/
-composer.lock
 .idea/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.1.0
+* Update code style
+* Update composer requirements
+* Fix broken link in README
+* Add filter `lcfirst`
+* Add filter `ucfirst`
+
 ## 1.0.3
 * Update minimal PHP requirement to 5.3.3
 * Update composer autoload settings
@@ -13,4 +20,4 @@
 * Add badges to README
 
 ## 1.0.0
-* Initial version of the `rdrenth/twig-extension-bundle` bundle.
+* Initial version of the `rdrenth/twig-extension-bundle` bundle.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -18,6 +18,7 @@ class Configuration implements ConfigurationInterface
 {
     /**
      * {@inheritdoc}
+     * @throws \RuntimeException
      */
     public function getConfigTreeBuilder()
     {
@@ -31,6 +32,7 @@ public function getConfigTreeBuilder()
 
     /**
      * @param ArrayNodeDefinition $rootNode
+     * @throws \RuntimeException
      */
     private function addStringySection(ArrayNodeDefinition $rootNode)
     {
@@ -52,6 +54,8 @@ private function addStringySection(ArrayNodeDefinition $rootNode)
                                 ->append($this->addStringyMethodNode('slugify'))
                                 ->append($this->addStringyMethodNode('titleize'))
                                 ->append($this->addStringyMethodNode('underscored'))
+                                ->append($this->addStringyMethodNode('lcfirst', 'lowerCaseFirst'))
+                                ->append($this->addStringyMethodNode('ucfirst', 'upperCaseFirst'))
                             ->end()
                         ->end()
                         ->arrayNode('extra_filters')
@@ -60,7 +64,7 @@ private function addStringySection(ArrayNodeDefinition $rootNode)
                                     ->scalarNode('filter')->end()
                                     ->scalarNode('method')
                                         ->validate()
-                                        ->ifTrue(function($value) { return !method_exists('Stringy\Stringy', $value); })
+                                        ->ifTrue(function ($value) { return !method_exists('Stringy\Stringy', $value); })
                                             ->thenInvalid('Method %s does not on the class Stringy\Stringy.')
                                         ->end()
                                     ->end()
@@ -76,6 +80,7 @@ private function addStringySection(ArrayNodeDefinition $rootNode)
      * @param string $filterName
      * @param string|null $methodName
      * @return NodeDefinition
+     * @throws \RuntimeException
      */
     private function addStringyMethodNode($filterName, $methodName = null)
     {
@@ -90,7 +95,7 @@ private function addStringyMethodNode($filterName, $methodName = null)
                 ->scalarNode('method')
                     ->defaultValue($methodName ?: $filterName)
                     ->validate()
-                    ->ifTrue(function($value) { return !method_exists('Stringy\Stringy', $value); })
+                    ->ifTrue(function ($value) { return !method_exists('Stringy\Stringy', $value); })
                         ->thenInvalid('Method %s does not on the class Stringy\Stringy.')
                     ->end()
                 ->end()

diff --git a/DependencyInjection/RdrenthTwigExtensionExtension.php b/DependencyInjection/RdrenthTwigExtensionExtension.php
@@ -4,11 +4,12 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- * RdrenthTwigExtensionExtension
+ * Class RdrenthTwigExtensionExtension
  *
  * @author   Ronald Drenth <[email protected]>
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
@@ -18,6 +19,7 @@ class RdrenthTwigExtensionExtension extends Extension
 {
     /**
      * {@inheritdoc}
+     * @throws \Exception
      */
     public function load(array $config, ContainerBuilder $container)
     {
@@ -27,7 +29,7 @@ public function load(array $config, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.xml');
 
-        if (isset($config['stringy'])) {
+        if (array_key_exists('stringy', $config)) {
             $this->registerStringyConfiguration($config['stringy'], $container, $loader);
         }
     }
@@ -44,6 +46,7 @@ public function getAlias()
      * @param array $config
      * @param ContainerBuilder $container
      * @param XmlFileLoader $loader
+     * @throws InvalidArgumentException
      */
     private function registerStringyConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ For more information about each filter, please check the links.
 {{ 'fooBar'|dasherize }} {# foo-bar #}
 ```
 
-#### [delimit](https://github.com/danielstjules/Stringy#delimit)
+#### [delimit](https://github.com/danielstjules/Stringy#delimitint-delimiter)
 
 ```twig
 {{ 'fooBar'|delimit('::') }} {# foo::bar #}
@@ -61,6 +61,18 @@ For more information about each filter, please check the links.
 {{ 'TestUCase'|underscored }} {# test_u_case #}
 ```
 
+#### [lcfirst](https://github.com/danielstjules/Stringy#lowercasefirst)
+
+```twig
+{{ 'LowerCaseFirst'|lcfirst }} {# lowerCaseFirst #}
+```
+
+#### [ucfirst](https://github.com/danielstjules/Stringy#uppercasefirst)
+
+```twig
+{{ 'upperCaseFirst'|ucfirst }} {# UpperCaseFirst #}
+```
+
 
 ## Installation
 ### Step 1: Install RdrenthTwigExtensionBundle using [Composer](http://getcomposer.org)

diff --git a/RdrenthTwigExtensionBundle.php b/RdrenthTwigExtensionBundle.php
@@ -5,7 +5,7 @@
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
- * RdrenthTwigExtensionBundle
+ * Class RdrenthTwigExtensionBundle
  *
  * @author   Ronald Drenth <[email protected]>
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)

diff --git a/Resources/meta/LICENSE b/Resources/meta/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Ronald Drenth <[email protected]>
+Copyright (c) 2016 Ronald Drenth <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -7,13 +7,13 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * ConfigurationTest
+ * Class ConfigurationTest
  *
  * @author   Ronald Drenth <[email protected]>
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
  * @link     https://github.com/rdrenth/twig-extension-bundle
  */
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+final class ConfigurationTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @return array
@@ -40,7 +40,7 @@ public function testDefaultConfigurationProcessing()
         $rawConfig = Yaml::parse(file_get_contents(__DIR__ . '/../Resources/config/default.yml'));
         $config = $this->processConfiguration($rawConfig);
 
-        $this->assertArrayHasKey('stringy', $config);
+        self::assertArrayHasKey('stringy', $config);
     }
 
     /**
@@ -51,13 +51,13 @@ public function testStringyConfigurationProcessing()
         $rawConfig = Yaml::parse(file_get_contents(__DIR__ . '/../Resources/config/stringy.yml'));
         $config = $this->processConfiguration($rawConfig);
 
-        $this->assertArrayHasKey('stringy', $config);
+        self::assertArrayHasKey('stringy', $config);
         $config = $config['stringy'];
 
-        $this->assertArrayHasKey('enabled', $config);
-        $this->assertArrayHasKey('encoding', $config);
-        $this->assertArrayHasKey('filters', $config);
-        $this->assertArrayHasKey('extra_filters', $config);
+        self::assertArrayHasKey('enabled', $config);
+        self::assertArrayHasKey('encoding', $config);
+        self::assertArrayHasKey('filters', $config);
+        self::assertArrayHasKey('extra_filters', $config);
 
         $filters = $config['filters'];
         foreach ($this->provideStringyFilters() as $filterName => $methodName) {
@@ -86,11 +86,11 @@ public function testInvalidStringyMethod()
     private function assertStringyFilter(array $filters, $indexName, $filterName, $methodName, $enabled = null)
     {
         if ($enabled !== null) {
-            $this->assertEquals($enabled, $filters[$indexName]['enabled']);
+            self::assertEquals($enabled, $filters[$indexName]['enabled']);
         }
 
-        $this->assertEquals($filterName, $filters[$indexName]['filter']);
-        $this->assertEquals($methodName, $filters[$indexName]['method']);
+        self::assertEquals($filterName, $filters[$indexName]['filter']);
+        self::assertEquals($methodName, $filters[$indexName]['method']);
     }
 
     /**

diff --git a/Tests/DependencyInjection/ExtensionTest.php b/Tests/DependencyInjection/ExtensionTest.php
@@ -7,13 +7,13 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * ExtenionTest
+ * Class ExtenionTest
  *
  * @author   Ronald Drenth <[email protected]>
  * @license  http://opensource.org/licenses/MIT The MIT License (MIT)
  * @link     https://github.com/rdrenth/twig-extension-bundle
  */
-class ExtenionTest extends \PHPUnit_Framework_TestCase
+final class ExtenionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Test DI container with default config
@@ -23,9 +23,9 @@ public function testDefaultContainer()
         $config = Yaml::parse(file_get_contents(__DIR__ . '/../Resources/config/default.yml'));
         $container = $this->getContainer($config);
 
-        $this->assertTrue($container->hasDefinition('rdrenth_twig_extension.stringy'));
+        self::assertTrue($container->hasDefinition('rdrenth_twig_extension.stringy'));
 
-        $this->assertEquals(
+        self::assertEquals(
             $container->getParameterBag()->resolveValue('%rdrenth_twig_extension.stringy.class%'),
             $container->getDefinition('rdrenth_twig_extension.stringy')->getClass()
         );

diff --git a/Tests/Resources/config/stringy.yml b/Tests/Resources/config/stringy.yml
@@ -9,5 +9,7 @@ rdrenth_twig_extension:
             slugify: ~
             titleize: ~
             underscored: ~
+            lcfirst: ~
+            ucfirst: ~
         extra_filters:
-            - { filter: swap_case, method: swapCase }
+            - { filter: swap_case, method: swapCase }