wip PHP 8

DependencyInjection/Configuration.php

@@ -25,8 +25,8 @@ public function getConfigTreeBuilder()
                 ->arrayNode('limits')
                     ->performNoDeepMerging()
                     ->beforeNormalization()
-                        ->ifTrue(function ($v) { return !is_array($v); })
-                        ->then(function ($v) { return [$v]; })
+                        ->ifTrue(fn($v) => !is_array($v))
+                        ->then(fn($v) => [$v])
                     ->end()
                     ->defaultValue([20 => '20', 50 => '50', 100 => '100'])
                     ->prototype('scalar')->end()

Grid/Columns.php

@@ -206,7 +206,7 @@ public function setColumnsOrder(array $columnIds, $keepOtherColumns = true)
         }
 
         if ($keepOtherColumns) {
-            $this->columns = array_merge($reorderedColumns, array_values($columnsIndexedByIds));
+            $this->columns = [...$reorderedColumns, ...array_values($columnsIndexedByIds)];
         } else {
             $this->columns = $reorderedColumns;
         }

Grid/Grid.php

@@ -311,10 +311,8 @@ class Grid implements GridInterface
 
     /**
      * The grid configuration.
-     *
-     * @var GridConfigInterface
      */
-    private $config;
+    private \APY\DataGridBundle\Grid\GridConfigInterface $config;
 
     /**
      * Constructor.

Grid/GridBuilder.php

@@ -16,24 +16,20 @@ class GridBuilder extends GridConfigBuilder implements GridBuilderInterface
 {
     /**
      * The container.
-     *
-     * @var Container
      */
-    private $container;
+    private \Symfony\Component\DependencyInjection\Container $container;
 
     /**
      * The factory.
-     *
-     * @var GridFactoryInterface
      */
-    private $factory;
+    private \APY\DataGridBundle\Grid\GridFactoryInterface $factory;
 
     /**
      * Columns of the grid builder.
      *
      * @var Column[]
      */
-    private $columns = [];
+    private array $columns = [];
 
     /**
      * Constructor.

Grid/GridFactory.php

@@ -17,15 +17,10 @@ class GridFactory implements GridFactoryInterface
 {
     /**
      * The service container.
-     *
-     * @var Container
      */
-    private $container;
+    private \Symfony\Component\DependencyInjection\Container $container;
 
-    /**
-     * @var GridRegistryInterface
-     */
-    private $registry;
+    private \APY\DataGridBundle\Grid\GridRegistryInterface $registry;
 
     /**
      * Constructor.

Grid/GridRegistry.php

@@ -20,14 +20,14 @@ class GridRegistry implements GridRegistryInterface
      *
      * @var GridTypeInterface[]
      */
-    private $types = [];
+    private array $types = [];
 
     /**
      * List of columns.
      *
      * @var Column[]
      */
-    private $columns = [];
+    private array $columns = [];
 
     /**
      * Add a grid type.

Grid/Source/Vector.php

@@ -223,7 +223,7 @@ public function getTotalCount($maxResults = null)
 
     public function getHash()
     {
-        return __CLASS__ . md5(implode('', array_map(function ($c) { return $c->getId(); }, $this->columns)));
+        return __CLASS__ . md5(implode('', array_map(fn($c) => $c->getId(), $this->columns)));
     }
 
     /**

Tests/Action/MassActionTest.php

@@ -7,23 +7,17 @@
 
 class MassActionTest extends TestCase
 {
-    /** @var MassAction */
-    private $massAction;
+    private \APY\DataGridBundle\Grid\Action\MassAction $massAction;
 
-    /** @var string */
-    private $title = 'foo';
+    private string $title = 'foo';
 
-    /** @var string */
-    private $callback = 'static::massAction';
+    private string $callback = 'static::massAction';
 
-    /** @var bool */
-    private $confirm = true;
+    private bool $confirm = true;
 
-    /** @var array */
-    private $parameters = ['foo' => 'foo', 'bar' => 'bar'];
+    private array $parameters = ['foo' => 'foo', 'bar' => 'bar'];
 
