add CS-fixed files

Application/Controller/Admin/d3ActionWizard.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -101,4 +101,4 @@ class d3ActionWizard extends AdminDetailsController
     {
         return null;
     }
-}
+}

Application/Controller/Admin/d3ExportWizard.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -115,4 +115,4 @@ class d3ExportWizard extends AdminDetailsController
     {
         return null;
     }
-}
+}

Application/Model/ActionBase.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -33,7 +33,7 @@ abstract class ActionBase implements QueryBase
      * Ensure that the translations are equally available in the frontend and the backend
      * @return string
      */
-    public function getDescription() : string
+    public function getDescription(): string
     {
         return '';
     }
@@ -53,7 +53,7 @@ abstract class ActionBase implements QueryBase
             }
         }
 
-        $this->executeAction( $this->getQuery() );
+        $this->executeAction($this->getQuery());
     }
 
     /**
@@ -63,21 +63,21 @@ abstract class ActionBase implements QueryBase
      * @throws DatabaseConnectionException
      * @throws DatabaseErrorException
      */
-    public function executeAction( array $query ): int
+    public function executeAction(array $query): int
     {
         [ $queryString, $parameters ] = $query;
 
         $queryString = trim($queryString);
 
-        if ( strtolower( substr( $queryString, 0, 6 ) ) === 'select' ) {
+        if (strtolower(substr($queryString, 0, 6)) === 'select') {
             throw oxNew(
                 Exceptions\TaskException::class,
                 $this,
-                Registry::getLang()->translateString( 'D3_DATAWIZARD_ERR_ACTIONSELECT' )
+                Registry::getLang()->translateString('D3_DATAWIZARD_ERR_ACTIONSELECT')
             );
         }
 
-        $affected = $this->d3GetDb()->execute( $queryString, $parameters );
+        $affected = $this->d3GetDb()->execute($queryString, $parameters);
 
         throw oxNew(
             Exceptions\TaskException::class,
@@ -97,13 +97,13 @@ abstract class ActionBase implements QueryBase
      */
     public function d3GetDb(): ?DatabaseInterface
     {
-        return DatabaseProvider::getDb( DatabaseProvider::FETCH_MODE_ASSOC );
+        return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC);
     }
 
     /**
      * @return string
      */
-    public function getButtonText() : string
+    public function getButtonText(): string
     {
         return "D3_DATAWIZARD_ACTION_SUBMIT";
     }
@@ -138,4 +138,4 @@ abstract class ActionBase implements QueryBase
     {
         return $this->formElements;
     }
-}
+}

