Merge pull request #20 from northernco/automated-testing-deprecations

Address test deprecation warnings
northernco · Jun 22, 2023 · 2db72bb · 2db72bb
2 parents a8601f9 + 50888d2
commit 2db72bb
Show file tree

Hide file tree

Showing 30 changed files with 1,135 additions and 1,547 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -10,11 +10,11 @@ defaults:
 
 jobs:
     test:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
 
         strategy:
             matrix:
-                php: ['7.4', '8.0', '8.1']
+                php: ['8.0', '8.1', '8.2']
 
         steps:
             -   name: Checkout

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "type": "symfony-bundle",
     "license": "MIT",
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "symfony/form": "^4.4|^5.2",
         "symfony/dependency-injection": "^4.4|^5.2",
         "symfony/config": "^4.4|^5.2",
@@ -23,7 +23,7 @@
         "symfony/framework-bundle": "^4.4|^5.2",
         "symfony/expression-language": "^4.4|^5.2",
         "symfony/phpunit-bridge": "^4.4|^5.2",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^9.5",
         "doctrine/orm": "~2.4,>=2.4.5"
     },
     "suggest": {

diff --git a/src/Grid/Action/RowAction.php b/src/Grid/Action/RowAction.php
@@ -66,16 +66,17 @@ class RowAction implements RowActionInterface
      */
     public function __construct($title, $route, $confirm = false, $target = '_self', $attributes = [], $role = null)
     {
-        $this->title = $title;
-        $this->route = $route;
-        $this->confirm = $confirm;
+        $this->title          = $title;
+        $this->route          = $route;
+        $this->confirm        = $confirm;
         $this->confirmMessage = 'Do you want to ' . strtolower($title) . ' this row?';
-        $this->target = $target;
-        $this->attributes = $attributes;
-        $this->role = $role;
+        $this->target         = $target;
+        $this->attributes     = $attributes;
+        $this->role           = $role;
     }
 
     // @todo: has this setter real sense? we passed this value from constructor
+
     /**
      * Set action title.
      *
@@ -99,6 +100,7 @@ public function getTitle()
     }
 
     // @todo: has this setter real sense? we passed this value from constructor
+
     /**
      * Set action route.
      *
@@ -220,7 +222,7 @@ public function getColumn()
      */
     public function addRouteParameters($routeParameters)
     {
-        $routeParameters = (array) $routeParameters;
+        $routeParameters = (array)$routeParameters;
 
         foreach ($routeParameters as $key => $routeParameter) {
             if (is_int($key)) {
@@ -242,7 +244,7 @@ public function addRouteParameters($routeParameters)
      */
     public function setRouteParameters($routeParameters)
     {
-        $this->routeParameters = (array) $routeParameters;
+        $this->routeParameters = (array)$routeParameters;
 
         return $this;
     }
@@ -256,6 +258,7 @@ public function getRouteParameters()
     }
 
     // @todo: why is this accepting string? it seems pretty useless, isn't it?
+
     /**
      * Set route parameters mapping.
      *
@@ -265,7 +268,7 @@ public function getRouteParameters()
      */
     public function setRouteParametersMapping($routeParametersMapping)
     {
-        $this->routeParametersMapping = (array) $routeParametersMapping;
+        $this->routeParametersMapping = (array)$routeParametersMapping;
 
         return $this;
     }
@@ -346,11 +349,11 @@ public function getRole()
     /**
      * Set render callback.
      *
-     * @deprecated This is deprecated and will be removed in 3.0; use addManipulateRender instead.
-     *
      * @param \Closure $callback
      *
      * @return self
+     * @deprecated This is deprecated and will be removed in 3.0; use addManipulateRender instead.
+     *
      */
     public function manipulateRender(\Closure $callback)
     {
@@ -371,6 +374,11 @@ public function addManipulateRender($callback)
         return $this;
     }
 
+    public function getCallbacks(): array
+    {
+        return $this->callbacks;
+    }
+
     /**
      * Render action for row.
      *
@@ -392,6 +400,7 @@ public function render($row)
     }
 
     // @todo: should not this be "isEnabled"?
+
     /**
      * {@inheritdoc}
      */
@@ -401,6 +410,7 @@ public function getEnabled()
     }
 
     // @todo: should not this be "enable" as default value is false?
+
     /**
      * Set the enabled state of this action.
      *

diff --git a/src/Grid/Column/Column.php b/src/Grid/Column/Column.php
@@ -132,7 +132,7 @@ abstract class Column
      */
     public function __construct($params = null)
     {
-        $this->__initialize((array) $params);
+        $this->__initialize((array)$params);
     }
 
     public function __initialize(array $params)
@@ -206,8 +206,8 @@ public function getParam($id, $default = null)
     /**
      * Draw cell.
      *
-     * @param mixed  $value
-     * @param Row    $row
+     * @param mixed $value
+     * @param Row $row
      * @param $router
      *
      * @return string
@@ -218,8 +218,8 @@ public function renderCell($value, $row, $router)
             return call_user_func($this->callback, $value, $row, $router);
         }
 
-        $value = is_bool($value) ? (int) $value : $value;
-        if (array_key_exists((string) $value, $this->values)) {
+        $value = is_bool($value) ? (int)$value : $value;
+        if (array_key_exists((string)$value, $this->values)) {
             $value = $this->values[$value];
         }
 
@@ -240,6 +240,11 @@ public function manipulateRenderCell($callback)
         return $this;
     }
 
+    public function getCallback(): ?\Closure
+    {
+        return $this->callback;
+    }
+
     /**
      * Set column identifier.
      *
@@ -563,6 +568,11 @@ public function getData()
         return $result;
     }
 
+    public function getDataAttribute(): array
+    {
+        return $this->data;
+    }
+
     /**
      * Return true if filter value is correct (has to be overridden in each Column class that can be filtered, in order to catch wrong values).
      *
@@ -692,7 +702,7 @@ public function setFilterType($filterType)
     {
         $this->filterType = strtolower($filterType);
 
-        return  $this;
+        return $this;
     }
 
     public function getFilterType()
@@ -742,7 +752,7 @@ public function getFilters($source)
                     case self::OPERATOR_NEQ:
                     case self::OPERATOR_NLIKE:
                     case self::OPERATOR_NSLIKE:
-                        foreach ((array) $this->data['from'] as $value) {
+                        foreach ((array)$this->data['from'] as $value) {
                             $filters[] = new Filter($this->data['operator'], $value);
                         }
                         break;
@@ -798,7 +808,7 @@ public function getOperators()
                 self::OPERATOR_GT,
                 self::OPERATOR_GTE,
                 self::OPERATOR_BTW,
-                self::OPERATOR_BTWE, ]);
+                self::OPERATOR_BTWE,]);
         }
 
         return $this->operators;
@@ -910,6 +920,11 @@ public function setAuthorizationChecker(AuthorizationCheckerInterface $authoriza
         return $this;
     }
 
+    public function getAuthorizationChecker(): ?AuthorizationCheckerInterface
+    {
+        return $this->authorizationChecker;
+    }
+
     public function getParentType()
     {
         return '';

diff --git a/src/Grid/Columns.php b/src/Grid/Columns.php
@@ -55,7 +55,7 @@ public function getIterator($showOnlySourceColumns = false)
      *
      * @return Columns
      */
-    public function addColumn(Column $column, $position = 0)
+    public function addColumn(Column $column, int $position = 0)
     {
         $column->setAuthorizationChecker($this->authorizationChecker);