Merge pull request #6 from php-cache/analysis-86PZMq

cryptiklemur · cryptiklemur · commit 4e314231bb71 · 2015-12-15T10:21:45.000-08:00
Applied fixes from StyleCI
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of php-cache\doctrine-adapter-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <aequasi@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Cache\Adapter\DoctrineAdapterBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@@ -21,7 +30,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('cache_adapter_doctrine');
+        $rootNode    = $treeBuilder->root('cache_adapter_doctrine');
 
         $rootNode->children()
             ->append($this->getClustersNode())
@@ -36,15 +45,15 @@ public function getConfigTreeBuilder()
     private function getClustersNode()
     {
         $treeBuilder = new TreeBuilder();
-        $node = $treeBuilder->root('providers');
+        $node        = $treeBuilder->root('providers');
 
         $node
             ->requiresAtLeastOneElement()
             ->useAttributeAsKey('name')
             ->prototype('array')
                 ->children()
                     ->enumNode('type')->isRequired()
-                        ->values(array('redis', 'php_file', 'file_system', 'array', 'memcached', 'apc'))
+                        ->values(['redis', 'php_file', 'file_system', 'array', 'memcached', 'apc'])
                     ->end()
                     ->scalarNode('id')
                         ->defaultNull()
@@ -135,8 +144,7 @@ function ($v) {
                         ->end()
                     ->end()
                 ->end()
-            ->end()
-        ;
+            ->end();
 
         return $node;
     }
@@ -147,19 +155,19 @@ function ($v) {
     private function getMemcachedOptions()
     {
         $treeBuilder = new TreeBuilder();
-        $node = $treeBuilder->root('memcached');
+        $node        = $treeBuilder->root('memcached');
 
         if (class_exists('\Memcached')) {
             $node
                 ->children()
                     ->enumNode('serializer')
-                        ->values(array('php', 'igbinary', 'json'))
+                        ->values(['php', 'igbinary', 'json'])
                     ->end()
                     ->enumNode('hash')
-                        ->values(array('default', 'md5', 'crc', 'fnv1_64', 'fnv1a_64', 'fnv1_32', 'fnv1a_32', 'hsieh', 'murmur'))
+                        ->values(['default', 'md5', 'crc', 'fnv1_64', 'fnv1a_64', 'fnv1_32', 'fnv1a_32', 'hsieh', 'murmur'])
                     ->end()
                     ->enumNode('distribution')
-                        ->values(array('modula', 'consistent'))
+                        ->values(['modula', 'consistent'])
                     ->end()
                     ->booleanNode('compression')->end()
                     ->scalarNode('prefix_key')->end()
diff --git a/src/DependencyInjection/DoctrineAdapterExtension.php b/src/DependencyInjection/DoctrineAdapterExtension.php
@@ -1,19 +1,26 @@
 <?php
 
+/*
+ * This file is part of php-cache\doctrine-adapter-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <aequasi@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Cache\Adapter\DoctrineAdapterBundle\DependencyInjection;
 
+use Cache\Doctrine\CachePool;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
-use Cache\Doctrine\CachePool;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
- *
  * @author Aaron Scherer <aequasi@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
@@ -22,19 +29,19 @@ class DoctrineAdapterExtension extends Extension
     /**
      * Array of types, and their options.
      *
-     * @var array
+     * @type array
      */
     protected static $types = [
         'memcache' => [
-            'class' => 'Memcache',
+            'class'   => 'Memcache',
             'connect' => 'addServer',
         ],
         'memcached' => [
-            'class' => 'Cache\Adapter\DoctrineAdapterBundle\ProviderHelper\Memcached',
+            'class'   => 'Cache\Adapter\DoctrineAdapterBundle\ProviderHelper\Memcached',
             'connect' => 'addServer',
         ],
         'redis' => [
-            'class' => 'Redis',
+            'class'   => 'Redis',
             'connect' => 'connect',
         ],
     ];
@@ -48,7 +55,7 @@ class DoctrineAdapterExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
+        $config        = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
@@ -58,8 +65,6 @@ public function load(array $configs, ContainerBuilder $container)
         $this->process($container);
     }
 
-
-
     /**
      * For each configured provider, build a service.
      *
@@ -70,7 +75,7 @@ protected function process(ContainerBuilder $container)
         $providers = $container->getParameter('cache_adapter_doctrine.providers');
 
         foreach ($providers as $name => $provider) {
-            $classParameter = sprintf('cache.doctrine_adapter.%s.class',$provider['type']);
+            $classParameter    = sprintf('cache.doctrine_adapter.%s.class', $provider['type']);
             $doctrineServiceId = sprintf('cache.doctrine_adapter.doctrine_service.%s', $provider['type']);
             if (!$container->hasParameter($classParameter)) {
                 throw new InvalidConfigurationException(
@@ -88,16 +93,14 @@ protected function process(ContainerBuilder $container)
         }
     }
 
-
-
     /**
      * We need to prepare the doctrine cache providers.
      *
      * @param ContainerBuilder $container
-     * @param string $doctrineServiceId
-     * @param string $doctrineClass
-     * @param string $name
-     * @param array $provider
+     * @param string           $doctrineServiceId
+     * @param string           $doctrineClass
+     * @param string           $name
+     * @param array            $provider
      */
     protected function createDoctrineCacheDefinition(ContainerBuilder $container, $doctrineServiceId, $doctrineClass, $name, array $provider)
     {
@@ -117,7 +120,7 @@ protected function createDoctrineCacheDefinition(ContainerBuilder $container, $d
                     $providerHelperServiceId = $provider['id'];
                 } else {
                     // Create a new cache provider if none is defined
-                    $providerHelperServiceId = sprintf('cache_adapter_doctrine.provider.%s.helper', $name);
+                    $providerHelperServiceId  = sprintf('cache_adapter_doctrine.provider.%s.helper', $name);
                     $providerHelperDefinition = $this->createProviderHelperDefinition($type, $provider);
                     $container->setDefinition($providerHelperServiceId, $providerHelperDefinition);
                 }
@@ -151,8 +154,8 @@ protected function createDoctrineCacheDefinition(ContainerBuilder $container, $d
      * Make sure to create a PRS-6 service that wraps the doctrine service.
      *
      * @param ContainerBuilder $container
-     * @param string $doctrineServiceId
-     * @param string $name
+     * @param string           $doctrineServiceId
+     * @param string           $name
      */
     protected function createPsr7CompliantService(ContainerBuilder $container, $doctrineServiceId, $name)
     {
@@ -162,7 +165,7 @@ protected function createPsr7CompliantService(ContainerBuilder $container, $doct
         // Register the CacheItemPoolInterface definition
         $def = new Definition(CachePool::class);
         $def->addArgument(new Reference($doctrineServiceId));
-        $def->setTags(['cache.provider'=>[]]);
+        $def->setTags(['cache.provider' => []]);
 
         $container->setDefinition($serviceId, $def);
         $container->setAlias('cache.provider.'.$name, $serviceId);
diff --git a/src/DoctrineAdapterBundle.php b/src/DoctrineAdapterBundle.php
@@ -1,10 +1,17 @@
 <?php
 
+/*
+ * This file is part of php-cache\doctrine-adapter-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <aequasi@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Cache\Adapter\DoctrineAdapterBundle;
 
-use Cache\Adapter\DoctrineAdapterBundle\DependencyInjection\CompilerPass\ServiceBuilderPass;
 use Cache\Adapter\DoctrineAdapterBundle\DependencyInjection\DoctrineAdapterExtension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
diff --git a/src/ProviderHelper/Memcached.php b/src/ProviderHelper/Memcached.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of php-cache\doctrine-adapter-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <aequasi@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Cache\Adapter\DoctrineAdapterBundle\ProviderHelper;
 
 /**
diff --git a/tests/DependencyInjection/DoctrineCacheExtensionTest.php b/tests/DependencyInjection/DoctrineCacheExtensionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of php-cache\doctrine-adapter-bundle package.
+ *
+ * (c) 2015-2015 Aaron Scherer <aequasi@gmail.com>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Cache\Adapter\DoctrineAdapterBundle\Tests\DependencyInjection;
 
 use Cache\Adapter\DoctrineAdapterBundle\DependencyInjection\DoctrineAdapterExtension;
@@ -9,15 +18,15 @@ class DoctrineCacheExtensionTest extends AbstractExtensionTestCase
 {
     protected function getContainerExtensions()
     {
-        return array(
+        return [
             new DoctrineAdapterExtension(),
-        );
+        ];
     }
 
     public function testThatProvidersExists()
     {
-        $providers = array('foo' => ['type' => 'apc']);
-        $this->load(array('providers' => $providers));
+        $providers = ['foo' => ['type' => 'apc']];
+        $this->load(['providers' => $providers]);
 
         $this->assertContainerBuilderHasParameter('cache_adapter_doctrine.providers');
     }