Application/Model/Configuration.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -19,13 +19,13 @@ use D3\DataWizard\Application\Model\Exceptions\DataWizardException;
 
 class Configuration
 {
-    const GROUP_SHOP     = 'D3_DATAWIZARD_GROUP_SHOP';
+    public const GROUP_SHOP     = 'D3_DATAWIZARD_GROUP_SHOP';
-    const GROUP_CATEGORY = 'D3_DATAWIZARD_GROUP_CATEGORIES';
+    public const GROUP_CATEGORY = 'D3_DATAWIZARD_GROUP_CATEGORIES';
-    const GROUP_ARTICLES = 'D3_DATAWIZARD_GROUP_ARTICLES';
+    public const GROUP_ARTICLES = 'D3_DATAWIZARD_GROUP_ARTICLES';
-    const GROUP_USERS    = 'D3_DATAWIZARD_GROUP_USERS';
+    public const GROUP_USERS    = 'D3_DATAWIZARD_GROUP_USERS';
-    const GROUP_ORDERS   = 'D3_DATAWIZARD_GROUP_ORDERS';
+    public const GROUP_ORDERS   = 'D3_DATAWIZARD_GROUP_ORDERS';
-    const GROUP_REMARKS  = 'D3_DATAWIZARD_GROUP_REMARKS';
+    public const GROUP_REMARKS  = 'D3_DATAWIZARD_GROUP_REMARKS';
-    const GROUP_CMS      = 'D3_DATAWIZARD_GROUP_CMS';
+    public const GROUP_CMS      = 'D3_DATAWIZARD_GROUP_CMS';
 
     protected $actions = [];
     protected $exports = [];
@@ -113,7 +113,7 @@ class Configuration
     /**
      * @return array
      */
-    public function getAllActions() : array
+    public function getAllActions(): array
     {
         $all = [];
 
@@ -127,7 +127,7 @@ class Configuration
     /**
      * @return array
      */
-    public function getAllExports() : array
+    public function getAllExports(): array
     {
         $all = [];
 
@@ -143,7 +143,7 @@ class Configuration
      *
      * @return ActionBase
      */
-    public function getActionById($id) : ActionBase
+    public function getActionById($id): ActionBase
     {
         $allActions = $this->getAllActions();
 
@@ -159,7 +159,7 @@ class Configuration
      *
      * @return ExportBase
      */
-    public function getExportById($id) : ExportBase
+    public function getExportById($id): ExportBase
     {
         $allExports = $this->getAllExports();
 

Application/Model/Exceptions/DataWizardException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -19,4 +19,4 @@ use OxidEsales\Eshop\Core\Exception\StandardException;
 
 class DataWizardException extends StandardException
 {
-}
+}

Application/Model/Exceptions/DebugException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -20,13 +20,13 @@ use OxidEsales\Eshop\Core\Registry;
 
 class DebugException extends DataWizardException
 {
-    public function __construct($sMessage = "not set", $iCode = 0, Exception $previous = null )
+    public function __construct($sMessage = "not set", $iCode = 0, Exception $previous = null)
     {
         $sMessage = sprintf(
             Registry::getLang()->translateString('D3_DATAWIZARD_DEBUG'),
             $sMessage
         );
 
-        parent::__construct($sMessage, $iCode, $previous );
+        parent::__construct($sMessage, $iCode, $previous);
     }
-}
+}

Application/Model/Exceptions/ExportFileException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -20,13 +20,13 @@ use OxidEsales\Eshop\Core\Registry;
 
 class ExportFileException extends DataWizardException
 {
-    public function __construct($sMessage = "not set", $iCode = 0, Exception $previous = null )
+    public function __construct($sMessage = "not set", $iCode = 0, Exception $previous = null)
     {
         $sMessage = sprintf(
             Registry::getLang()->translateString('D3_DATAWIZARD_ERR_EXPORTFILEERROR'),
             $sMessage
         );
 
-        parent::__construct($sMessage, $iCode, $previous );
+        parent::__construct($sMessage, $iCode, $previous);
     }
-}
+}

Application/Model/Exceptions/InputUnvalidException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -32,7 +32,7 @@ class InputUnvalidException extends DataWizardException
      * @param Exception|null $previous
      * @throws Exception
      */
-    public function __construct( QueryBase $task, Input $inputElement, $iCode = 0, Exception $previous = null )
+    public function __construct(QueryBase $task, Input $inputElement, $iCode = 0, Exception $previous = null)
     {
         $messages = [];
         foreach ($inputElement->getError()->getIterator() as $item) {
@@ -43,11 +43,11 @@ class InputUnvalidException extends DataWizardException
             ' - ',
             [
                 $task->getTitle(),
-                implode(', ', $messages)
+                implode(', ', $messages),
             ]
         );
-        parent::__construct( $sMessage, $iCode, $previous );
+        parent::__construct($sMessage, $iCode, $previous);
 
         $this->task = $task;
     }
-}
+}

Application/Model/Exceptions/NoSuitableRendererException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -20,13 +20,13 @@ use OxidEsales\Eshop\Core\Registry;
 
 class NoSuitableRendererException extends DataWizardException
 {
-    public function __construct($sMessage = "not set", $iCode = 0, Exception $previous = null )
+    public function __construct($sMessage = "not set", $iCode = 0, Exception $previous = null)
     {
         $sMessage = sprintf(
             Registry::getLang()->translateString('D3_DATAWIZARD_ERR_NOSUITABLERENDERER'),
             $sMessage
         );
 
-        parent::__construct($sMessage, $iCode, $previous );
+        parent::__construct($sMessage, $iCode, $previous);
     }
-}
+}

Application/Model/Exceptions/RenderException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -17,4 +17,4 @@ namespace D3\DataWizard\Application\Model\Exceptions;
 
 class RenderException extends DataWizardException
 {
-}
+}

Application/Model/Exceptions/TaskException.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -23,17 +23,17 @@ class TaskException extends DataWizardException
     /** @var QueryBase */
     public $task;
 
-    public function __construct( QueryBase $task, $sMessage = "not set", $iCode = 0, Exception $previous = null )
+    public function __construct(QueryBase $task, $sMessage = "not set", $iCode = 0, Exception $previous = null)
     {
         $sMessage = implode(
             ' - ',
             [
                 $task->getTitle(),
-                $sMessage
+                $sMessage,
             ]
         );
-        parent::__construct( $sMessage, $iCode, $previous );
+        parent::__construct($sMessage, $iCode, $previous);
 
         $this->task = $task;
     }
