Merge branch 'master' into master

APY · Dec 16, 2016 · 55abba4 · 55abba4
2 parents b46e835 + 4605318
commit 55abba4
Show file tree

Hide file tree

Showing 86 changed files with 1,247 additions and 1,087 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

diff --git a/APYDataGridBundle.php b/APYDataGridBundle.php
@@ -12,10 +12,10 @@
 
 namespace APY\DataGridBundle;
 
+use APY\DataGridBundle\DependencyInjection\Compiler\GridExtensionPass;
 use APY\DataGridBundle\DependencyInjection\Compiler\GridPass;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use APY\DataGridBundle\DependencyInjection\Compiler\GridExtensionPass;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class APYDataGridBundle extends Bundle
 {

diff --git a/DependencyInjection/APYDataGridExtension.php b/DependencyInjection/APYDataGridExtension.php
@@ -12,11 +12,11 @@
 
 namespace APY\DataGridBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class APYDataGridExtension extends Extension
 {
@@ -25,11 +25,11 @@ public function load(array $configs, ContainerBuilder $container)
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.xml');
         $loader->load('columns.xml');
 
-        $ymlLoader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $ymlLoader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $ymlLoader->load('grid.yml');
 
         $container->setParameter('apy_data_grid.limits', $config['limits']);

diff --git a/DependencyInjection/Compiler/GridExtensionPass.php b/DependencyInjection/Compiler/GridExtensionPass.php
@@ -12,9 +12,9 @@
 
 namespace APY\DataGridBundle\DependencyInjection\Compiler;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 class GridExtensionPass implements CompilerPassInterface
 {
@@ -31,10 +31,10 @@ public function process(ContainerBuilder $container)
         // afterward. If not, the globals from the extensions will never
         // be registered.
         $calls = $definition->getMethodCalls();
-        $definition->setMethodCalls(array());
+        $definition->setMethodCalls([]);
 
         foreach ($container->findTaggedServiceIds('grid.column.extension') as $id => $attributes) {
-            $definition->addMethodCall('addColumnExtension', array(new Reference($id)));
+            $definition->addMethodCall('addColumnExtension', [new Reference($id)]);
         }
 
         $definition->setMethodCalls(array_merge($definition->getMethodCalls(), $calls));

diff --git a/DependencyInjection/Compiler/GridPass.php b/DependencyInjection/Compiler/GridPass.php
@@ -1,14 +1,14 @@
 <?php
+
 namespace APY\DataGridBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * Class GridPass
+ * Class GridPass.
  *
- * @package APY\DataGridBundle\DependencyInjection\Compiler
  * @author  Quentin Ferrer
  */
 class GridPass implements CompilerPassInterface

diff --git a/DependencyInjection/Compiler/TranslationPass.php b/DependencyInjection/Compiler/TranslationPass.php
@@ -1,12 +1,13 @@
 <?php
+
 namespace APY\DataGridBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
 /**
- * Class TranslationPass
+ * Class TranslationPass.
  *
  * @author Quentin FERRER
  */

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -6,14 +6,14 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     public function getConfigTreeBuilder()
     {
@@ -25,10 +25,10 @@ public function getConfigTreeBuilder()
                 ->arrayNode('limits')
                     ->performNoDeepMerging()
                     ->beforeNormalization()
-                        ->ifTrue(function($v) { return !is_array($v); })
-                        ->then(function($v) { return array($v); })
+                        ->ifTrue(function ($v) { return !is_array($v); })
+                        ->then(function ($v) { return [$v]; })
                     ->end()
-                    ->defaultValue(array(20 => '20', 50 => '50', 100 => '100'))
+                    ->defaultValue([20 => '20', 50 => '50', 100 => '100'])
                     ->prototype('scalar')->end()
                 ->end()
                 ->booleanNode('persistence')->defaultFalse()->end()
@@ -44,15 +44,14 @@ public function getConfigTreeBuilder()
                         ->booleanNode('enable')->defaultFalse()->end()
                         ->scalarNode('view_class')->defaultValue('Pagerfanta\View\DefaultView')->end()
                         ->arrayNode('options')
-                            ->defaultValue(array('prev_message' => '«', 'next_message' => '»'))
+                            ->defaultValue(['prev_message' => '«', 'next_message' => '»'])
                             ->useAttributeAsKey('options')
                             ->prototype('scalar')->end()
                         ->end()
                     ->end()
                 ->end()
-             ->end()
+             ->end();
 
-        ;
         return $treeBuilder;
     }
 }
diff --git a/Grid/AbstractType.php b/Grid/AbstractType.php
@@ -1,20 +1,20 @@
 <?php
+
 namespace APY\DataGridBundle\Grid;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class AbstractType
+ * Class AbstractType.
  *
- * @package APY\DataGridBundle
  * @author  Quentin Ferrer
  */
 abstract class AbstractType implements GridTypeInterface
 {
     /**
      * {@inheritdoc}
      */
-    public function buildGrid(GridBuilder $builder, array $options = array())
+    public function buildGrid(GridBuilder $builder, array $options = [])
     {
     }
 

diff --git a/Grid/Action/DeleteMassAction.php b/Grid/Action/DeleteMassAction.php
@@ -15,9 +15,9 @@
 class DeleteMassAction extends MassAction
 {
     /**
-     * Default DeleteMassAction constructor
+     * Default DeleteMassAction constructor.
      *
-     * @param boolean $confirm Show confirm message if true
+     * @param bool $confirm Show confirm message if true
      */
     public function __construct($confirm = false)
     {

diff --git a/Grid/Action/MassAction.php b/Grid/Action/MassAction.php
@@ -17,30 +17,31 @@ class MassAction implements MassActionInterface
     protected $title;
     protected $callback;
     protected $confirm;
-    protected $parameters = array();
+    protected $confirmMessage;
+    protected $parameters = [];
     protected $role;
 
     /**
-     * Default MassAction constructor
+     * Default MassAction constructor.
      *
-     * @param string $title Title of the mass action
-     * @param string $callback Callback of the mass action
-     * @param boolean $confirm Show confirm message if true
-     * @param array $parameters Additional parameters
-     * @param string $role Security role
+     * @param string $title      Title of the mass action
+     * @param string $callback   Callback of the mass action
+     * @param bool   $confirm    Show confirm message if true
+     * @param array  $parameters Additional parameters
+     * @param string $role       Security role
      */
-    public function __construct($title, $callback = null, $confirm = false, $parameters = array(), $role = null)
+    public function __construct($title, $callback = null, $confirm = false, $parameters = [], $role = null)
     {
         $this->title = $title;
         $this->callback = $callback;
         $this->confirm = $confirm;
-        $this->confirmMessage = 'Do you want to '.strtolower($title).' the selected rows?';
+        $this->confirmMessage = 'Do you want to ' . strtolower($title) . ' the selected rows?';
         $this->parameters = $parameters;
         $this->role = $role;
     }
 
     /**
-     * Set action title
+     * Set action title.
      *
      * @param $title
      *
@@ -54,7 +55,7 @@ public function setTitle($title)
     }
 
     /**
-     * get action title
+     * get action title.
      *
      * @return string
      */
@@ -64,7 +65,7 @@ public function getTitle()
     }
 
     /**
-     * Set action callback
+     * Set action callback.
      *
      * @param  $callback
      *
@@ -78,7 +79,7 @@ public function setCallback($callback)
     }
 
     /**
-     * get action callback
+     * get action callback.
      *
      * @return string
      */
@@ -88,7 +89,7 @@ public function getCallback()
     }
 
     /**
-     * Set action confirm
+     * Set action confirm.
      *
      * @param  $confirm
      *
@@ -102,17 +103,17 @@ public function setConfirm($confirm)
     }
 
     /**
-     * Get action confirm
+     * Get action confirm.
      *
-     * @return boolean
+     * @return bool
      */
     public function getConfirm()
     {
         return $this->confirm;
     }
 
     /**
-     * Set action confirmMessage
+     * Set action confirmMessage.
      *
      * @param string $confirmMessage
      *
@@ -126,7 +127,7 @@ public function setConfirmMessage($confirmMessage)
     }
 
     /**
-     * get action confirmMessage
+     * get action confirmMessage.
      *
      * @return string
      */
@@ -136,9 +137,10 @@ public function getConfirmMessage()
     }
 
     /**
-     * Set action/controller parameters
+     * Set action/controller parameters.
      *
      * @param array $parameters
+     *
      * @return $this
      */
     public function setParameters(array $parameters)
@@ -149,7 +151,7 @@ public function setParameters(array $parameters)
     }
 
     /**
-     * Get action/controller parameters
+     * Get action/controller parameters.
      *
      * @return array
      */
@@ -159,7 +161,7 @@ public function getParameters()
     }
 
     /**
-     * set role
+     * set role.
      *
      * @param mixed $role
      *
@@ -173,7 +175,7 @@ public function setRole($role)
     }
 
     /**
-     * Get role
+     * Get role.
      *
      * @return mixed
      */

diff --git a/Grid/Action/MassActionInterface.php b/Grid/Action/MassActionInterface.php
@@ -15,35 +15,35 @@
 interface MassActionInterface
 {
     /**
-     * get action title
+     * get action title.
      *
      * @return string
      */
     public function getTitle();
 
     /**
-     * get action callback
+     * get action callback.
      *
      * @return string
      */
     public function getCallback();
 
     /**
-     * get action confirm
+     * get action confirm.
      *
-     * @return boolean
+     * @return bool
      */
     public function getConfirm();
 
     /**
-     * get action confirmMessage
+     * get action confirmMessage.
      *
-     * @return boolean
+     * @return bool
      */
     public function getConfirmMessage();
 
     /**
-     * get additional parameters
+     * get additional parameters.
      *
      * @return array
      */
-Original file line number
+Diff line change
@@ -1,7 +1,6 @@
     language: php
     php:
-      - 5.4
       - 5.5
       - 5.6
       - 7.0
@@ Expand Down @@