phpcs+phpstan fixes

This commit is contained in:
Dennis Eichhorn 2019-02-07 00:05:31 +01:00
parent 30ef848aa5
commit 9e6faa024d
12 changed files with 47 additions and 51 deletions

View File

@ -36,7 +36,7 @@ class Navigation
*
* @since 1.0.0
*/
public static function install(string $path = null, DatabasePool $dbPool = null) : void
public static function install(string $path, DatabasePool $dbPool) : void
{
\Modules\Navigation\Admin\Installer::installExternal($dbPool, ['path' => __DIR__ . '/Navigation.install.json']);
}

View File

@ -20,7 +20,6 @@ use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
/**
* Exchange controller class.
*
@ -57,7 +56,7 @@ final class ApiController extends Controller
}
$response->set($request->getUri()->__toString(), [
'status' => status,
'status' => $status,
'title' => 'Exchange',
'message' => $message
]);

View File

@ -16,9 +16,9 @@ namespace Modules\Exchange\Controller;
use Modules\Exchange\Models\InterfaceManagerMapper;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
/**
@ -32,7 +32,7 @@ use phpOMS\Views\View;
final class BackendController extends Controller
{
public function viewExchangeDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewExchangeDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-dashboard');
@ -48,12 +48,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable Serializable web view
* @return RenderableInterface Response can be rendered
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewExchangeExportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewExchangeExportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export-list');
@ -80,12 +80,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable Serializable web view
* @return RenderableInterface Response can be rendered
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewExchangeImportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewExchangeImportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import-list');
@ -112,12 +112,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable Serializable web view
* @return RenderableInterface Response can be rendered
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewExchangeExport(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewExchangeExport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-export');
@ -133,12 +133,12 @@ final class BackendController extends Controller
* @param ResponseAbstract $response Response
* @param mixed $data Generic data
*
* @return \Serializable Serializable web view
* @return RenderableInterface Response can be rendered
*
* @since 1.0.0
* @codeCoverageIgnore
*/
public function viewExchangeImport(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable
public function viewExchangeImport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
{
$view = new View($this->app, $request, $response);
$view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-import');

View File

@ -14,8 +14,6 @@ declare(strict_types=1);
namespace Modules\Exchange\Controller;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\WebInterface;

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/**
* Mapper class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/**
* Mapper class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,13 +12,12 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
/**
* Cost center class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/**
* Mapper class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
@ -30,7 +30,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
/**
* Columns.
*
* @var array<string, array<string, bool|string>>
* @var array<string, array<string, bool|string>>
* @since 1.0.0
*/
protected static $columns = [
@ -44,7 +44,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
/**
* Primary table.
*
* @var string
* @var string
* @since 1.0.0
*/
protected static $table = 'FiKostenstellen';
@ -52,7 +52,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
/**
* Created at.
*
* @var string
* @var string
* @since 1.0.0
*/
protected static $createdAt = 'row_create_time';
@ -60,7 +60,7 @@ final class GSDCostCenterMapper extends DataMapperAbstract
/**
* Primary field name.
*
* @var string
* @var string
* @since 1.0.0
*/
protected static $primaryField = 'ROW_ID';

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,13 +12,12 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
/**
* Cost object class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/**
* Mapper class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
@ -30,7 +30,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
/**
* Columns.
*
* @var array<string, array<string, bool|string>>
* @var array<string, array<string, bool|string>>
* @since 1.0.0
*/
protected static $columns = [
@ -44,7 +44,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
/**
* Primary table.
*
* @var string
* @var string
* @since 1.0.0
*/
protected static $table = 'FiKostentraeger';
@ -52,7 +52,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
/**
* Created at.
*
* @var string
* @var string
* @since 1.0.0
*/
protected static $createdAt = 'row_create_time';
@ -60,7 +60,7 @@ final class GSDCostObjectMapper extends DataMapperAbstract
/**
* Primary field name.
*
* @var string
* @var string
* @since 1.0.0
*/
protected static $primaryField = 'ROW_ID';

View File

@ -4,7 +4,7 @@
*
* PHP Version 7.2
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
@ -12,14 +12,14 @@
*/
declare(strict_types=1);
namespace Interfaces\GSD\Models;
namespace Modules\Exchange\Interfaces\GSD\Model;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/**
* Mapper class.
*
* @package Interfaces\GSD\Models
* @package Modules\Exchange\Interfaces\GSD\Model
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
@ -41,7 +41,7 @@ final class GSDCustomerMapper extends DataMapperAbstract
protected static $ownsOne = [
'mainAddress' => [
'mapper' => GSDAddress::class,
'mapper' => GSDAddressMapper::class,
'src' => 'AddressId',
],
];

View File

@ -68,7 +68,7 @@ class InterfaceManager
/**
* Get id
*
* @return string
* @return int
*
* @since 1.0.0
*/
@ -116,7 +116,7 @@ class InterfaceManager
/**
* Provides import interface
*
* @return string
* @return bool
*
* @since 1.0.0
*/
@ -128,7 +128,7 @@ class InterfaceManager
/**
* Provides export interface
*
* @return string
* @return bool
*
* @since 1.0.0
*/
@ -152,7 +152,8 @@ class InterfaceManager
throw new PathException($this->path);
}
$this->info = \json_decode(\file_get_contents($this->path), true);
$content = \file_get_contents($this->path);
$this->info = \json_decode($content !== false ? $content : '[]', true);
}
/**