-}
+}

Application/Model/ExportBase.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -40,11 +40,11 @@ abstract class ExportBase implements QueryBase
      * Ensure that the translations are equally available in the frontend and the backend
      * @return string
      */
-    public function getDescription() : string
+    public function getDescription(): string
     {
         return '';
     }
-    
+
     /**
      * @param string $format
      * @param $path
@@ -59,7 +59,7 @@ abstract class ExportBase implements QueryBase
      * @throws d3_cfg_mod_exception
      * @return string
      */
-    public function run( string $format = RendererBridge::FORMAT_CSV, $path = null): string
+    public function run(string $format = RendererBridge::FORMAT_CSV, $path = null): string
     {
         if ($this->hasFormElements()) {
             /** @var Input $element */
@@ -76,7 +76,7 @@ abstract class ExportBase implements QueryBase
     /**
      * @return string
      */
-    public function getButtonText() : string
+    public function getButtonText(): string
     {
         return "D3_DATAWIZARD_EXPORT_SUBMIT";
     }
@@ -128,7 +128,7 @@ abstract class ExportBase implements QueryBase
     /**
      * @return string
      */
-    public function getExportFilenameBase() : string
+    public function getExportFilenameBase(): string
     {
         return $this->getTitle();
     }
@@ -139,7 +139,7 @@ abstract class ExportBase implements QueryBase
      * @return string
      * @throws Exceptions\NoSuitableRendererException
      */
-    public function getExportFileName($format) : string
+    public function getExportFileName($format): string
     {
         return $this->getExportFilenameBase().'_'.date('Y-m-d_H-i-s').'.'.$this->getFileExtension($format);
     }
@@ -151,31 +151,31 @@ abstract class ExportBase implements QueryBase
      * @throws DatabaseConnectionException
      * @throws DatabaseErrorException
      */
-    public function getExportData( array $query ): array
+    public function getExportData(array $query): array
     {
         [ $queryString, $parameters ] = $query;
 
         $queryString = trim($queryString);
 
-        if ( strtolower( substr( $queryString, 0, 6 ) ) !== 'select' ) {
+        if (strtolower(substr($queryString, 0, 6)) !== 'select') {
             throw oxNew(
                 Exceptions\TaskException::class,
                 $this,
-                Registry::getLang()->translateString( 'D3_DATAWIZARD_ERR_NOEXPORTSELECT' )
+                Registry::getLang()->translateString('D3_DATAWIZARD_ERR_NOEXPORTSELECT')
             );
         }
 
-        $rows = $this->d3GetDb()->getAll( $queryString, $parameters );
+        $rows = $this->d3GetDb()->getAll($queryString, $parameters);
 
-        if ( count( $rows ) <= 0 ) {
+        if (count($rows) <= 0) {
             throw oxNew(
                 Exceptions\TaskException::class,
                 $this,
-                Registry::getLang()->translateString( 'D3_DATAWIZARD_ERR_NOEXPORTCONTENT', null, true )
+                Registry::getLang()->translateString('D3_DATAWIZARD_ERR_NOEXPORTCONTENT', null, true)
             );
         }
 
-        $fieldNames = array_keys( $rows[0] );
+        $fieldNames = array_keys($rows[0]);
 
         return [ $rows, $fieldNames ];
     }
@@ -225,7 +225,7 @@ abstract class ExportBase implements QueryBase
      */
     protected function executeExport(string $format, $path): string
     {
-        $content = $this->getContent( $format );
+        $content = $this->getContent($format);
 
         /** @var $oFS d3filesystem */
         $oFS = $this->getFileSystem();
@@ -267,12 +267,12 @@ abstract class ExportBase implements QueryBase
      * @throws DatabaseErrorException
      * @throws Exceptions\NoSuitableRendererException
      */
-    public function getContent( string $format ): string
+    public function getContent(string $format): string
     {
-        [ $rows, $fieldNames ] = $this->getExportData( $this->getQuery() );
+        [ $rows, $fieldNames ] = $this->getExportData($this->getQuery());
 
-        $content = $this->renderContent( $rows, $fieldNames, $format );
+        $content = $this->renderContent($rows, $fieldNames, $format);
 
         return $content;
     }
-}
+}

Application/Model/ExportRenderer/Csv.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -35,12 +35,12 @@ class Csv implements RendererInterface
     {
         try {
             $csv = $this->getCsv();
-            $csv->insertOne( $fieldNames );
+            $csv->insertOne($fieldNames);
-            $csv->insertAll( $rows );
+            $csv->insertAll($rows);
             return (string) $csv;
         } catch (Exception $e) {
             /** @var RenderException $newException */
-            $newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e );
+            $newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e);
             throw $newException;
         }
     }
@@ -90,4 +90,4 @@ class Csv implements RendererInterface
     {
         return Registry::getConfig();
     }
-}
+}

