Merge cs-fixes-30 into cs-fixes-31

Command/PopulateCommand.php

@@ -16,7 +16,7 @@
 use Symfony\Component\Console\Helper\ProgressBar;
 
 /**
- * Populate the search index
+ * Populate the search index.
  */
 class PopulateCommand extends ContainerAwareCommand
 {

Command/ResetCommand.php

@@ -10,7 +10,7 @@
 use FOS\ElasticaBundle\Resetter;
 
 /**
- * Reset search indexes
+ * Reset search indexes.
  */
 class ResetCommand extends ContainerAwareCommand
 {

Command/SearchCommand.php

@@ -11,7 +11,7 @@
 use Elastica\Result;
 
 /**
- * Searches a type
+ * Searches a type.
  */
 class SearchCommand extends ContainerAwareCommand
 {

Configuration/IndexConfig.php

@@ -53,9 +53,9 @@ class IndexConfig
     /**
      * Constructor expects an array as generated by the Container Configuration builder.
      *
-     * @param string $name
+     * @param string       $name
      * @param TypeConfig[] $types
-     * @param array $config
+     * @param array        $config
      */
     public function __construct($name, array $types, array $config)
     {
@@ -92,7 +92,9 @@ public function getSettings()
 
     /**
      * @param string $typeName
+     *
      * @return TypeConfig
+     *
      * @throws \InvalidArgumentException
      */
     public function getType($typeName)

Configuration/ManagerInterface.php

@@ -20,6 +20,7 @@ interface ManagerInterface
      * Returns configuration for an index.
      *
      * @param $index
+     *
      * @return IndexConfig
      */
     public function getIndexConfiguration($index);
@@ -36,6 +37,7 @@ public function getIndexNames();
      *
      * @param string $index
      * @param string $type
+     *
      * @return TypeConfig
      */
     public function getTypeConfiguration($index, $type);

Configuration/Search.php

@@ -17,9 +17,10 @@
  * Annotation class for setting search repository.
  *
  * @Annotation
+ *
  * @deprecated Use FOS\ElasticaBundle\Annotation\Search instead
  * @Target("CLASS")
  */
 class Search extends BaseSearch
 {
-} 
+}

Configuration/Source/ContainerSource.php

@@ -57,6 +57,7 @@ public function getConfiguration()
      * Builds TypeConfig objects for each type.
      *
      * @param array $config
+     *
      * @return array
      */
     protected function getTypes($config)

Configuration/Source/SourceInterface.php

@@ -23,4 +23,4 @@ interface SourceInterface
      * @return \FOS\ElasticaBundle\Configuration\IndexConfig[]
      */
     public function getConfiguration();
-} 
+}

DependencyInjection/Compiler/ConfigSourcePass.php

@@ -33,4 +33,4 @@ public function process(ContainerBuilder $container)
 
         $container->getDefinition('fos_elastica.config_manager')->replaceArgument(0, $sources);
     }
-} 
+}

DependencyInjection/Compiler/RegisterProvidersPass.php

@@ -55,6 +55,7 @@ public function process(ContainerBuilder $container)
      * Returns whether the class implements ProviderInterface.
      *
      * @param string $class
+     *
      * @return boolean
      */
     private function isProviderImplementation($class)

DependencyInjection/Compiler/TransformerPass.php

@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)
                     throw new InvalidArgumentException('The Transformer must have both a type and an index defined.');
                 }
 
-                $transformers[$tag['index']][$tag['type']]= new Reference($id);
+                $transformers[$tag['index']][$tag['type']] = new Reference($id);
             }
         }
 

DependencyInjection/Configuration.php

@@ -63,7 +63,7 @@ public function getConfigTreeBuilder()
     }
 
     /**
-     * Adds the configuration for the "clients" key
+     * Adds the configuration for the "clients" key.
      */
     private function addClientsSection(ArrayNodeDefinition $rootNode)
     {
@@ -76,8 +76,8 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
                         ->performNoDeepMerging()
                         // BC - Renaming 'servers' node to 'connections'
                         ->beforeNormalization()
-                        ->ifTrue(function($v) { return isset($v['servers']); })
-                        ->then(function($v) {
+                        ->ifTrue(function ($v) { return isset($v['servers']); })
+                        ->then(function ($v) {
                             $v['connections'] = $v['servers'];
                             unset($v['servers']);
 
@@ -99,7 +99,7 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
                         ->ifTrue(function ($v) { return is_array($v) && !array_key_exists('connections', $v); })
                         ->then(function ($v) {
                             return array(
-                                'connections' => array($v)
+                                'connections' => array($v),
                             );
                         })
                         ->end()
@@ -111,8 +111,8 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
                                     ->children()
                                         ->scalarNode('url')
                                             ->validate()
-                                                ->ifTrue(function($url) { return $url && substr($url, -1) !== '/'; })
-                                                ->then(function($url) { return $url.'/'; })
+                                                ->ifTrue(function ($url) { return $url && substr($url, -1) !== '/'; })
+                                                ->then(function ($url) { return $url.'/'; })
                                             ->end()
                                         ->end()
                                         ->scalarNode('host')->end()
@@ -143,7 +143,7 @@ private function addClientsSection(ArrayNodeDefinition $rootNode)
     }
 
     /**
-     * Adds the configuration for the "indexes" key
+     * Adds the configuration for the "indexes" key.
      */
     private function addIndexesSection(ArrayNodeDefinition $rootNode)
     {
@@ -198,8 +198,8 @@ protected function getTypesNode()
                 ->end()
                 // BC - Renaming 'mappings' node to 'properties'
                 ->beforeNormalization()
-                ->ifTrue(function($v) { return array_key_exists('mappings', $v); })
-                ->then(function($v) {
+                ->ifTrue(function ($v) { return array_key_exists('mappings', $v); })
+                ->then(function ($v) {
                     $v['properties'] = $v['mappings'];
                     unset($v['mappings']);
 
@@ -422,7 +422,7 @@ protected function getParentNode()
     }
 
     /**
-     * Returns the array node used for "_all"
+     * Returns the array node used for "_all".
      */
     protected function getAllNode()
     {
@@ -441,7 +441,7 @@ protected function getAllNode()
     }
 
     /**
-     * Returns the array node used for "_timestamp"
+     * Returns the array node used for "_timestamp".
      */
     protected function getTimestampNode()
     {
@@ -462,7 +462,7 @@ protected function getTimestampNode()
     }
 
     /**
-     * Returns the array node used for "_ttl"
+     * Returns the array node used for "_ttl".
      */
     protected function getTtlNode()
     {
@@ -491,9 +491,9 @@ protected function getPersistenceNode()
 
         $node
             ->validate()
-                ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['listener']); })
+                ->ifTrue(function ($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['listener']); })
                     ->thenInvalid('Propel doesn\'t support listeners')
-                ->ifTrue(function($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['repository']); })
+                ->ifTrue(function ($v) { return isset($v['driver']) && 'propel' === $v['driver'] && isset($v['repository']); })
                     ->thenInvalid('Propel doesn\'t support the "repository" parameter')
             ->end()
             ->children()