-    /** @var string */
-    private $role = 'ROLE_FOO';
+    private string $role = 'ROLE_FOO';
 
     public function testMassActionConstruct()
     {
@@ -135,7 +129,7 @@ public function testGetRole()
         $this->assertEquals($role, $this->massAction->getRole());
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->massAction = new MassAction($this->title, $this->callback, $this->confirm, $this->parameters, $this->role);
     }

Tests/Grid/Action/RowActionTest.php

@@ -5,31 +5,23 @@
 use APY\DataGridBundle\Grid\Action\RowAction;
 use APY\DataGridBundle\Grid\Row;
 
-class RowActionTest extends \PHPUnit_Framework_TestCase
+class RowActionTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var string */
-    private $title = 'title';
+    private string $title = 'title';
 
-    /** @var string */
-    private $route = 'vendor.bundle.controller.route_name';
+    private string $route = 'vendor.bundle.controller.route_name';
 
-    /** @var bool */
-    private $confirm = true;
+    private bool $confirm = true;
 
-    /** @var string */
-    private $target = '_parent';
+    private string $target = '_parent';
 
-    /** @var array */
-    private $attributes = ['foo' => 'foo', 'bar' => 'bar'];
+    private array $attributes = ['foo' => 'foo', 'bar' => 'bar'];
 
-    /** @var string */
-    private $role = 'ROLE_FOO';
+    private string $role = 'ROLE_FOO';
 
-    /** @var array */
-    private $callbacks = [];
+    private array $callbacks = [];
 