Application/Model/ExportRenderer/Json.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -31,11 +31,11 @@ class Json implements RendererInterface
     {
         try {
             $flags = JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR;
-            $json  = json_encode( $rows, $flags );
+            $json  = json_encode($rows, $flags);
             return $json;
-        } catch ( JsonException $e) {
+        } catch (JsonException $e) {
             /** @var RenderException $newException */
-            $newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e );
+            $newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e);
             throw $newException;
         }
     }
@@ -52,4 +52,4 @@ class Json implements RendererInterface
     {
         return "D3_DATAWIZARD_EXPORT_FORMAT_JSON";
     }
-}
+}

Application/Model/ExportRenderer/Pretty.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -25,7 +25,7 @@ class Pretty implements RendererInterface
      *
      * @return string
      */
-    public function getContent($rows, $fieldNames) : string
+    public function getContent($rows, $fieldNames): string
     {
         $renderer = $this->getArrayToTextTableInstance($rows);
         return $renderer->getTable();
@@ -55,4 +55,4 @@ class Pretty implements RendererInterface
     {
         return "D3_DATAWIZARD_EXPORT_FORMAT_PRETTY";
     }
-}
+}

Application/Model/ExportRenderer/RendererBridge.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -19,9 +19,9 @@ use D3\DataWizard\Application\Model\Exceptions\NoSuitableRendererException;
 
 class RendererBridge
 {
-    const FORMAT_CSV    = 'CSV';
+    public const FORMAT_CSV    = 'CSV';
-    const FORMAT_PRETTY = 'Pretty';
+    public const FORMAT_PRETTY = 'Pretty';
-    const FORMAT_JSON   = 'JSON';
+    public const FORMAT_JSON   = 'JSON';
 
     /**
      * @return array
@@ -31,7 +31,7 @@ class RendererBridge
         return [
             self::FORMAT_CSV    => oxNew(Csv::class),
             self::FORMAT_PRETTY => oxNew(Pretty::class),
-            self::FORMAT_JSON   => oxNew(Json::class)
+            self::FORMAT_JSON   => oxNew(Json::class),
         ];
     }
 
@@ -71,4 +71,4 @@ class RendererBridge
         $e = oxNew(NoSuitableRendererException::class, $format);
         throw $e;
     }
-}
+}

Application/Model/ExportRenderer/RendererInterface.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -23,15 +23,15 @@ interface RendererInterface
      *
      * @return string
      */
-    public function getContent($rows, $fieldNames) : string;
+    public function getContent($rows, $fieldNames): string;
 
     /**
      * @return string
      */
-    public function getFileExtension() : string;
+    public function getFileExtension(): string;
 
     /**
      * @return string
      */
-    public function getTitleTranslationId() : string;
+    public function getTitleTranslationId(): string;
-}
+}

Application/Model/QueryBase.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -25,23 +25,23 @@ interface QueryBase
      * Ensure that the translations are equally available in the frontend and the backend
      * @return string
      */
-    public function getTitle() : string;
+    public function getTitle(): string;
 
     /**
      * Ensure that the translations are equally available in the frontend and the backend
      * @return string
      */
-    public function getDescription() : string;
+    public function getDescription(): string;
 
     /**
      * @return string
      */
-    public function getButtonText() : string;
+    public function getButtonText(): string;
 
     /**
      * @return array [string $query, array $parameters]
      */
-    public function getQuery() : array;
+    public function getQuery(): array;
 
     /**
      * @param Input $input
@@ -57,4 +57,4 @@ interface QueryBase
      * @return array
      */
     public function getFormElements(): array;
-}
+}

