Merge pull request #984 from webstacknl/php-cs-fixer-3

deps: Updated php-cs-fixer to ^3.6
stwe · Feb 25, 2022 · a9f18ef · a9f18ef
2 parents dfd8a4c + cd8846d
commit a9f18ef
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 98 deletions.
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -15,10 +15,9 @@
     ->append([__DIR__.'/php-cs-fixer'])
 ;
 
-$config = PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PHP56Migration' => true,
         '@PhpCsFixer' => true,
         '@PhpCsFixer:risky' => true,
         '@PHPUnit60Migration:risky' => true,
@@ -31,7 +30,4 @@
         'no_useless_return' => true,
         'not_operator_with_successor_space' => true,
     ])
-    ->setFinder($finder)
-;
-
-return $config;
+    ->setFinder($finder);
diff --git a/Datatable/AbstractDatatable.php b/Datatable/AbstractDatatable.php
@@ -168,8 +168,8 @@ public function __construct(
         $this->authorizationChecker = $authorizationChecker;
         $this->securityToken = $securityToken;
 
-        if (!($translator instanceof LegacyTranslatorInterface) && !($translator instanceof TranslatorInterface)) {
-            throw new \InvalidArgumentException(sprintf('The $translator argument of %s must be an instance of %s or %s, a %s was given.', static::class, LegacyTranslatorInterface::class, TranslatorInterface::class, get_class($translator)));
+        if (! ($translator instanceof LegacyTranslatorInterface) && ! ($translator instanceof TranslatorInterface)) {
+            throw new \InvalidArgumentException(sprintf('The $translator argument of %s must be an instance of %s or %s, a %s was given.', static::class, LegacyTranslatorInterface::class, TranslatorInterface::class, \get_class($translator)));
         }
         $this->translator = $translator;
         $this->router = $router;

diff --git a/Datatable/Action/Action.php b/Datatable/Action/Action.php
@@ -20,17 +20,17 @@
 
 class Action
 {
-    use OptionsTrait;
-
-    // Render an Action only if conditions are TRUE.
-    use RenderIfTrait;
-
     /*
      * An Action has a 'start_html' and a 'end_html' option.
      * <startHtml>action</endHtml>
      */
     use HtmlContainerTrait;
 
+    use OptionsTrait;
+
+    // Render an Action only if conditions are TRUE.
+    use RenderIfTrait;
+
     /**
      * The name of the Action route.
      * Default: null.

diff --git a/Datatable/Column/AbstractColumn.php b/Datatable/Column/AbstractColumn.php
@@ -23,34 +23,34 @@
 
 abstract class AbstractColumn implements ColumnInterface
 {
-    use OptionsTrait;
-
     // Use an 'add_if' option to check in ColumnBuilder if the Column can be added.
     use AddIfTrait;
 
+    use OptionsTrait;
+
     //-------------------------------------------------
     // Column Types
     //-------------------------------------------------
 
     /**
      * Identifies a Data Column.
      */
-    const DATA_COLUMN = 'data';
+    public const DATA_COLUMN = 'data';
 
     /**
      * Identifies an Action Column.
      */
-    const ACTION_COLUMN = 'action';
+    public const ACTION_COLUMN = 'action';
 
     /**
      * Identifies a Multiselect Column.
      */
-    const MULTISELECT_COLUMN = 'multiselect';
+    public const MULTISELECT_COLUMN = 'multiselect';
 
     /**
      * Identifies a Virtual Column.
      */
-    const VIRTUAL_COLUMN = 'virtual';
+    public const VIRTUAL_COLUMN = 'virtual';
 
     //--------------------------------------------------------------------------------------------------
     // DataTables - Columns Options

diff --git a/Datatable/Column/BooleanColumn.php b/Datatable/Column/BooleanColumn.php
@@ -26,12 +26,12 @@ class BooleanColumn extends AbstractColumn
     /**
      * @internal
      */
-    const RENDER_TRUE_VALUE = 'true';
+    public const RENDER_TRUE_VALUE = 'true';
 
     /**
      * @internal
      */
-    const RENDER_FALSE_VALUE = 'false';
+    public const RENDER_FALSE_VALUE = 'false';
 
     /**
      * The icon for a value that is true.

diff --git a/Datatable/Column/ColumnInterface.php b/Datatable/Column/ColumnInterface.php
@@ -19,7 +19,7 @@ interface ColumnInterface
     /**
      * @var int
      */
-    const LAST_POSITION = -1;
+    public const LAST_POSITION = -1;
 
     /**
      * Validates $dql. Normally a non-empty string is expected.

diff --git a/Datatable/Column/NumberColumn.php b/Datatable/Column/NumberColumn.php
@@ -149,7 +149,7 @@ public function getFormatter()
     /**
      * @return $this
      */
-    public function setFormatter(\NumberFormatter  $formatter)
+    public function setFormatter(\NumberFormatter $formatter)
     {
         $this->formatter = $formatter;
 

diff --git a/Datatable/DatatableFactory.php b/Datatable/DatatableFactory.php
@@ -75,8 +75,8 @@ public function __construct(
         $this->authorizationChecker = $authorizationChecker;
         $this->securityToken = $securityToken;
 
-        if (!($translator instanceof LegacyTranslatorInterface) && !($translator instanceof TranslatorInterface)) {
-            throw new \InvalidArgumentException(sprintf('The $translator argument of %s must be an instance of %s or %s, a %s was given.', static::class, LegacyTranslatorInterface::class, TranslatorInterface::class, get_class($translator)));
+        if (! ($translator instanceof LegacyTranslatorInterface) && ! ($translator instanceof TranslatorInterface)) {
+            throw new \InvalidArgumentException(sprintf('The $translator argument of %s must be an instance of %s or %s, a %s was given.', static::class, LegacyTranslatorInterface::class, TranslatorInterface::class, \get_class($translator)));
         }
         $this->translator = $translator;
         $this->router = $router;

diff --git a/Datatable/DatatableInterface.php b/Datatable/DatatableInterface.php
@@ -19,7 +19,7 @@
  */
 interface DatatableInterface
 {
-    const NAME_REGEX = '/^[a-zA-Z0-9\-\_]+$/';
+    public const NAME_REGEX = '/^[a-zA-Z0-9\-\_]+$/';
 
     /**
      * Builds the datatable.

diff --git a/Datatable/Extension/Responsive.php b/Datatable/Extension/Responsive.php
@@ -76,9 +76,7 @@ public function setDetails($details)
         if (\is_array($details)) {
             foreach ($details as $key => $value) {
                 if (false === \in_array($key, ['type', 'target', 'renderer', 'display'], true)) {
-                    throw new Exception(
-                        "Responsive::setDetails(): {$key} is not an valid option."
-                    );
+                    throw new Exception("Responsive::setDetails(): {$key} is not an valid option.");
                 }
             }
 

diff --git a/Datatable/Extension/RowGroup.php b/Datatable/Extension/RowGroup.php
@@ -148,9 +148,7 @@ public function getDataSrc()
     public function setDataSrc($dataSrc)
     {
         if (\is_string($dataSrc) && empty($dataSrc)) {
-            throw new \Exception(
-                'RowGroup::setDataSrc(): the column name is empty.'
-            );
+            throw new \Exception('RowGroup::setDataSrc(): the column name is empty.');
         }
 
         $this->dataSrc = $dataSrc;
@@ -174,16 +172,12 @@ public function getStartRender()
     public function setStartRender($startRender)
     {
         if (false === \array_key_exists('template', $startRender)) {
-            throw new Exception(
-                'RowGroup::setStartRender(): The "template" option is required.'
-            );
+            throw new Exception('RowGroup::setStartRender(): The "template" option is required.');
         }
 
         foreach ($startRender as $key => $value) {
             if (false === \in_array($key, ['template', 'vars'], true)) {
-                throw new Exception(
-                    "RowGroup::setStartRender(): {$key} is not a valid option."
-                );
+                throw new Exception("RowGroup::setStartRender(): {$key} is not a valid option.");
             }
         }
 
@@ -208,16 +202,12 @@ public function getEndRender()
     public function setEndRender($endRender)
     {
         if (false === \array_key_exists('template', $endRender)) {
-            throw new Exception(
-                'RowGroup::setEndRender(): The "template" option is required.'
-            );
+            throw new Exception('RowGroup::setEndRender(): The "template" option is required.');
         }
 
         foreach ($endRender as $key => $value) {
             if (false === \in_array($key, ['template', 'vars'], true)) {
-                throw new Exception(
-                    "RowGroup::setEndRender(): {$key} is not a valid option."
-                );
+                throw new Exception("RowGroup::setEndRender(): {$key} is not a valid option.");
             }
         }
 
@@ -242,9 +232,7 @@ public function getClassName()
     public function setClassName($className)
     {
         if (\is_string($className) && empty($className)) {
-            throw new \Exception(
-                'RowGroup::setClassName(): the class name is empty.'
-            );
+            throw new \Exception('RowGroup::setClassName(): the class name is empty.');
         }
 
         $this->className = $className;
@@ -268,9 +256,7 @@ public function getEmptyDataGroup()
     public function setEmptyDataGroup($emptyDataGroup)
     {
         if (\is_string($emptyDataGroup) && empty($emptyDataGroup)) {
-            throw new \Exception(
-                'RowGroup::setEmptyDataGroup(): the empty data group text is empty.'
-            );
+            throw new \Exception('RowGroup::setEmptyDataGroup(): the empty data group text is empty.');
         }
 
         $this->emptyDataGroup = $emptyDataGroup;
@@ -314,9 +300,7 @@ public function getEndClassName()
     public function setEndClassName($endClassName)
     {
         if (\is_string($endClassName) && empty($endClassName)) {
-            throw new \Exception(
-                'RowGroup::setEndClassName(): the end class name is empty.'
-            );
+            throw new \Exception('RowGroup::setEndClassName(): the end class name is empty.');
         }
 
         $this->endClassName = $endClassName;
@@ -340,9 +324,7 @@ public function getStartClassName()
     public function setStartClassName($startClassName)
     {
         if (\is_string($startClassName) && empty($startClassName)) {
-            throw new \Exception(
-                'RowGroup::setStartClassName(): the start class name is empty.'
-            );
+            throw new \Exception('RowGroup::setStartClassName(): the start class name is empty.');
         }
 
         $this->startClassName = $startClassName;

diff --git a/Datatable/OptionsTrait.php b/Datatable/OptionsTrait.php
@@ -98,16 +98,12 @@ protected function optionToJson($value)
     protected function validateArrayForTemplateAndOther(array $array, array $other = ['template', 'vars'])
     {
         if (false === \array_key_exists('template', $array)) {
-            throw new Exception(
-                'OptionsTrait::validateArrayForTemplateAndOther(): The "template" option is required.'
-            );
+            throw new Exception('OptionsTrait::validateArrayForTemplateAndOther(): The "template" option is required.');
         }
 
         foreach ($array as $key => $value) {
             if (false === \in_array($key, $other, true)) {
-                throw new Exception(
-                    "OptionsTrait::validateArrayForTemplateAndOther(): {$key} is not an valid option."
-                );
+                throw new Exception("OptionsTrait::validateArrayForTemplateAndOther(): {$key} is not an valid option.");
             }
         }