D3Public
/
DataWizard
8
0
Fork 0
Code Pull Requests Projects Releases Activity

add CS-fixed files

This commit is contained in:
Daniel Seifert 2022-01-17 10:59:18 +01:00
parent 51642b57c7
commit 0c0d564554
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
41 changed files with 190 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Application/Model/Configuration.php
View File

@ -19,13 +19,13 @@ use D3\DataWizard\Application\Model\Exceptions\DataWizardException;
class Configuration
{
const GROUP_SHOP = 'D3_DATAWIZARD_GROUP_SHOP';
const GROUP_CATEGORY = 'D3_DATAWIZARD_GROUP_CATEGORIES';
const GROUP_ARTICLES = 'D3_DATAWIZARD_GROUP_ARTICLES';
const GROUP_USERS = 'D3_DATAWIZARD_GROUP_USERS';
const GROUP_ORDERS = 'D3_DATAWIZARD_GROUP_ORDERS';
const GROUP_REMARKS = 'D3_DATAWIZARD_GROUP_REMARKS';
const GROUP_CMS = 'D3_DATAWIZARD_GROUP_CMS';
public const GROUP_SHOP = 'D3_DATAWIZARD_GROUP_SHOP';
public const GROUP_CATEGORY = 'D3_DATAWIZARD_GROUP_CATEGORIES';
public const GROUP_ARTICLES = 'D3_DATAWIZARD_GROUP_ARTICLES';
public const GROUP_USERS = 'D3_DATAWIZARD_GROUP_USERS';
public const GROUP_ORDERS = 'D3_DATAWIZARD_GROUP_ORDERS';
public const GROUP_REMARKS = 'D3_DATAWIZARD_GROUP_REMARKS';
public const GROUP_CMS = 'D3_DATAWIZARD_GROUP_CMS';
protected $actions = [];
protected $exports = [];

2
Application/Model/Exceptions/InputUnvalidException.php
View File

@ -43,7 +43,7 @@ class InputUnvalidException extends DataWizardException
' - ',
[
$task->getTitle(),
implode(', ', $messages)
implode(', ', $messages),
]
);
parent::__construct($sMessage, $iCode, $previous);

2
Application/Model/Exceptions/TaskException.php
View File

@ -29,7 +29,7 @@ class TaskException extends DataWizardException
' - ',
[
$task->getTitle(),
$sMessage
$sMessage,
]
);
parent::__construct($sMessage, $iCode, $previous);

8
Application/Model/ExportRenderer/RendererBridge.php
View File

@ -19,9 +19,9 @@ use D3\DataWizard\Application\Model\Exceptions\NoSuitableRendererException;
class RendererBridge
{
const FORMAT_CSV = 'CSV';
const FORMAT_PRETTY = 'Pretty';
const FORMAT_JSON = 'JSON';
public const FORMAT_CSV = 'CSV';
public const FORMAT_PRETTY = 'Pretty';
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),
];
}

4
Application/views/admin/de/d3DataWizard_lang.php
View File

@ -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',
);
];

4
Application/views/admin/en/d3DataWizard_lang.php
View File

@ -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',
);
];

8
metadata.php
View File

@ -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' => [],
];

4
tests/additional.inc.php
View File

@ -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) {
}

1
tests/d3datawizard_config.php
View File

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

4
tests/unit/Application/Controller/Admin/d3ActionWizardTest.php
View File

@ -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']]);

2
tests/unit/Application/Controller/Admin/d3AdminControllerTest.php
View File

@ -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']]);

4
tests/unit/Application/Controller/Admin/d3ExportWizardTest.php
View File

@ -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']]);

10
tests/unit/Application/Model/ActionBaseTest.php
View File

@ -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],
];
}

12
tests/unit/Application/Model/ConfigurationTest.php
View File

@ -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']);

1
tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
View File

@ -74,5 +74,4 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
)
);
}
}

1
tests/unit/Application/Model/Exceptions/ExportFileExceptionTest.php
View File

@ -74,5 +74,4 @@ class ExportFileExceptionTest extends d3ModCfgUnitTestCase
)
);
}
}

1
tests/unit/Application/Model/Exceptions/InputUnvalidExceptionTest.php
View File

@ -93,5 +93,4 @@ class InputUnvalidExceptionTest extends d3ModCfgUnitTestCase
)
);
}
}

1
tests/unit/Application/Model/Exceptions/NoSuitableRendererExceptionTest.php
View File

@ -74,5 +74,4 @@ class NoSuitableRendererExceptionTest extends d3ModCfgUnitTestCase
)
);
}
}

1
tests/unit/Application/Model/Exceptions/TaskExceptionTest.php
View File

@ -82,5 +82,4 @@ class TaskExceptionTest extends d3ModCfgUnitTestCase
)
);
}
}

36
tests/unit/Application/Model/ExportBaseTest.php
View File

@ -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']]);

2
tests/unit/Application/Model/ExportRenderer/CsvTest.php
View File

@ -89,7 +89,7 @@ class CsvTest extends ExportRendererTest
{
return [
'exception' => [true],
'no exception' => [false]
'no exception' => [false],
];
}

2
tests/unit/Application/Model/ExportRenderer/JsonTest.php
View File

@ -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
];
}
}

4
tests/unit/Application/Model/ExportRenderer/RendererBridgeTest.php
View File

@ -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],
];
}
}