Application/views/admin/de/d3DataWizard_lang.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -17,7 +17,7 @@ $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = array(
+$aLang = [
 
 //Navigation
     'charset'                                         => 'UTF-8',
@@ -55,4 +55,4 @@ $aLang = array(
     'D3_DATAWIZARD_ERR_NOACTION_INSTALLED'            => 'Es sind keine Aktionen installiert oder aktiviert.',
     'D3_DATAWIZARD_ERR_ACTIONRESULT'                  => '%1$s Eintrag verändert',
     'D3_DATAWIZARD_ERR_ACTIONRESULTS'                 => '%1$s Einträge verändert',
-);
+];

Application/views/admin/en/d3DataWizard_lang.php

@@ -3,7 +3,7 @@
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * https://www.d3data.de
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
@@ -17,7 +17,7 @@ $sLangName = "English";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = array(
+$aLang = [
 
 //Navigation
     'charset'                                         => 'UTF-8',
@@ -55,4 +55,4 @@ $aLang = array(
     'D3_DATAWIZARD_ERR_NOACTION_INSTALLED'            => 'No actions are installed or activated.',
     'D3_DATAWIZARD_ERR_ACTIONRESULT'                  => '%1$s entry changed',
     'D3_DATAWIZARD_ERR_ACTIONRESULTS'                 => '%1$s entries changed',
-);
+];

metadata.php

@@ -38,7 +38,7 @@ $aModule = [
     'url'         => 'https://www.oxidmodule.com/',
     'controllers' => [
         'd3ExportWizard'            => D3\DataWizard\Application\Controller\Admin\d3ExportWizard::class,
-        'd3ActionWizard'            => D3\DataWizard\Application\Controller\Admin\d3ActionWizard::class
+        'd3ActionWizard'            => D3\DataWizard\Application\Controller\Admin\d3ActionWizard::class,
     ],
     'extend'      => [],
     'events'      => [],
@@ -54,8 +54,8 @@ $aModule = [
             'group'     => $sModuleId.'_general',
             'name'      => $sModuleId.'_debug',
             'type'      => 'bool',
-            'value'     => false
+            'value'     => false,
-        ]
+        ],
     ],
-    'blocks'      => []
+    'blocks'      => [],
 ];

tests/additional.inc.php

@@ -12,6 +12,7 @@
  */
 
 // Include datawizard test config
+
 namespace D3\DataWizard\tests;
 
 use D3\ModCfg\Tests\additional_abstract;
@@ -36,4 +37,5 @@ class additional extends additional_abstract
 
 try {
     d3GetModCfgDIC()->get(additional::class);
-} catch (Exception $e) {}
+} catch (Exception $e) {
+}

tests/d3datawizard_config.php

@@ -12,4 +12,3 @@
  */
 
 const D3DATAWIZARD_REQUIRE_MODCFG = true;
-

tests/tools/d3TestAction.php

@@ -15,4 +15,4 @@ class d3TestAction extends ActionBase
     {
         return ["UPDATE 1"];
     }
-}
+}

tests/tools/d3TestExport.php

@@ -15,4 +15,4 @@ class d3TestExport extends ExportBase
     {
         return ["SELECT 1"];
     }
-}
+}

tests/unit/Application/Controller/Admin/d3ActionWizardTest.php

@@ -33,7 +33,7 @@ class d3ActionWizardTest extends d3AdminControllerTest
 
     protected $testClassName = d3ActionWizard::class;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -99,7 +99,7 @@ class d3ActionWizardTest extends d3AdminControllerTest
     {
         return [
             ['test1'],
-            ['test2']
+            ['test2'],
         ];
     }
 
@@ -144,7 +144,7 @@ class d3ActionWizardTest extends d3AdminControllerTest
         $actionMock = $this->getMockBuilder(d3TestAction::class)
             ->onlyMethods([
                 'getQuery',
-                'run'
+                'run',
             ])
             ->getMock();
         $actionMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
@@ -190,4 +190,4 @@ class d3ActionWizardTest extends d3AdminControllerTest
             'debug'  => [true],
         ];
     }
-}
+}

tests/unit/Application/Controller/Admin/d3AdminControllerTest.php

@@ -39,7 +39,7 @@ abstract class d3AdminControllerTest extends d3ModCfgUnitTestCase
 
     protected $testClassName;
 
-    public function tearDown() : void
+    public function tearDown(): void
     {
         parent::tearDown();
 
@@ -169,7 +169,7 @@ abstract class d3AdminControllerTest extends d3ModCfgUnitTestCase
         $actionMock = $this->getMockBuilder(d3TestAction::class)
             ->onlyMethods([
                 'getQuery',
-                'run'
+                'run',
             ])
             ->getMock();
         $actionMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
@@ -259,4 +259,4 @@ abstract class d3AdminControllerTest extends d3ModCfgUnitTestCase
             )
         );
     }
-}
+}

tests/unit/Application/Controller/Admin/d3ExportWizardTest.php

