add CS-fixed files
This commit is contained in:
parent
51642b57c7
commit
0c0d564554
@ -33,7 +33,7 @@ abstract class ActionBase implements QueryBase
|
|||||||
* Ensure that the translations are equally available in the frontend and the backend
|
* Ensure that the translations are equally available in the frontend and the backend
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getDescription() : string
|
public function getDescription(): string
|
||||||
{
|
{
|
||||||
return '';
|
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 DatabaseConnectionException
|
||||||
* @throws DatabaseErrorException
|
* @throws DatabaseErrorException
|
||||||
*/
|
*/
|
||||||
public function executeAction( array $query ): int
|
public function executeAction(array $query): int
|
||||||
{
|
{
|
||||||
[ $queryString, $parameters ] = $query;
|
[ $queryString, $parameters ] = $query;
|
||||||
|
|
||||||
$queryString = trim($queryString);
|
$queryString = trim($queryString);
|
||||||
|
|
||||||
if ( strtolower( substr( $queryString, 0, 6 ) ) === 'select' ) {
|
if (strtolower(substr($queryString, 0, 6)) === 'select') {
|
||||||
throw oxNew(
|
throw oxNew(
|
||||||
Exceptions\TaskException::class,
|
Exceptions\TaskException::class,
|
||||||
$this,
|
$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(
|
throw oxNew(
|
||||||
Exceptions\TaskException::class,
|
Exceptions\TaskException::class,
|
||||||
@ -97,13 +97,13 @@ abstract class ActionBase implements QueryBase
|
|||||||
*/
|
*/
|
||||||
public function d3GetDb(): ?DatabaseInterface
|
public function d3GetDb(): ?DatabaseInterface
|
||||||
{
|
{
|
||||||
return DatabaseProvider::getDb( DatabaseProvider::FETCH_MODE_ASSOC );
|
return DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getButtonText() : string
|
public function getButtonText(): string
|
||||||
{
|
{
|
||||||
return "D3_DATAWIZARD_ACTION_SUBMIT";
|
return "D3_DATAWIZARD_ACTION_SUBMIT";
|
||||||
}
|
}
|
||||||
|
@ -19,13 +19,13 @@ use D3\DataWizard\Application\Model\Exceptions\DataWizardException;
|
|||||||
|
|
||||||
class Configuration
|
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 $actions = [];
|
||||||
protected $exports = [];
|
protected $exports = [];
|
||||||
@ -113,7 +113,7 @@ class Configuration
|
|||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getAllActions() : array
|
public function getAllActions(): array
|
||||||
{
|
{
|
||||||
$all = [];
|
$all = [];
|
||||||
|
|
||||||
@ -127,7 +127,7 @@ class Configuration
|
|||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getAllExports() : array
|
public function getAllExports(): array
|
||||||
{
|
{
|
||||||
$all = [];
|
$all = [];
|
||||||
|
|
||||||
@ -143,7 +143,7 @@ class Configuration
|
|||||||
*
|
*
|
||||||
* @return ActionBase
|
* @return ActionBase
|
||||||
*/
|
*/
|
||||||
public function getActionById($id) : ActionBase
|
public function getActionById($id): ActionBase
|
||||||
{
|
{
|
||||||
$allActions = $this->getAllActions();
|
$allActions = $this->getAllActions();
|
||||||
|
|
||||||
@ -159,7 +159,7 @@ class Configuration
|
|||||||
*
|
*
|
||||||
* @return ExportBase
|
* @return ExportBase
|
||||||
*/
|
*/
|
||||||
public function getExportById($id) : ExportBase
|
public function getExportById($id): ExportBase
|
||||||
{
|
{
|
||||||
$allExports = $this->getAllExports();
|
$allExports = $this->getAllExports();
|
||||||
|
|
||||||
|
@ -20,13 +20,13 @@ use OxidEsales\Eshop\Core\Registry;
|
|||||||
|
|
||||||
class DebugException extends DataWizardException
|
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(
|
$sMessage = sprintf(
|
||||||
Registry::getLang()->translateString('D3_DATAWIZARD_DEBUG'),
|
Registry::getLang()->translateString('D3_DATAWIZARD_DEBUG'),
|
||||||
$sMessage
|
$sMessage
|
||||||
);
|
);
|
||||||
|
|
||||||
parent::__construct($sMessage, $iCode, $previous );
|
parent::__construct($sMessage, $iCode, $previous);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -20,13 +20,13 @@ use OxidEsales\Eshop\Core\Registry;
|
|||||||
|
|
||||||
class ExportFileException extends DataWizardException
|
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(
|
$sMessage = sprintf(
|
||||||
Registry::getLang()->translateString('D3_DATAWIZARD_ERR_EXPORTFILEERROR'),
|
Registry::getLang()->translateString('D3_DATAWIZARD_ERR_EXPORTFILEERROR'),
|
||||||
$sMessage
|
$sMessage
|
||||||
);
|
);
|
||||||
|
|
||||||
parent::__construct($sMessage, $iCode, $previous );
|
parent::__construct($sMessage, $iCode, $previous);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -32,7 +32,7 @@ class InputUnvalidException extends DataWizardException
|
|||||||
* @param Exception|null $previous
|
* @param Exception|null $previous
|
||||||
* @throws Exception
|
* @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 = [];
|
$messages = [];
|
||||||
foreach ($inputElement->getError()->getIterator() as $item) {
|
foreach ($inputElement->getError()->getIterator() as $item) {
|
||||||
@ -43,10 +43,10 @@ class InputUnvalidException extends DataWizardException
|
|||||||
' - ',
|
' - ',
|
||||||
[
|
[
|
||||||
$task->getTitle(),
|
$task->getTitle(),
|
||||||
implode(', ', $messages)
|
implode(', ', $messages),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
parent::__construct( $sMessage, $iCode, $previous );
|
parent::__construct($sMessage, $iCode, $previous);
|
||||||
|
|
||||||
$this->task = $task;
|
$this->task = $task;
|
||||||
}
|
}
|
||||||
|
@ -20,13 +20,13 @@ use OxidEsales\Eshop\Core\Registry;
|
|||||||
|
|
||||||
class NoSuitableRendererException extends DataWizardException
|
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(
|
$sMessage = sprintf(
|
||||||
Registry::getLang()->translateString('D3_DATAWIZARD_ERR_NOSUITABLERENDERER'),
|
Registry::getLang()->translateString('D3_DATAWIZARD_ERR_NOSUITABLERENDERER'),
|
||||||
$sMessage
|
$sMessage
|
||||||
);
|
);
|
||||||
|
|
||||||
parent::__construct($sMessage, $iCode, $previous );
|
parent::__construct($sMessage, $iCode, $previous);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -23,16 +23,16 @@ class TaskException extends DataWizardException
|
|||||||
/** @var QueryBase */
|
/** @var QueryBase */
|
||||||
public $task;
|
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(
|
$sMessage = implode(
|
||||||
' - ',
|
' - ',
|
||||||
[
|
[
|
||||||
$task->getTitle(),
|
$task->getTitle(),
|
||||||
$sMessage
|
$sMessage,
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
parent::__construct( $sMessage, $iCode, $previous );
|
parent::__construct($sMessage, $iCode, $previous);
|
||||||
|
|
||||||
$this->task = $task;
|
$this->task = $task;
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ abstract class ExportBase implements QueryBase
|
|||||||
* Ensure that the translations are equally available in the frontend and the backend
|
* Ensure that the translations are equally available in the frontend and the backend
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getDescription() : string
|
public function getDescription(): string
|
||||||
{
|
{
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@ -59,7 +59,7 @@ abstract class ExportBase implements QueryBase
|
|||||||
* @throws d3_cfg_mod_exception
|
* @throws d3_cfg_mod_exception
|
||||||
* @return string
|
* @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()) {
|
if ($this->hasFormElements()) {
|
||||||
/** @var Input $element */
|
/** @var Input $element */
|
||||||
@ -76,7 +76,7 @@ abstract class ExportBase implements QueryBase
|
|||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getButtonText() : string
|
public function getButtonText(): string
|
||||||
{
|
{
|
||||||
return "D3_DATAWIZARD_EXPORT_SUBMIT";
|
return "D3_DATAWIZARD_EXPORT_SUBMIT";
|
||||||
}
|
}
|
||||||
@ -128,7 +128,7 @@ abstract class ExportBase implements QueryBase
|
|||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getExportFilenameBase() : string
|
public function getExportFilenameBase(): string
|
||||||
{
|
{
|
||||||
return $this->getTitle();
|
return $this->getTitle();
|
||||||
}
|
}
|
||||||
@ -139,7 +139,7 @@ abstract class ExportBase implements QueryBase
|
|||||||
* @return string
|
* @return string
|
||||||
* @throws Exceptions\NoSuitableRendererException
|
* @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);
|
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 DatabaseConnectionException
|
||||||
* @throws DatabaseErrorException
|
* @throws DatabaseErrorException
|
||||||
*/
|
*/
|
||||||
public function getExportData( array $query ): array
|
public function getExportData(array $query): array
|
||||||
{
|
{
|
||||||
[ $queryString, $parameters ] = $query;
|
[ $queryString, $parameters ] = $query;
|
||||||
|
|
||||||
$queryString = trim($queryString);
|
$queryString = trim($queryString);
|
||||||
|
|
||||||
if ( strtolower( substr( $queryString, 0, 6 ) ) !== 'select' ) {
|
if (strtolower(substr($queryString, 0, 6)) !== 'select') {
|
||||||
throw oxNew(
|
throw oxNew(
|
||||||
Exceptions\TaskException::class,
|
Exceptions\TaskException::class,
|
||||||
$this,
|
$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(
|
throw oxNew(
|
||||||
Exceptions\TaskException::class,
|
Exceptions\TaskException::class,
|
||||||
$this,
|
$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 ];
|
return [ $rows, $fieldNames ];
|
||||||
}
|
}
|
||||||
@ -225,7 +225,7 @@ abstract class ExportBase implements QueryBase
|
|||||||
*/
|
*/
|
||||||
protected function executeExport(string $format, $path): string
|
protected function executeExport(string $format, $path): string
|
||||||
{
|
{
|
||||||
$content = $this->getContent( $format );
|
$content = $this->getContent($format);
|
||||||
|
|
||||||
/** @var $oFS d3filesystem */
|
/** @var $oFS d3filesystem */
|
||||||
$oFS = $this->getFileSystem();
|
$oFS = $this->getFileSystem();
|
||||||
@ -267,11 +267,11 @@ abstract class ExportBase implements QueryBase
|
|||||||
* @throws DatabaseErrorException
|
* @throws DatabaseErrorException
|
||||||
* @throws Exceptions\NoSuitableRendererException
|
* @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;
|
return $content;
|
||||||
}
|
}
|
||||||
|
@ -35,12 +35,12 @@ class Csv implements RendererInterface
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$csv = $this->getCsv();
|
$csv = $this->getCsv();
|
||||||
$csv->insertOne( $fieldNames );
|
$csv->insertOne($fieldNames);
|
||||||
$csv->insertAll( $rows );
|
$csv->insertAll($rows);
|
||||||
return (string) $csv;
|
return (string) $csv;
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
/** @var RenderException $newException */
|
/** @var RenderException $newException */
|
||||||
$newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e );
|
$newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e);
|
||||||
throw $newException;
|
throw $newException;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,11 +31,11 @@ class Json implements RendererInterface
|
|||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
$flags = JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR;
|
$flags = JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR;
|
||||||
$json = json_encode( $rows, $flags );
|
$json = json_encode($rows, $flags);
|
||||||
return $json;
|
return $json;
|
||||||
} catch ( JsonException $e) {
|
} catch (JsonException $e) {
|
||||||
/** @var RenderException $newException */
|
/** @var RenderException $newException */
|
||||||
$newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e );
|
$newException = oxNew(RenderException::class, $e->getMessage(), $e->getCode(), $e);
|
||||||
throw $newException;
|
throw $newException;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ class Pretty implements RendererInterface
|
|||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getContent($rows, $fieldNames) : string
|
public function getContent($rows, $fieldNames): string
|
||||||
{
|
{
|
||||||
$renderer = $this->getArrayToTextTableInstance($rows);
|
$renderer = $this->getArrayToTextTableInstance($rows);
|
||||||
return $renderer->getTable();
|
return $renderer->getTable();
|
||||||
|
@ -19,9 +19,9 @@ use D3\DataWizard\Application\Model\Exceptions\NoSuitableRendererException;
|
|||||||
|
|
||||||
class RendererBridge
|
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
|
* @return array
|
||||||
@ -31,7 +31,7 @@ class RendererBridge
|
|||||||
return [
|
return [
|
||||||
self::FORMAT_CSV => oxNew(Csv::class),
|
self::FORMAT_CSV => oxNew(Csv::class),
|
||||||
self::FORMAT_PRETTY => oxNew(Pretty::class),
|
self::FORMAT_PRETTY => oxNew(Pretty::class),
|
||||||
self::FORMAT_JSON => oxNew(Json::class)
|
self::FORMAT_JSON => oxNew(Json::class),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,15 +23,15 @@ interface RendererInterface
|
|||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getContent($rows, $fieldNames) : string;
|
public function getContent($rows, $fieldNames): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getFileExtension() : string;
|
public function getFileExtension(): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getTitleTranslationId() : string;
|
public function getTitleTranslationId(): string;
|
||||||
}
|
}
|
@ -25,23 +25,23 @@ interface QueryBase
|
|||||||
* Ensure that the translations are equally available in the frontend and the backend
|
* Ensure that the translations are equally available in the frontend and the backend
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getTitle() : string;
|
public function getTitle(): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensure that the translations are equally available in the frontend and the backend
|
* Ensure that the translations are equally available in the frontend and the backend
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getDescription() : string;
|
public function getDescription(): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public function getButtonText() : string;
|
public function getButtonText(): string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array [string $query, array $parameters]
|
* @return array [string $query, array $parameters]
|
||||||
*/
|
*/
|
||||||
public function getQuery() : array;
|
public function getQuery(): array;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Input $input
|
* @param Input $input
|
||||||
|
@ -17,7 +17,7 @@ $sLangName = "Deutsch";
|
|||||||
// -------------------------------
|
// -------------------------------
|
||||||
// RESOURCE IDENTITFIER = STRING
|
// RESOURCE IDENTITFIER = STRING
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
$aLang = array(
|
$aLang = [
|
||||||
|
|
||||||
//Navigation
|
//Navigation
|
||||||
'charset' => 'UTF-8',
|
'charset' => 'UTF-8',
|
||||||
@ -55,4 +55,4 @@ $aLang = array(
|
|||||||
'D3_DATAWIZARD_ERR_NOACTION_INSTALLED' => 'Es sind keine Aktionen installiert oder aktiviert.',
|
'D3_DATAWIZARD_ERR_NOACTION_INSTALLED' => 'Es sind keine Aktionen installiert oder aktiviert.',
|
||||||
'D3_DATAWIZARD_ERR_ACTIONRESULT' => '%1$s Eintrag verändert',
|
'D3_DATAWIZARD_ERR_ACTIONRESULT' => '%1$s Eintrag verändert',
|
||||||
'D3_DATAWIZARD_ERR_ACTIONRESULTS' => '%1$s Einträge verändert',
|
'D3_DATAWIZARD_ERR_ACTIONRESULTS' => '%1$s Einträge verändert',
|
||||||
);
|
];
|
||||||
|
@ -17,7 +17,7 @@ $sLangName = "English";
|
|||||||
// -------------------------------
|
// -------------------------------
|
||||||
// RESOURCE IDENTITFIER = STRING
|
// RESOURCE IDENTITFIER = STRING
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
$aLang = array(
|
$aLang = [
|
||||||
|
|
||||||
//Navigation
|
//Navigation
|
||||||
'charset' => 'UTF-8',
|
'charset' => 'UTF-8',
|
||||||
@ -55,4 +55,4 @@ $aLang = array(
|
|||||||
'D3_DATAWIZARD_ERR_NOACTION_INSTALLED' => 'No actions are installed or activated.',
|
'D3_DATAWIZARD_ERR_NOACTION_INSTALLED' => 'No actions are installed or activated.',
|
||||||
'D3_DATAWIZARD_ERR_ACTIONRESULT' => '%1$s entry changed',
|
'D3_DATAWIZARD_ERR_ACTIONRESULT' => '%1$s entry changed',
|
||||||
'D3_DATAWIZARD_ERR_ACTIONRESULTS' => '%1$s entries changed',
|
'D3_DATAWIZARD_ERR_ACTIONRESULTS' => '%1$s entries changed',
|
||||||
);
|
];
|
||||||
|
@ -38,7 +38,7 @@ $aModule = [
|
|||||||
'url' => 'https://www.oxidmodule.com/',
|
'url' => 'https://www.oxidmodule.com/',
|
||||||
'controllers' => [
|
'controllers' => [
|
||||||
'd3ExportWizard' => D3\DataWizard\Application\Controller\Admin\d3ExportWizard::class,
|
'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' => [],
|
'extend' => [],
|
||||||
'events' => [],
|
'events' => [],
|
||||||
@ -54,8 +54,8 @@ $aModule = [
|
|||||||
'group' => $sModuleId.'_general',
|
'group' => $sModuleId.'_general',
|
||||||
'name' => $sModuleId.'_debug',
|
'name' => $sModuleId.'_debug',
|
||||||
'type' => 'bool',
|
'type' => 'bool',
|
||||||
'value' => false
|
'value' => false,
|
||||||
]
|
],
|
||||||
],
|
],
|
||||||
'blocks' => []
|
'blocks' => [],
|
||||||
];
|
];
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Include datawizard test config
|
// Include datawizard test config
|
||||||
|
|
||||||
namespace D3\DataWizard\tests;
|
namespace D3\DataWizard\tests;
|
||||||
|
|
||||||
use D3\ModCfg\Tests\additional_abstract;
|
use D3\ModCfg\Tests\additional_abstract;
|
||||||
@ -36,4 +37,5 @@ class additional extends additional_abstract
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
d3GetModCfgDIC()->get(additional::class);
|
d3GetModCfgDIC()->get(additional::class);
|
||||||
} catch (Exception $e) {}
|
} catch (Exception $e) {
|
||||||
|
}
|
||||||
|
@ -12,4 +12,3 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
const D3DATAWIZARD_REQUIRE_MODCFG = true;
|
const D3DATAWIZARD_REQUIRE_MODCFG = true;
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ class d3ActionWizardTest extends d3AdminControllerTest
|
|||||||
|
|
||||||
protected $testClassName = d3ActionWizard::class;
|
protected $testClassName = d3ActionWizard::class;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ class d3ActionWizardTest extends d3AdminControllerTest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['test1'],
|
['test1'],
|
||||||
['test2']
|
['test2'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -144,7 +144,7 @@ class d3ActionWizardTest extends d3AdminControllerTest
|
|||||||
$actionMock = $this->getMockBuilder(d3TestAction::class)
|
$actionMock = $this->getMockBuilder(d3TestAction::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getQuery',
|
'getQuery',
|
||||||
'run'
|
'run',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$actionMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
|
$actionMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
|
||||||
|
@ -39,7 +39,7 @@ abstract class d3AdminControllerTest extends d3ModCfgUnitTestCase
|
|||||||
|
|
||||||
protected $testClassName;
|
protected $testClassName;
|
||||||
|
|
||||||
public function tearDown() : void
|
public function tearDown(): void
|
||||||
{
|
{
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
|
||||||
@ -169,7 +169,7 @@ abstract class d3AdminControllerTest extends d3ModCfgUnitTestCase
|
|||||||
$actionMock = $this->getMockBuilder(d3TestAction::class)
|
$actionMock = $this->getMockBuilder(d3TestAction::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getQuery',
|
'getQuery',
|
||||||
'run'
|
'run',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$actionMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
|
$actionMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
|
||||||
|
@ -34,7 +34,7 @@ class d3ExportWizardTest extends d3AdminControllerTest
|
|||||||
|
|
||||||
protected $testClassName = d3ExportWizard::class;
|
protected $testClassName = d3ExportWizard::class;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -100,7 +100,7 @@ class d3ExportWizardTest extends d3AdminControllerTest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
['test1'],
|
['test1'],
|
||||||
['test2']
|
['test2'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +146,7 @@ class d3ExportWizardTest extends d3AdminControllerTest
|
|||||||
$exportMock = $this->getMockBuilder(d3TestExport::class)
|
$exportMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getQuery',
|
'getQuery',
|
||||||
'run'
|
'run',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$exportMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
|
$exportMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['1']]);
|
||||||
|
@ -31,14 +31,14 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestAction */
|
/** @var d3TestAction */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->_oModel = oxNew(d3TestAction::class);
|
$this->_oModel = oxNew(d3TestAction::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tearDown() : void
|
public function tearDown(): void
|
||||||
{
|
{
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
|
|||||||
$inputMock = $this->getMockBuilder($inputClass)
|
$inputMock = $this->getMockBuilder($inputClass)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'setTemplate',
|
'setTemplate',
|
||||||
'setAttribute'
|
'setAttribute',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$inputMock->expects($this->atLeastOnce())->method('setTemplate');
|
$inputMock->expects($this->atLeastOnce())->method('setTemplate');
|
||||||
@ -160,7 +160,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
|
|||||||
return [
|
return [
|
||||||
'Radio' => [Radio::class],
|
'Radio' => [Radio::class],
|
||||||
'Checkbox' => [Radio::class],
|
'Checkbox' => [Radio::class],
|
||||||
'Hidden' => [Hidden::class]
|
'Hidden' => [Hidden::class],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,7 +175,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
|
|||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'hasFormElements',
|
'hasFormElements',
|
||||||
'executeAction',
|
'executeAction',
|
||||||
'getQuery'
|
'getQuery',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
|
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
|
||||||
@ -204,7 +204,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
|
|||||||
'hasFormElements',
|
'hasFormElements',
|
||||||
'executeAction',
|
'executeAction',
|
||||||
'getQuery',
|
'getQuery',
|
||||||
'getFormElements'
|
'getFormElements',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
|
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
|
||||||
@ -246,7 +246,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'validElements' => [[$validMock, $validMock], false],
|
'validElements' => [[$validMock, $validMock], false],
|
||||||
'invalidElements' => [[$validMock, $invalidField], true]
|
'invalidElements' => [[$validMock, $invalidField], true],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,14 +28,14 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var Configuration */
|
/** @var Configuration */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->_oModel = oxNew(Configuration::class);
|
$this->_oModel = oxNew(Configuration::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tearDown() : void
|
public function tearDown(): void
|
||||||
{
|
{
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
|
||||||
@ -148,16 +148,16 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
|
|||||||
* @param $array
|
* @param $array
|
||||||
* @return array|false
|
* @return array|false
|
||||||
*/
|
*/
|
||||||
public function array_flatten($array) {
|
public function array_flatten($array)
|
||||||
|
{
|
||||||
if (!is_array($array)) {
|
if (!is_array($array)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$result = array();
|
$result = [];
|
||||||
foreach ($array as $key => $value) {
|
foreach ($array as $key => $value) {
|
||||||
if (is_array($value)) {
|
if (is_array($value)) {
|
||||||
$result = array_merge($result, $this->array_flatten($value));
|
$result = array_merge($result, $this->array_flatten($value));
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$result[$key] = $value;
|
$result[$key] = $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -321,7 +321,7 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
|
|||||||
$modelMock = $this->getMockBuilder(Configuration::class)
|
$modelMock = $this->getMockBuilder(Configuration::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getActionGroups',
|
'getActionGroups',
|
||||||
'getActionsByGroup'
|
'getActionsByGroup',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->once())->method('getActionGroups')->willReturn(['123', '456']);
|
$modelMock->expects($this->once())->method('getActionGroups')->willReturn(['123', '456']);
|
||||||
@ -352,7 +352,7 @@ class ConfigurationTest extends d3ModCfgUnitTestCase
|
|||||||
$modelMock = $this->getMockBuilder(Configuration::class)
|
$modelMock = $this->getMockBuilder(Configuration::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getExportGroups',
|
'getExportGroups',
|
||||||
'getExportsByGroup'
|
'getExportsByGroup',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->once())->method('getExportGroups')->willReturn(['123', '456']);
|
$modelMock->expects($this->once())->method('getExportGroups')->willReturn(['123', '456']);
|
||||||
|
@ -35,7 +35,7 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
{
|
{
|
||||||
$code = '500';
|
$code = '500';
|
||||||
|
|
||||||
$exception = oxNew( Exception::class);
|
$exception = oxNew(Exception::class);
|
||||||
|
|
||||||
/** @var DebugException|MockObject $modelMock */
|
/** @var DebugException|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(DebugException::class)
|
$modelMock = $this->getMockBuilder(DebugException::class)
|
||||||
@ -74,5 +74,4 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -35,7 +35,7 @@ class ExportFileExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
{
|
{
|
||||||
$code = '500';
|
$code = '500';
|
||||||
|
|
||||||
$exception = oxNew( Exception::class);
|
$exception = oxNew(Exception::class);
|
||||||
|
|
||||||
/** @var ExportFileException|MockObject $modelMock */
|
/** @var ExportFileException|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(ExportFileException::class)
|
$modelMock = $this->getMockBuilder(ExportFileException::class)
|
||||||
@ -74,5 +74,4 @@ class ExportFileExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -38,7 +38,7 @@ class InputUnvalidExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
{
|
{
|
||||||
$code = '500';
|
$code = '500';
|
||||||
|
|
||||||
$exception = oxNew( Exception::class);
|
$exception = oxNew(Exception::class);
|
||||||
|
|
||||||
$invalidField = new Number(null, [
|
$invalidField = new Number(null, [
|
||||||
'required' => true,
|
'required' => true,
|
||||||
@ -93,5 +93,4 @@ class InputUnvalidExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -35,7 +35,7 @@ class NoSuitableRendererExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
{
|
{
|
||||||
$code = '500';
|
$code = '500';
|
||||||
|
|
||||||
$exception = oxNew( Exception::class);
|
$exception = oxNew(Exception::class);
|
||||||
|
|
||||||
/** @var NoSuitableRendererException|MockObject $modelMock */
|
/** @var NoSuitableRendererException|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(NoSuitableRendererException::class)
|
$modelMock = $this->getMockBuilder(NoSuitableRendererException::class)
|
||||||
@ -74,5 +74,4 @@ class NoSuitableRendererExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -37,7 +37,7 @@ class TaskExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
{
|
{
|
||||||
$code = '500';
|
$code = '500';
|
||||||
|
|
||||||
$exception = oxNew( Exception::class);
|
$exception = oxNew(Exception::class);
|
||||||
|
|
||||||
/** @var ExportBase|MockObject $taskMock */
|
/** @var ExportBase|MockObject $taskMock */
|
||||||
$taskMock = $this->getMockBuilder(d3TestExport::class)
|
$taskMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
@ -82,5 +82,4 @@ class TaskExceptionTest extends d3ModCfgUnitTestCase
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -36,14 +36,14 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestExport */
|
/** @var d3TestExport */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->_oModel = oxNew(d3TestExport::class);
|
$this->_oModel = oxNew(d3TestExport::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tearDown() : void
|
public function tearDown(): void
|
||||||
{
|
{
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
|
||||||
@ -140,7 +140,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
$inputMock = $this->getMockBuilder($inputClass)
|
$inputMock = $this->getMockBuilder($inputClass)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'setTemplate',
|
'setTemplate',
|
||||||
'setAttribute'
|
'setAttribute',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$inputMock->expects($this->atLeastOnce())->method('setTemplate');
|
$inputMock->expects($this->atLeastOnce())->method('setTemplate');
|
||||||
@ -165,7 +165,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
return [
|
return [
|
||||||
'Radio' => [Radio::class],
|
'Radio' => [Radio::class],
|
||||||
'Checkbox' => [Radio::class],
|
'Checkbox' => [Radio::class],
|
||||||
'Hidden' => [Hidden::class]
|
'Hidden' => [Hidden::class],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,7 +183,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'hasFormElements',
|
'hasFormElements',
|
||||||
'executeExport'
|
'executeExport',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
|
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
|
||||||
@ -214,7 +214,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'hasFormElements',
|
'hasFormElements',
|
||||||
'executeExport',
|
'executeExport',
|
||||||
'getFormElements'
|
'getFormElements',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
|
$modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
|
||||||
@ -256,7 +256,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'validElements' => [[$validMock, $validMock], false],
|
'validElements' => [[$validMock, $validMock], false],
|
||||||
'invalidElements' => [[$validMock, $invalidField], true]
|
'invalidElements' => [[$validMock, $invalidField], true],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -274,7 +274,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
'startDirectDownload',
|
'startDirectDownload',
|
||||||
'filterFilename',
|
'filterFilename',
|
||||||
'trailingslashit',
|
'trailingslashit',
|
||||||
'createFile'
|
'createFile',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$fsMock->expects($this->exactly((int) !isset($path)))->method('startDirectDownload')->willReturn(true);
|
$fsMock->expects($this->exactly((int) !isset($path)))->method('startDirectDownload')->willReturn(true);
|
||||||
@ -287,7 +287,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getContent',
|
'getContent',
|
||||||
'getFileSystem',
|
'getFileSystem',
|
||||||
'getExportFileName'
|
'getExportFileName',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getContent')->willReturn('some content');
|
$modelMock->expects($this->atLeastOnce())->method('getContent')->willReturn('some content');
|
||||||
@ -371,7 +371,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestExport|MockObject $modelMock */
|
/** @var d3TestExport|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getRendererBridge'
|
'getRendererBridge',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getRendererBridge')->willReturn($rendererBridgeMock);
|
$modelMock->expects($this->atLeastOnce())->method('getRendererBridge')->willReturn($rendererBridgeMock);
|
||||||
@ -425,7 +425,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestExport|MockObject $modelMock */
|
/** @var d3TestExport|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getRenderer'
|
'getRenderer',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getRenderer')->with($format)->willReturn($rendererMock);
|
$modelMock->expects($this->atLeastOnce())->method('getRenderer')->with($format)->willReturn($rendererMock);
|
||||||
@ -463,7 +463,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestExport|MockObject $modelMock */
|
/** @var d3TestExport|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getRenderer'
|
'getRenderer',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getRenderer')->with($format)->willReturn($rendererMock);
|
$modelMock->expects($this->atLeastOnce())->method('getRenderer')->with($format)->willReturn($rendererMock);
|
||||||
@ -490,7 +490,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestExport|MockObject $modelMock */
|
/** @var d3TestExport|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getTitle'
|
'getTitle',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getTitle')->willReturn('someTitle');
|
$modelMock->expects($this->atLeastOnce())->method('getTitle')->willReturn('someTitle');
|
||||||
@ -516,7 +516,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getExportFilenameBase',
|
'getExportFilenameBase',
|
||||||
'getFileExtension'
|
'getFileExtension',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getExportFilenameBase')->willReturn('base');
|
$modelMock->expects($this->atLeastOnce())->method('getExportFilenameBase')->willReturn('base');
|
||||||
@ -551,7 +551,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var d3TestExport|MockObject $modelMock */
|
/** @var d3TestExport|MockObject $modelMock */
|
||||||
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
$modelMock = $this->getMockBuilder(d3TestExport::class)
|
||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'd3GetDb'
|
'd3GetDb',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->exactly((int) !$throwsException))->method('d3GetDb')->willReturn($dbMock);
|
$modelMock->expects($this->exactly((int) !$throwsException))->method('d3GetDb')->willReturn($dbMock);
|
||||||
@ -570,13 +570,13 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
[
|
[
|
||||||
[
|
[
|
||||||
'field1' => 'content1',
|
'field1' => 'content1',
|
||||||
'field2' => 'content2'
|
'field2' => 'content2',
|
||||||
]
|
],
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
'field1',
|
'field1',
|
||||||
'field2'
|
'field2',
|
||||||
]
|
],
|
||||||
],
|
],
|
||||||
$result
|
$result
|
||||||
);
|
);
|
||||||
@ -613,7 +613,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
|
|||||||
->onlyMethods([
|
->onlyMethods([
|
||||||
'getQuery',
|
'getQuery',
|
||||||
'getExportData',
|
'getExportData',
|
||||||
'renderContent'
|
'renderContent',
|
||||||
])
|
])
|
||||||
->getMock();
|
->getMock();
|
||||||
$modelMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['arg1', 'arg2']]);
|
$modelMock->expects($this->atLeastOnce())->method('getQuery')->willReturn(['SELECT 1', ['arg1', 'arg2']]);
|
||||||
|
@ -29,7 +29,7 @@ class CsvTest extends ExportRendererTest
|
|||||||
/** @var Csv */
|
/** @var Csv */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ class CsvTest extends ExportRendererTest
|
|||||||
$valueList = ['value1', 'value2'];
|
$valueList = ['value1', 'value2'];
|
||||||
|
|
||||||
/** @var Writer|MockObject $csvMock */
|
/** @var Writer|MockObject $csvMock */
|
||||||
$csvMockBuilder = $this->getMockBuilder( Writer::class);
|
$csvMockBuilder = $this->getMockBuilder(Writer::class);
|
||||||
$csvMockBuilder->disableOriginalConstructor();
|
$csvMockBuilder->disableOriginalConstructor();
|
||||||
$onlyMethods = ['__toString', 'insertOne', 'insertAll'];
|
$onlyMethods = ['__toString', 'insertOne', 'insertAll'];
|
||||||
$csvMockBuilder->onlyMethods($onlyMethods);
|
$csvMockBuilder->onlyMethods($onlyMethods);
|
||||||
@ -89,7 +89,7 @@ class CsvTest extends ExportRendererTest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'exception' => [true],
|
'exception' => [true],
|
||||||
'no exception' => [false]
|
'no exception' => [false],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ abstract class ExportRendererTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var RendererInterface */
|
/** @var RendererInterface */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function tearDown() : void
|
public function tearDown(): void
|
||||||
{
|
{
|
||||||
parent::tearDown();
|
parent::tearDown();
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ class JsonTest extends ExportRendererTest
|
|||||||
/** @var Json */
|
/** @var Json */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ class JsonTest extends ExportRendererTest
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'valid' => [['value1', 'value2'], false],
|
'valid' => [['value1', 'value2'], false],
|
||||||
'invalid' => [["text" => "\xB1\x31"], true] // malformed UTF8 chars
|
'invalid' => [["text" => "\xB1\x31"], true], // malformed UTF8 chars
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -25,7 +25,7 @@ class PrettyTest extends ExportRendererTest
|
|||||||
/** @var Pretty */
|
/** @var Pretty */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ class RendererBridgeTest extends d3ModCfgUnitTestCase
|
|||||||
/** @var RendererBridge */
|
/** @var RendererBridge */
|
||||||
protected $_oModel;
|
protected $_oModel;
|
||||||
|
|
||||||
public function setUp() : void
|
public function setUp(): void
|
||||||
{
|
{
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
@ -122,7 +122,7 @@ class RendererBridgeTest extends d3ModCfgUnitTestCase
|
|||||||
[
|
[
|
||||||
'CSV' => $this->getMockBuilder(Csv::class)->getMock(),
|
'CSV' => $this->getMockBuilder(Csv::class)->getMock(),
|
||||||
'Pretty' => $this->getMockBuilder(Pretty::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 [
|
return [
|
||||||
'existing renderer'=> [RendererBridge::FORMAT_JSON, false],
|
'existing renderer'=> [RendererBridge::FORMAT_JSON, false],
|
||||||
'unknown renderer'=> ['unknownRenderer', true]
|
'unknown renderer'=> ['unknownRenderer', true],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user