-    /** @var RowAction */
-    private $rowAction;
+    private \APY\DataGridBundle\Grid\Action\RowAction $rowAction;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $row;
@@ -243,8 +235,8 @@ public function testGetRole()
 
     public function testManipulateRender()
     {
-        $callback1 = function () { return 1; };
-        $callback2 = function () { return 2; };
+        $callback1 = fn() => 1;
+        $callback2 = fn() => 2;
 
         $this->rowAction->manipulateRender($callback1);
         $this->rowAction->manipulateRender($callback2);
@@ -327,7 +319,7 @@ public function testGetEnabled()
         $this->assertTrue($this->rowAction->getEnabled());
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->rowAction = new RowAction(
             $this->title, $this->route, $this->confirm, $this->target, $this->attributes, $this->role

Tests/Grid/Column/ActionsColumnTest.php

@@ -11,8 +11,7 @@
 
 class ActionsColumnTest extends TestCase
 {
-    /** @var ActionsColumn */
-    private $column;
+    private \APY\DataGridBundle\Grid\Column\ActionsColumn $column;
 
     public function testConstructor()
     {
@@ -162,7 +161,7 @@ public function testGetRouteParameters()
         ], $this->column->getRouteParameters($row, $rowAction));
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $rowAction1 = $this->createMock(RowAction::class);
         $rowAction2 = $this->createMock(RowAction::class);

Tests/Grid/Column/ArrayColumnTest.php

@@ -11,8 +11,7 @@
 
 class ArrayColumnTest extends TestCase
 {
-    /** @var ArrayColumn */
-    private $column;
+    private \APY\DataGridBundle\Grid\Column\ArrayColumn $column;
 
     public function testGetType()
     {
@@ -129,9 +128,7 @@ public function testRenderCellWithoutCallback()
     public function testRenderCellWithCallback()
     {
         $values = ['foo' => 'a', 'bar' => 'b', 'foobar' => ['c', 'd']];
-        $this->column->manipulateRenderCell(function ($value, $row, $router) {
-            return ['bar' => 'a', 'foo' => 'b'];
-        });
+        $this->column->manipulateRenderCell(fn($value, $row, $router) => ['bar' => 'a', 'foo' => 'b']);
 
         $result = $this->column->renderCell(
             $values,
@@ -142,7 +139,7 @@ public function testRenderCellWithCallback()
         $this->assertEquals($result, ['bar' => 'a', 'foo' => 'b']);
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->column = new ArrayColumn();
     }

Tests/Grid/Column/BooleanColumnTest.php

@@ -10,8 +10,7 @@
 
 class BooleanColumnTest extends TestCase
 {
-    /** @var BooleanColumn */
-    private $column;
+    private \APY\DataGridBundle\Grid\Column\BooleanColumn $column;
 
     public function testGetType()
     {
@@ -102,18 +101,14 @@ public function testRenderCell()
     public function testRenderCellWithCallback()
     {
         $this->column->manipulateRenderCell(
-            function ($value, $row, $router) {
-                return 'true';
-            }
+            fn($value, $row, $router) => 'true'
         );
         $this->assertEquals('true', $this->column->renderCell(
             0, $this->createMock(Row::class), $this->createMock(Router::class)
         ));
 
         $this->column->manipulateRenderCell(
-            function ($value, $row, $router) {
-                return 'false';
-            }
+            fn($value, $row, $router) => 'false'
         );
         $this->assertEquals('false', $this->column->renderCell(
             1, $this->createMock(Row::class), $this->createMock(Router::class)
@@ -129,7 +124,7 @@ function ($value, $row, $router) {
         ));
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->column = new BooleanColumn();
     }

Tests/Grid/Column/ColumnTest.php

@@ -159,7 +159,7 @@ public function testRenderCellWithCallback()
         $row = $this->createMock(Row::class);
         $router = $this->createMock(Router::class);
 
-        $mock->manipulateRenderCell(function ($value, $row, $router) { return 1; });
+        $mock->manipulateRenderCell(fn($value, $row, $router) => 1);
 
         $this->assertEquals(1, $mock->renderCell($value, $row, $router));
     }
@@ -197,7 +197,7 @@ public function testManipulateRenderCell()
         $row = $this->createMock(Row::class);
         $router = $this->createMock(Router::class);
 
-        $callback = function ($value, $row, $router) { return 1; };
+        $callback = fn($value, $row, $router) => 1;
         $mock->manipulateRenderCell($callback);
 
         $this->assertAttributeEquals($callback, 'callback', $mock);

Tests/Grid/Column/DateColumnTest.php

@@ -9,8 +9,7 @@
 
 class DateColumnTest extends TestCase
 {
-    /** @var DateColumn */
-    private $column;
+    private \APY\DataGridBundle\Grid\Column\DateColumn $column;
 
     public function testGetType()
     {
@@ -119,7 +118,7 @@ public function testGetFiltersOperatorLte()
         );
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->column = new DateColumn();
     }

Tests/Grid/Column/DateTimeColumnTest.php

@@ -8,7 +8,7 @@
 use APY\DataGridBundle\Grid\Row;
 use Symfony\Bundle\FrameworkBundle\Routing\Router;
 
-class DateTimeColumnTest extends \PHPUnit_Framework_TestCase
+class DateTimeColumnTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetType()
     {
@@ -98,9 +98,7 @@ public function testRenderCellWithCallback()
     {
         $column = new DateTimeColumn();
         $column->setFormat('Y-m-d H:i:s');
-        $column->manipulateRenderCell(function ($value, $row, $router) {
-            return '01:00:00';
-        });
+        $column->manipulateRenderCell(fn($value, $row, $router) => '01:00:00');
 
         $dateTime = '2000-01-01 01:00:00';
         $now = new \DateTime($dateTime);

Tests/Grid/Column/JoinColumnTest.php

@@ -9,8 +9,7 @@
 
 class JoinColumnTest extends TestCase
 {
-    /** @var JoinColumn */
-    private $column;
+    private \APY\DataGridBundle\Grid\Column\JoinColumn $column;
 
     public function testGetType()
     {
@@ -88,7 +87,7 @@ public function testSetColumnNameOnFilters()
         ], $column->getFilters('asource'));
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->column = new JoinColumn();
     }

Tests/Grid/Column/MassActionColumnTest.php

@@ -8,8 +8,7 @@
 
 class MassActionColumnTest extends TestCase
 {
-    /** @var MassActionColumn */
-    private $column;
+    private \APY\DataGridBundle\Grid\Column\MassActionColumn $column;
 
     public function testGetType()
     {
@@ -40,7 +39,7 @@ public function testInitialize()
         ], 'params', $this->column);
     }
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->column = new MassActionColumn();
     }