@@ -34,7 +34,7 @@ class d3ExportWizardTest extends d3AdminControllerTest
 
     protected $testClassName = d3ExportWizard::class;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -100,7 +100,7 @@ class d3ExportWizardTest extends d3AdminControllerTest
     {
         return [
             ['test1'],
-            ['test2']
+            ['test2'],
         ];
     }
 
@@ -146,7 +146,7 @@ class d3ExportWizardTest extends d3AdminControllerTest
         $exportMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
                 'getQuery',
-                'run'
+                'run',
             ])
             ->getMock();
         $exportMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
@@ -192,4 +192,4 @@ class d3ExportWizardTest extends d3AdminControllerTest
             'debug'  => [true],
         ];
     }
-}
+}

tests/unit/Application/Model/ActionBaseTest.php

@@ -31,14 +31,14 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
     /** @var d3TestAction */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->_oModel = oxNew(d3TestAction::class);
     }
 
-    public function tearDown() : void
+    public function tearDown(): void
     {
         parent::tearDown();
 
@@ -135,7 +135,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
         $inputMock = $this->getMockBuilder($inputClass)
             ->onlyMethods([
                 'setTemplate',
-                'setAttribute'
+                'setAttribute',
             ])
             ->getMock();
         $inputMock->expects($this->atLeastOnce())->method('setTemplate');
@@ -160,7 +160,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
         return [
             'Radio' => [Radio::class],
             'Checkbox' => [Radio::class],
-            'Hidden' => [Hidden::class]
+            'Hidden' => [Hidden::class],
         ];
     }
 
@@ -175,7 +175,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
             ->onlyMethods([
                 'hasFormElements',
                 'executeAction',
-                'getQuery'
+                'getQuery',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
@@ -204,7 +204,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
                 'hasFormElements',
                 'executeAction',
                 'getQuery',
-                'getFormElements'
+                'getFormElements',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
@@ -246,7 +246,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
 
         return [
             'validElements' => [[$validMock, $validMock], false],
-            'invalidElements' => [[$validMock, $invalidField], true]
+            'invalidElements' => [[$validMock, $invalidField], true],
         ];
     }
 
@@ -313,4 +313,4 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
             )
         );
     }
-}
+}

tests/unit/Application/Model/ConfigurationTest.php

@@ -28,14 +28,14 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
     /** @var Configuration */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->_oModel = oxNew(Configuration::class);
     }
 
-    public function tearDown() : void
+    public function tearDown(): void
     {
         parent::tearDown();
 
@@ -148,16 +148,16 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
      * @param $array
      * @return array|false
      */
-    public function array_flatten($array) {
+    public function array_flatten($array)
+    {
         if (!is_array($array)) {
             return false;
         }
-        $result = array();
+        $result = [];
         foreach ($array as $key => $value) {
             if (is_array($value)) {
                 $result = array_merge($result, $this->array_flatten($value));
-            }
+            } else {
-            else {
                 $result[$key] = $value;
             }
         }
@@ -321,7 +321,7 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
         $modelMock = $this->getMockBuilder(Configuration::class)
             ->onlyMethods([
                 'getActionGroups',
-                'getActionsByGroup'
+                'getActionsByGroup',
             ])
             ->getMock();
         $modelMock->expects($this->once())->method('getActionGroups')->willReturn(['123', '456']);
@@ -352,7 +352,7 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
         $modelMock = $this->getMockBuilder(Configuration::class)
             ->onlyMethods([
                 'getExportGroups',
-                'getExportsByGroup'
+                'getExportsByGroup',
             ])
             ->getMock();
         $modelMock->expects($this->once())->method('getExportGroups')->willReturn(['123', '456']);
@@ -452,4 +452,4 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
             'set id'  => ['456', false],
         ];
     }
-}
+}

tests/unit/Application/Model/Exceptions/DebugExceptionTest.php

@@ -35,7 +35,7 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
     {
         $code = '500';
 
-        $exception = oxNew( Exception::class);
+        $exception = oxNew(Exception::class);
 
         /** @var DebugException|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(DebugException::class)
@@ -74,5 +74,4 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
             )
         );
     }
-
+}
-}

tests/unit/Application/Model/Exceptions/ExportFileExceptionTest.php

@@ -35,7 +35,7 @@ class ExportFileExceptionTest extends d3ModCfgUnitTestCase
     {
         $code = '500';
 
-        $exception = oxNew( Exception::class);
+        $exception = oxNew(Exception::class);
 
         /** @var ExportFileException|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(ExportFileException::class)
@@ -74,5 +74,4 @@ class ExportFileExceptionTest extends d3ModCfgUnitTestCase
             )
         );
     }
-
+}
-}

tests/unit/Application/Model/Exceptions/InputUnvalidExceptionTest.php

@@ -38,7 +38,7 @@ class InputUnvalidExceptionTest extends d3ModCfgUnitTestCase
     {
         $code = '500';
 
-        $exception = oxNew( Exception::class);
+        $exception = oxNew(Exception::class);
 
         $invalidField = new Number(null, [
             'required' => true,
@@ -93,5 +93,4 @@ class InputUnvalidExceptionTest extends d3ModCfgUnitTestCase
             )
         );
     }
-
+}
-}

tests/unit/Application/Model/Exceptions/NoSuitableRendererExceptionTest.php

@@ -35,7 +35,7 @@ class NoSuitableRendererExceptionTest extends d3ModCfgUnitTestCase
     {
         $code = '500';
 
-        $exception = oxNew( Exception::class);
+        $exception = oxNew(Exception::class);
 
         /** @var NoSuitableRendererException|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(NoSuitableRendererException::class)
@@ -74,5 +74,4 @@ class NoSuitableRendererExceptionTest extends d3ModCfgUnitTestCase
             )
         );
     }
-
+}
-}

tests/unit/Application/Model/Exceptions/TaskExceptionTest.php

@@ -37,7 +37,7 @@ class TaskExceptionTest extends d3ModCfgUnitTestCase
     {
         $code = '500';
 
-        $exception = oxNew( Exception::class);
+        $exception = oxNew(Exception::class);
 
         /** @var ExportBase|MockObject $taskMock */
         $taskMock = $this->getMockBuilder(d3TestExport::class)
@@ -82,5 +82,4 @@ class TaskExceptionTest extends d3ModCfgUnitTestCase
             )
         );
     }
-
+}
-}

tests/unit/Application/Model/ExportBaseTest.php

@@ -36,14 +36,14 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
     /** @var d3TestExport */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
         $this->_oModel = oxNew(d3TestExport::class);
     }
 
-    public function tearDown() : void
+    public function tearDown(): void
     {
         parent::tearDown();
 
@@ -140,7 +140,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         $inputMock = $this->getMockBuilder($inputClass)
             ->onlyMethods([
                 'setTemplate',
-                'setAttribute'
+                'setAttribute',
             ])
             ->getMock();
         $inputMock->expects($this->atLeastOnce())->method('setTemplate');
@@ -165,7 +165,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         return [
             'Radio' => [Radio::class],
             'Checkbox' => [Radio::class],
-            'Hidden' => [Hidden::class]
+            'Hidden' => [Hidden::class],
         ];
     }
 
@@ -183,7 +183,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
                 'hasFormElements',
-                'executeExport'
+                'executeExport',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
@@ -214,7 +214,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
             ->onlyMethods([
                 'hasFormElements',
                 'executeExport',
-                'getFormElements'
+                'getFormElements',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
@@ -256,7 +256,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
 
         return [
             'validElements' => [[$validMock, $validMock], false],
-            'invalidElements' => [[$validMock, $invalidField], true]
+            'invalidElements' => [[$validMock, $invalidField], true],
         ];
     }
 
@@ -274,7 +274,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
                 'startDirectDownload',
                 'filterFilename',
                 'trailingslashit',
-                'createFile'
+                'createFile',
             ])
             ->getMock();
         $fsMock->expects($this->exactly((int) !isset($path)))->method('startDirectDownload')->willReturn(true);
@@ -287,7 +287,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
             ->onlyMethods([
                 'getContent',
                 'getFileSystem',
-                'getExportFileName'
+                'getExportFileName',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getContent')->willReturn('some content');
@@ -371,7 +371,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         /** @var d3TestExport|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
-                'getRendererBridge'
+                'getRendererBridge',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getRendererBridge')->willReturn($rendererBridgeMock);
@@ -425,7 +425,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         /** @var d3TestExport|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
-                'getRenderer'
+                'getRenderer',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getRenderer')->with($format)->willReturn($rendererMock);
@@ -463,7 +463,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         /** @var d3TestExport|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
-                'getRenderer'
+                'getRenderer',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getRenderer')->with($format)->willReturn($rendererMock);
@@ -490,7 +490,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         /** @var d3TestExport|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
-                'getTitle'
+                'getTitle',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getTitle')->willReturn('someTitle');
@@ -516,7 +516,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
                 'getExportFilenameBase',
-                'getFileExtension'
+                'getFileExtension',
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getExportFilenameBase')->willReturn('base');
@@ -551,7 +551,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         /** @var d3TestExport|MockObject $modelMock */
         $modelMock = $this->getMockBuilder(d3TestExport::class)
             ->onlyMethods([
-                'd3GetDb'
+                'd3GetDb',
             ])
             ->getMock();
         $modelMock->expects($this->exactly((int) !$throwsException))->method('d3GetDb')->willReturn($dbMock);
@@ -570,13 +570,13 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
                     [
                         [
                             'field1'    => 'content1',
-                            'field2'    => 'content2'
+                            'field2'    => 'content2',
-                        ]
+                        ],
                     ],
                     [
                         'field1',
-                        'field2'
+                        'field2',
-                    ]
+                    ],
                 ],
                 $result
             );
@@ -613,7 +613,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
         ->onlyMethods([
             'getQuery',
             'getExportData',
-            'renderContent'
+            'renderContent',
         ])
         ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['arg1', 'arg2']]);
@@ -631,4 +631,4 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
             )
         );
     }
-}
+}

tests/unit/Application/Model/ExportRenderer/CsvTest.php

@@ -29,7 +29,7 @@ class CsvTest extends ExportRendererTest
     /** @var Csv */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -49,7 +49,7 @@ class CsvTest extends ExportRendererTest
         $valueList = ['value1', 'value2'];
 
         /** @var Writer|MockObject $csvMock */
-        $csvMockBuilder = $this->getMockBuilder( Writer::class);
+        $csvMockBuilder = $this->getMockBuilder(Writer::class);
         $csvMockBuilder->disableOriginalConstructor();
         $onlyMethods = ['__toString', 'insertOne', 'insertAll'];
         $csvMockBuilder->onlyMethods($onlyMethods);
@@ -89,7 +89,7 @@ class CsvTest extends ExportRendererTest
     {
         return [
             'exception' => [true],
-            'no exception' => [false]
+            'no exception' => [false],
         ];
     }
 
@@ -174,4 +174,4 @@ class CsvTest extends ExportRendererTest
             )
         );
     }
-}
+}

tests/unit/Application/Model/ExportRenderer/ExportRendererTest.php

@@ -22,7 +22,7 @@ abstract class ExportRendererTest extends d3ModCfgUnitTestCase
     /** @var RendererInterface */
     protected $_oModel;
 
-    public function tearDown() : void
+    public function tearDown(): void
     {
         parent::tearDown();
 
@@ -63,4 +63,4 @@ abstract class ExportRendererTest extends d3ModCfgUnitTestCase
             )
         );
     }
-}
+}

tests/unit/Application/Model/ExportRenderer/JsonTest.php

@@ -24,7 +24,7 @@ class JsonTest extends ExportRendererTest
     /** @var Json */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -61,7 +61,7 @@ class JsonTest extends ExportRendererTest
     {
         return [
             'valid' => [['value1', 'value2'], false],
-            'invalid'   => [["text" => "\xB1\x31"], true]  // malformed UTF8 chars
+            'invalid'   => [["text" => "\xB1\x31"], true],  // malformed UTF8 chars
         ];
     }
-}
+}

tests/unit/Application/Model/ExportRenderer/PrettyTest.php

@@ -25,7 +25,7 @@ class PrettyTest extends ExportRendererTest
     /** @var Pretty */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -83,4 +83,4 @@ class PrettyTest extends ExportRendererTest
             )
         );
     }
-}
+}

tests/unit/Application/Model/ExportRenderer/RendererBridgeTest.php

@@ -30,7 +30,7 @@ class RendererBridgeTest extends d3ModCfgUnitTestCase
     /** @var RendererBridge */
     protected $_oModel;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -122,7 +122,7 @@ class RendererBridgeTest extends d3ModCfgUnitTestCase
             [
                 'CSV' => $this->getMockBuilder(Csv::class)->getMock(),
                 'Pretty' => $this->getMockBuilder(Pretty::class)->getMock(),
-                'JSON' => $this->getMockBuilder(Json::class)->getMock()
+                'JSON' => $this->getMockBuilder(Json::class)->getMock(),
             ]
         );
 
@@ -146,7 +146,7 @@ class RendererBridgeTest extends d3ModCfgUnitTestCase
     {
         return [
             'existing renderer'=> [RendererBridge::FORMAT_JSON, false],
-            'unknown renderer'=> ['unknownRenderer', true]
+            'unknown renderer'=> ['unknownRenderer', true],
         ];
     }
-}
+}