Benzine/ORM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make phpstan happier

Browse source
This commit is contained in:
Greyscale 2020-08-31 20:57:20 +02:00
parent 973a83da7e
commit 13311415dd
40 changed files with 151 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Abstracts/Model.php → src/Abstracts/AbstractModel.php
View file

@ -6,7 +6,7 @@ use Benzine\ORM\Interfaces\ModelInterface;
use Camel\CaseTransformer;
use Camel\Format;
abstract class Model implements ModelInterface, \Serializable
abstract class AbstractModel implements ModelInterface, \Serializable
{
protected array $_primary_keys = [];
protected array $_autoincrement_keys = [];

20
src/Abstracts/Service.php → src/Abstracts/AbstractService.php
View file

@ -7,21 +7,21 @@ use Laminas\Db\ResultSet\ResultSet;
use Laminas\Db\Sql;
use Laminas\Db\Sql\Select;
abstract class Service
abstract class AbstractService
{
abstract public function getNewModelInstance(): Model;
abstract public function getNewModelInstance(): AbstractModel;
abstract public function getTermPlural(): string;
abstract public function getTermSingular(): string;
abstract public function getNewTableGatewayInstance(): TableGateway;
abstract public function getNewTableGatewayInstance(): AbstractTableGateway;
/**
* @param null|array|\Closure[] $wheres
* @param null|Sql\Expression|string $order
*
* @return Model[]
* @return AbstractModel[]
*/
public function getAll(
int $limit = null,
@ -30,7 +30,7 @@ abstract class Service
$order = null,
string $orderDirection = null
) {
/** @var TableGateway $tableGateway */
/** @var AbstractTableGateway $tableGateway */
$tableGateway = $this->getNewTableGatewayInstance();
list($matches, $count) = $tableGateway->fetchAll(
$limit,
@ -54,13 +54,13 @@ abstract class Service
* @param null|string $distinctColumn
* @param null|array|\Closure[] $wheres
*
* @return Model[]
* @return AbstractModel[]
*/
public function getDistinct(
string $distinctColumn,
array $wheres = null
) {
/** @var TableGateway $tableGateway */
/** @var AbstractTableGateway $tableGateway */
$tableGateway = $this->getNewTableGatewayInstance();
list($matches, $count) = $tableGateway->fetchDistinct(
$distinctColumn,
@ -85,7 +85,7 @@ abstract class Service
public function countAll(
array $wheres = null
) {
/** @var TableGateway $tableGateway */
/** @var AbstractTableGateway $tableGateway */
$tableGateway = $this->getNewTableGatewayInstance();
return $tableGateway->getCount($wheres);
@ -119,11 +119,11 @@ abstract class Service
return new TabularData\Table($this);
}
abstract public function getByField(string $field, $value, $orderBy = null, $orderDirection = Select::ORDER_ASCENDING): ?Model;
abstract public function getByField(string $field, $value, $orderBy = null, $orderDirection = Select::ORDER_ASCENDING): ?AbstractModel;
abstract public function getManyByField(string $field, $value, int $limit = null, $orderBy = null, $orderDirection = Select::ORDER_ASCENDING): ?array;
abstract public function countByField(string $field, $value): int;
abstract public function getRandom(): ?Model;
abstract public function getRandom(): ?AbstractModel;
}

33
src/Abstracts/TableGateway.php → src/Abstracts/AbstractTableGateway.php
View file

@ -15,8 +15,9 @@ use Laminas\Db\Sql\Predicate;
use Laminas\Db\Sql\Predicate\PredicateInterface;
use Laminas\Db\Sql\Select;
use Laminas\Db\Sql\Where;
use Laminas\Db\TableGateway\TableGateway;
abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
abstract class AbstractTableGateway extends TableGateway
{
protected string $model;
protected $table;
@ -51,7 +52,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
/**
* @return null|array|\ArrayObject
*/
public function save(Model $model)
public function save(AbstractModel $model)
{
// @todo check $model->isDirty() to quick-reject a save operation on a non-dirty record
$model->__pre_save();
@ -66,7 +67,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
}
try {
/** @var Model $oldModel */
/** @var AbstractModel $oldModel */
$oldModel = $this->select($pk)->current();
if ($pkIsBlank || !$oldModel) {
$pk = $this->saveInsert($model);
@ -101,7 +102,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
/**
* @return null|int
*/
public function saveInsert(Model $model)
public function saveInsert(AbstractModel $model)
{
switch ($this->getSql()->getAdapter()->getDriver()->getDatabasePlatformName()) {
case 'Postgresql':
@ -154,7 +155,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
/**
* @return int
*/
public function saveUpdate(Model $model, Model $oldModel)
public function saveUpdate(AbstractModel $model, AbstractModel $oldModel)
{
return $this->update(
$model->__toRawArray(),
@ -175,9 +176,9 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
}
/**
* @param array $data
* @param null $where
* @param array|Model $oldData
* @param array $data
* @param null $where
* @param AbstractModel|array $oldData
*
* @return int
*/
@ -417,7 +418,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
* @param array|string $order
* @param int $offset
*
* @return null|array|\ArrayObject|Model
* @return null|AbstractModel|array|\ArrayObject
*/
public function fetchRow($where = null, $order = null, $offset = null)
{
@ -485,7 +486,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
public function getPrimaryKeys(): array
{
/** @var Model $oModel */
/** @var AbstractModel $oModel */
$oModel = $this->getNewMockModelInstance();
return array_keys($oModel->getPrimaryKeys());
@ -493,7 +494,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
public function getAutoIncrementKeys(): array
{
/** @var Model $oModel */
/** @var AbstractModel $oModel */
$oModel = $this->getNewMockModelInstance();
return array_keys($oModel->getAutoIncrementKeys());
@ -546,7 +547,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
/**
* @param $id
*
* @return null|Model
* @return null|AbstractModel
*/
public function getById($id)
{
@ -715,7 +716,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
return null;
}
for ($i = 0; $i < $resultSet->count(); ++$i) {
/** @var Model $row */
/** @var AbstractModel $row */
$row = $resultSet->current();
if ($row->hasPrimaryKey()) {
$id = implode('-', $row->getPrimaryKeys());
@ -729,7 +730,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
return $results;
}
public function getNewModelInstance(array $data = []): Model
public function getNewModelInstance(array $data = []): AbstractModel
{
$model = $this->model;
@ -737,7 +738,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
}
/**
* @return Model[]
* @return AbstractModel[]
*/
public function getBySelect(Select $select): array
{
@ -751,7 +752,7 @@ abstract class TableGateway extends \Laminas\Db\TableGateway\TableGateway
}
/**
* @return Model[]
* @return AbstractModel[]
*/
public function getBySelectRaw(Select $select): array
{

2
src/Entities/Entity.php → src/Entities/AbstractEntity.php
View file

@ -2,6 +2,6 @@
namespace Benzine\ORM\Entities;
abstract class Entity
abstract class AbstractEntity
{
}

2
src/Entities/Column.php
View file

@ -2,7 +2,7 @@
namespace Benzine\ORM\Entities;
class Column extends Entity
class Column extends AbstractEntity
{
protected $columnName;
}

17
src/Entities/Table.php
View file

@ -2,12 +2,10 @@
namespace Benzine\ORM\Entities;
class Table extends Entity
class Table extends AbstractEntity
{
/** @var string */
protected $tableName;
/** @var Column */
protected $columns;
protected string $tableName;
protected Column $columns;
public function getTableName()
{
@ -23,13 +21,4 @@ class Table extends Entity
return $this;
}
public function addColumn(string $name, array $options): self
{
$this->columns[] = $column = (new Column())
->setOptions($options)
;
return $this;
}
}

2
src/Generator/templates/Models/basemodel.php.twig
View file

@ -7,7 +7,7 @@ use {{ namespace }}\TableGateways;
use {{ namespace }}\Services;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Benzine\ORM\Abstracts\Model as AbstractModel;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Interfaces\ModelInterface as ModelInterface;
use Benzine\App as App;
use Carbon\Carbon as DateTime;

6
src/Generator/templates/Models/basetable.php.twig
View file

@ -6,8 +6,8 @@ use {{ namespace }}\Models;
use {{ namespace }}\TableGateways;
use Faker\Generator;
use Laminas\Db\ResultSet\ResultSet;
use Benzine\ORM\Abstracts\Model;
use Benzine\ORM\Abstracts\TableGateway as AbstractTableGateway;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Abstracts\AbstractTableGateway;
use Benzine\ORM\Connection;
use Benzine\ORM\Interfaces\TableGatewayInterface as TableGatewayInterface;
use Benzine\Exceptions\BenzineException;
@ -135,7 +135,7 @@ abstract class Base{{ class_name }}TableGateway extends AbstractTableGateway imp
*
* @return Models\{{ class_name }}Model
*/
public function save(Model $model): Models\{{ class_name }}Model
public function save(AbstractModel $model): Models\{{ class_name }}Model
{
return parent::save($model);
}

2
src/Generator/templates/Services/baseservice.php.twig
View file

@ -8,7 +8,7 @@ use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use Laminas\Db\Sql\Predicate;
use Laminas\Db\Sql\Where;
use Benzine\ORM\Abstracts\Service as AbstractService;
use Benzine\ORM\Abstracts\AbstractService;
use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
{% include '_overwrite_warning.twig' %}

4
src/Migrations/Migration.php → src/Migrations/AbstractMigration.php
View file

@ -2,9 +2,7 @@
namespace Benzine\ORM\Migrations;
use Phinx\Migration\AbstractMigration;
abstract class Migration extends AbstractMigration
abstract class AbstractMigration extends \Phinx\Migration\AbstractMigration
{
protected array $defaultRelationshipOptions = [
'delete' => 'NO_ACTION',

7
src/Migrations/AbstractSeed.php Normal file
View file

@ -0,0 +1,7 @@
<?php
namespace Benzine\ORM\Migrations;
abstract class AbstractSeed extends \Phinx\Seed\AbstractSeed
{
}

9
src/Migrations/Seeder.php
View file

@ -1,9 +0,0 @@
<?php
namespace Benzine\ORM\Migrations;
use Phinx\Seed\AbstractSeed;
abstract class Seeder extends AbstractSeed
{
}

6
src/TabularData/Table.php
View file

@ -2,12 +2,12 @@
namespace Benzine\ORM\TabularData;
use Benzine\ORM\Abstracts\Service;
use Benzine\ORM\Abstracts\AbstractService;
use Laminas\Db\Sql\Where;
class Table
{
protected Service $service;
protected AbstractService $service;
protected array $data;
protected string $name;
protected int $page = 0;
@ -16,7 +16,7 @@ class Table
protected array $colums = [];
protected array $rows = [];
public function __construct(Service $service)
public function __construct(AbstractService $service)
{
$this->service = $service;
$this->setName(get_class($service));

12
src/TabularData/TableRow.php
View file

@ -2,24 +2,24 @@
namespace Benzine\ORM\TabularData;
use Benzine\ORM\Abstracts\Model;
use Benzine\ORM\Abstracts\Service;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Abstracts\AbstractService;
class TableRow
{
private array $data = [];
/** @var Model[] */
/** @var AbstractModel[] */
private array $related;
public function __construct(Model $model)
public function __construct(AbstractModel $model)
{
foreach ($model->getPropertyMeta() as $field => $options) {
$this->data[$field] = $model->__get($field);
if (isset($options['service'])) {
/** @var Service $service */
/** @var AbstractService $service */
$service = $options['service'];
/** @var Model $relatedEntity */
/** @var AbstractModel $relatedEntity */
$relatedEntity = $service->getByField($field, $this->data[$field]);
$this->related[$field] = $relatedEntity;
}

4
test/Migrations/20200821163200_test_table_structure.php
View file

@ -1,9 +1,9 @@
<?php
use Benzine\ORM\Migrations\Migration;
use Benzine\ORM\Migrations\AbstractMigration;
use Phinx\Db\Adapter\MysqlAdapter;
class TestTableStructure extends Migration
class TestTableStructure extends AbstractMigration
{
/**
* Change Method.

4
test/app/src/Models/Base/BaseBlogPostsModel.php → test/app/src/Models/Base/BaseBlogPostsAbstractModel.php
View file

@ -7,7 +7,7 @@ use Benzine\ORM\Tests\TableGateways;
use Benzine\ORM\Tests\Services;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Benzine\ORM\Abstracts\Model as AbstractModel;
use Benzine\ORM\Abstracts\AbstractModel as AbstractModel;
use Benzine\ORM\Interfaces\ModelInterface as ModelInterface;
use Benzine\App as App;
@ -23,7 +23,7 @@ use Benzine\App as App;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseBlogPostsModel extends AbstractModel implements ModelInterface
abstract class BaseBlogPostsAbstractModel extends AbstractModel implements ModelInterface
{
// Declare what fields are available on this object
public const FIELD_BLOGPOSTID = 'blogPostId';

4
test/app/src/Models/Base/BaseMigrationsModel.php → test/app/src/Models/Base/BaseMigrationsAbstractModel.php
View file

@ -7,7 +7,7 @@ use Benzine\ORM\Tests\TableGateways;
use Benzine\ORM\Tests\Services;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Benzine\ORM\Abstracts\Model as AbstractModel;
use Benzine\ORM\Abstracts\AbstractModel as AbstractModel;
use Benzine\ORM\Interfaces\ModelInterface as ModelInterface;
use Benzine\App as App;
@ -23,7 +23,7 @@ use Benzine\App as App;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseMigrationsModel extends AbstractModel implements ModelInterface
abstract class BaseMigrationsAbstractModel extends AbstractModel implements ModelInterface
{
// Declare what fields are available on this object
public const FIELD_VERSION = 'version';

4
test/app/src/Models/Base/BaseUsersModel.php → test/app/src/Models/Base/BaseUsersAbstractModel.php
View file

@ -7,7 +7,7 @@ use Benzine\ORM\Tests\TableGateways;
use Benzine\ORM\Tests\Services;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Benzine\ORM\Abstracts\Model as AbstractModel;
use Benzine\ORM\Abstracts\AbstractModel as AbstractModel;
use Benzine\ORM\Interfaces\ModelInterface as ModelInterface;
use Benzine\App as App;
@ -23,7 +23,7 @@ use Benzine\App as App;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseUsersModel extends AbstractModel implements ModelInterface
abstract class BaseUsersAbstractModel extends AbstractModel implements ModelInterface
{
// Declare what fields are available on this object
public const FIELD_USERID = 'userId';

2
test/app/src/Models/BlogPostsModel.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\Models;
class BlogPostsModel extends Base\BaseBlogPostsModel
class BlogPostsModel extends Base\BaseBlogPostsAbstractModel
{
}

2
test/app/src/Models/MigrationsModel.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\Models;
class MigrationsModel extends Base\BaseMigrationsModel
class MigrationsModel extends Base\BaseMigrationsAbstractModel
{
}

2
test/app/src/Models/UsersModel.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\Models;
class UsersModel extends Base\BaseUsersModel
class UsersModel extends Base\BaseUsersAbstractModel
{
}

4
test/app/src/Services/Base/BaseBlogPostsService.php → test/app/src/Services/Base/BaseBlogPostsAbstractService.php
View file

@ -8,7 +8,7 @@ use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use Laminas\Db\Sql\Predicate;
use Laminas\Db\Sql\Where;
use Benzine\ORM\Abstracts\Service as AbstractService;
use Benzine\ORM\Abstracts\AbstractService as AbstractService;
use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
/** ___ __
@ -23,7 +23,7 @@ use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseBlogPostsService extends AbstractService implements ServiceInterface
abstract class BaseBlogPostsAbstractService extends AbstractService implements ServiceInterface
{
// Related Objects Table Gateways
protected TableGateways\UsersTableGateway $usersTableGateway;

4
test/app/src/Services/Base/BaseMigrationsService.php → test/app/src/Services/Base/BaseMigrationsAbstractService.php
View file

@ -8,7 +8,7 @@ use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use Laminas\Db\Sql\Predicate;
use Laminas\Db\Sql\Where;
use Benzine\ORM\Abstracts\Service as AbstractService;
use Benzine\ORM\Abstracts\AbstractService as AbstractService;
use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
/** ___ __
@ -23,7 +23,7 @@ use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseMigrationsService extends AbstractService implements ServiceInterface
abstract class BaseMigrationsAbstractService extends AbstractService implements ServiceInterface
{
// Related Objects Table Gateways

4
test/app/src/Services/Base/BaseUsersService.php → test/app/src/Services/Base/BaseUsersAbstractService.php
View file

@ -8,7 +8,7 @@ use Laminas\Db\Sql\Expression;
use Laminas\Db\Sql\Select;
use Laminas\Db\Sql\Predicate;
use Laminas\Db\Sql\Where;
use Benzine\ORM\Abstracts\Service as AbstractService;
use Benzine\ORM\Abstracts\AbstractService as AbstractService;
use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
/** ___ __
@ -23,7 +23,7 @@ use Benzine\ORM\Interfaces\ServiceInterface as ServiceInterface;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseUsersService extends AbstractService implements ServiceInterface
abstract class BaseUsersAbstractService extends AbstractService implements ServiceInterface
{
// Related Objects Table Gateways

2
test/app/src/Services/BlogPostsService.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\Services;
class BlogPostsService extends Base\BaseBlogPostsService
class BlogPostsService extends Base\BaseBlogPostsAbstractService
{
}

2
test/app/src/Services/MigrationsService.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\Services;
class MigrationsService extends Base\BaseMigrationsService
class MigrationsService extends Base\BaseMigrationsAbstractService
{
}

2
test/app/src/Services/UsersService.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\Services;
class UsersService extends Base\BaseUsersService
class UsersService extends Base\BaseUsersAbstractService
{
}

8
test/app/src/TableGateways/Base/BaseBlogPostsTableGateway.php → test/app/src/TableGateways/Base/BaseBlogPostsAbstractTableGateway.php
View file

@ -6,8 +6,8 @@ use Benzine\ORM\Tests\Models;
use Benzine\ORM\Tests\TableGateways;
use Faker\Generator;
use Laminas\Db\ResultSet\ResultSet;
use Benzine\ORM\Abstracts\Model;
use Benzine\ORM\Abstracts\TableGateway as AbstractTableGateway;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Abstracts\AbstractTableGateway as AbstractTableGateway;
use Benzine\ORM\Connection;
use Benzine\ORM\Interfaces\TableGatewayInterface as TableGatewayInterface;
use Benzine\Exceptions\BenzineException;
@ -24,7 +24,7 @@ use Benzine\Exceptions\BenzineException;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseBlogPostsTableGateway extends AbstractTableGateway implements TableGatewayInterface
abstract class BaseBlogPostsAbstractTableGateway extends AbstractTableGateway implements TableGatewayInterface
{
protected $table = 'BlogPosts';
protected string $model = Models\BlogPostsModel::class;
@ -97,7 +97,7 @@ abstract class BaseBlogPostsTableGateway extends AbstractTableGateway implements
*
* @return Models\BlogPostsModel
*/
public function save(Model $model): Models\BlogPostsModel
public function save(AbstractModel $model): Models\BlogPostsModel
{
return parent::save($model);
}

8
test/app/src/TableGateways/Base/BaseMigrationsTableGateway.php → test/app/src/TableGateways/Base/BaseMigrationsAbstractTableGateway.php
View file

@ -6,8 +6,8 @@ use Benzine\ORM\Tests\Models;
use Benzine\ORM\Tests\TableGateways;
use Faker\Generator;
use Laminas\Db\ResultSet\ResultSet;
use Benzine\ORM\Abstracts\Model;
use Benzine\ORM\Abstracts\TableGateway as AbstractTableGateway;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Abstracts\AbstractTableGateway as AbstractTableGateway;
use Benzine\ORM\Connection;
use Benzine\ORM\Interfaces\TableGatewayInterface as TableGatewayInterface;
use Benzine\Exceptions\BenzineException;
@ -24,7 +24,7 @@ use Benzine\Exceptions\BenzineException;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseMigrationsTableGateway extends AbstractTableGateway implements TableGatewayInterface
abstract class BaseMigrationsAbstractTableGateway extends AbstractTableGateway implements TableGatewayInterface
{
protected $table = 'Migrations';
protected string $model = Models\MigrationsModel::class;
@ -87,7 +87,7 @@ abstract class BaseMigrationsTableGateway extends AbstractTableGateway implement
*
* @return Models\MigrationsModel
*/
public function save(Model $model): Models\MigrationsModel
public function save(AbstractModel $model): Models\MigrationsModel
{
return parent::save($model);
}

8
test/app/src/TableGateways/Base/BaseUsersTableGateway.php → test/app/src/TableGateways/Base/BaseUsersAbstractTableGateway.php
View file

@ -6,8 +6,8 @@ use Benzine\ORM\Tests\Models;
use Benzine\ORM\Tests\TableGateways;
use Faker\Generator;
use Laminas\Db\ResultSet\ResultSet;
use Benzine\ORM\Abstracts\Model;
use Benzine\ORM\Abstracts\TableGateway as AbstractTableGateway;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Abstracts\AbstractTableGateway as AbstractTableGateway;
use Benzine\ORM\Connection;
use Benzine\ORM\Interfaces\TableGatewayInterface as TableGatewayInterface;
use Benzine\Exceptions\BenzineException;
@ -24,7 +24,7 @@ use Benzine\Exceptions\BenzineException;
* this classes behaviours, do so in the class that
* extends this, or modify the Laminator Template!
*/
abstract class BaseUsersTableGateway extends AbstractTableGateway implements TableGatewayInterface
abstract class BaseUsersAbstractTableGateway extends AbstractTableGateway implements TableGatewayInterface
{
protected $table = 'Users';
protected string $model = Models\UsersModel::class;
@ -84,7 +84,7 @@ abstract class BaseUsersTableGateway extends AbstractTableGateway implements Tab
*
* @return Models\UsersModel
*/
public function save(Model $model): Models\UsersModel
public function save(AbstractModel $model): Models\UsersModel
{
return parent::save($model);
}

2
test/app/src/TableGateways/BlogPostsTableGateway.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\TableGateways;
class BlogPostsTableGateway extends Base\BaseBlogPostsTableGateway
class BlogPostsTableGateway extends Base\BaseBlogPostsAbstractTableGateway
{
}

2
test/app/src/TableGateways/MigrationsTableGateway.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\TableGateways;
class MigrationsTableGateway extends Base\BaseMigrationsTableGateway
class MigrationsTableGateway extends Base\BaseMigrationsAbstractTableGateway
{
}

2
test/app/src/TableGateways/UsersTableGateway.php
View file

@ -1,7 +1,7 @@
<?php
namespace Benzine\ORM\Tests\TableGateways;
class UsersTableGateway extends Base\BaseUsersTableGateway
class UsersTableGateway extends Base\BaseUsersAbstractTableGateway
{
}

8
test/app/tests/Models/DateTimeFieldsTest.php
View file

@ -2,7 +2,7 @@
namespace Benzine\ORM\Tests\Test\Models;
use Benzine\ORM\Abstracts\Model;
use Benzine\ORM\Abstracts\AbstractModel;
use Benzine\ORM\Tests\App as App;
use Benzine\ORM\Tests\Models;
use Benzine\ORM\Tests\Models\UsersModel;
@ -15,7 +15,7 @@ use Benzine\Tests\BaseTestCase;
class DateTimeFieldsTest extends BaseTestCase
{
/** @var Model[] */
/** @var AbstractModel[] */
private $entititesToCleanUp = [];
private UsersService $usersService;
@ -35,8 +35,8 @@ class DateTimeFieldsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Abstracts\Model::__toRawArray()
* @covers \Benzine\ORM\Abstracts\Model::exchangeArray()
* @covers \Benzine\ORM\Abstracts\AbstractModel::__toRawArray()
* @covers \Benzine\ORM\Abstracts\AbstractModel::exchangeArray()
*/
public function testCreateWithDateTime(){

4
test/app/tests/Models/Generated/BlogPostsTest.php
View file

@ -12,9 +12,9 @@ use Benzine\Tests\BaseTestCase;
/**
* @covers \Benzine\ORM\Tests\Models\BlogPostsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseBlogPostsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseBlogPostsAbstractModel
* @covers \Benzine\ORM\Tests\TableGateways\BlogPostsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseBlogPostsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseBlogPostsAbstractTableGateway
*
* @group generated
* @group models

4
test/app/tests/Models/Generated/MigrationsTest.php
View file

@ -12,9 +12,9 @@ use Benzine\Tests\BaseTestCase;
/**
* @covers \Benzine\ORM\Tests\Models\MigrationsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseMigrationsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseMigrationsAbstractModel
* @covers \Benzine\ORM\Tests\TableGateways\MigrationsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseMigrationsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseMigrationsAbstractTableGateway
*
* @group generated
* @group models

4
test/app/tests/Models/Generated/UsersTest.php
View file

@ -12,9 +12,9 @@ use Benzine\Tests\BaseTestCase;
/**
* @covers \Benzine\ORM\Tests\Models\UsersModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseUsersModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseUsersAbstractModel
* @covers \Benzine\ORM\Tests\TableGateways\UsersTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseUsersTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseUsersAbstractTableGateway
*
* @group generated
* @group models

34
test/app/tests/Services/Generated/BlogPostsTest.php
View file

@ -12,11 +12,11 @@ use Benzine\Tests\BaseTestCase;
/**
* @covers \Benzine\ORM\Tests\Models\BlogPostsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseBlogPostsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseBlogPostsAbstractModel
* @covers \Benzine\ORM\Tests\Services\BlogPostsService
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService
* @covers \Benzine\ORM\Tests\TableGateways\BlogPostsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseBlogPostsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseBlogPostsAbstractTableGateway
*
* @group generated
* @group services
@ -61,7 +61,7 @@ class BlogPostsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getNewModelInstance
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getNewModelInstance
*/
public function testGetNewModelInstance()
{
@ -73,7 +73,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @large
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getAll
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getAll
*/
public function testGetAll()
{
@ -85,7 +85,7 @@ class BlogPostsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getRandom
*/
public function testGetRandom()
{
@ -100,7 +100,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getByField
*/
public function testGetByPrimaryKeys(BlogPostsModel $random)
{
@ -126,7 +126,7 @@ class BlogPostsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getMockObject
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getMockObject
*/
public function testGetMockObject()
{
@ -138,7 +138,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getByField
*/
public function testGetByField(BlogPostsModel $random)
{
@ -191,7 +191,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::countByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::countByField
*/
public function testCountByField(BlogPostsModel $random)
{
@ -229,7 +229,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getManyByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getManyByField
*/
public function testGetManyByField(BlogPostsModel $random)
{
@ -304,7 +304,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getManyMatching
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getManyMatching
*/
public function testGetManyMatching(BlogPostsModel $random)
{
@ -328,7 +328,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getMatching
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getMatching
*/
public function testGetMatching(BlogPostsModel $random)
{
@ -346,7 +346,7 @@ class BlogPostsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::deleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::deleteByField
*/
public function testDeleteByField()
{
@ -363,7 +363,7 @@ class BlogPostsTest extends BaseTestCase
/**
* @depends testDeleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::deleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::deleteByField
* @param BlogPostsModel[] $allDeleted
*/
public function testDeleteByFieldVerify(array $allDeleted)
@ -376,7 +376,7 @@ class BlogPostsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getTermPlural
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getTermPlural
*/
public function testGetTermPlural()
{
@ -384,7 +384,7 @@ class BlogPostsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsService::getTermSingular
* @covers \Benzine\ORM\Tests\Services\Base\BaseBlogPostsAbstractService::getTermSingular
*/
public function testGetTermSingular()
{

34
test/app/tests/Services/Generated/MigrationsTest.php
View file

@ -12,11 +12,11 @@ use Benzine\Tests\BaseTestCase;
/**
* @covers \Benzine\ORM\Tests\Models\MigrationsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseMigrationsModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseMigrationsAbstractModel
* @covers \Benzine\ORM\Tests\Services\MigrationsService
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService
* @covers \Benzine\ORM\Tests\TableGateways\MigrationsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseMigrationsTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseMigrationsAbstractTableGateway
*
* @group generated
* @group services
@ -61,7 +61,7 @@ class MigrationsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getNewModelInstance
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getNewModelInstance
*/
public function testGetNewModelInstance()
{
@ -73,7 +73,7 @@ class MigrationsTest extends BaseTestCase
/**
* @large
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getAll
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getAll
*/
public function testGetAll()
{
@ -85,7 +85,7 @@ class MigrationsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getRandom
*/
public function testGetRandom()
{
@ -100,7 +100,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getByField
*/
public function testGetByPrimaryKeys(MigrationsModel $random)
{
@ -126,7 +126,7 @@ class MigrationsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getMockObject
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getMockObject
*/
public function testGetMockObject()
{
@ -138,7 +138,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getByField
*/
public function testGetByField(MigrationsModel $random)
{
@ -191,7 +191,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::countByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::countByField
*/
public function testCountByField(MigrationsModel $random)
{
@ -229,7 +229,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getManyByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getManyByField
*/
public function testGetManyByField(MigrationsModel $random)
{
@ -304,7 +304,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getManyMatching
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getManyMatching
*/
public function testGetManyMatching(MigrationsModel $random)
{
@ -328,7 +328,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getMatching
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getMatching
*/
public function testGetMatching(MigrationsModel $random)
{
@ -346,7 +346,7 @@ class MigrationsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::deleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::deleteByField
*/
public function testDeleteByField()
{
@ -363,7 +363,7 @@ class MigrationsTest extends BaseTestCase
/**
* @depends testDeleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::deleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::deleteByField
* @param MigrationsModel[] $allDeleted
*/
public function testDeleteByFieldVerify(array $allDeleted)
@ -376,7 +376,7 @@ class MigrationsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getTermPlural
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getTermPlural
*/
public function testGetTermPlural()
{
@ -384,7 +384,7 @@ class MigrationsTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsService::getTermSingular
* @covers \Benzine\ORM\Tests\Services\Base\BaseMigrationsAbstractService::getTermSingular
*/
public function testGetTermSingular()
{

34
test/app/tests/Services/Generated/UsersTest.php
View file

@ -12,11 +12,11 @@ use Benzine\Tests\BaseTestCase;
/**
* @covers \Benzine\ORM\Tests\Models\UsersModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseUsersModel
* @covers \Benzine\ORM\Tests\Models\Base\BaseUsersAbstractModel
* @covers \Benzine\ORM\Tests\Services\UsersService
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService
* @covers \Benzine\ORM\Tests\TableGateways\UsersTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseUsersTableGateway
* @covers \Benzine\ORM\Tests\TableGateways\Base\BaseUsersAbstractTableGateway
*
* @group generated
* @group services
@ -61,7 +61,7 @@ class UsersTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getNewModelInstance
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getNewModelInstance
*/
public function testGetNewModelInstance()
{
@ -73,7 +73,7 @@ class UsersTest extends BaseTestCase
/**
* @large
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getAll
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getAll
*/
public function testGetAll()
{
@ -85,7 +85,7 @@ class UsersTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getRandom
*/
public function testGetRandom()
{
@ -100,7 +100,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getByField
*/
public function testGetByPrimaryKeys(UsersModel $random)
{
@ -126,7 +126,7 @@ class UsersTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getMockObject
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getMockObject
*/
public function testGetMockObject()
{
@ -138,7 +138,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getByField
*/
public function testGetByField(UsersModel $random)
{
@ -182,7 +182,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::countByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::countByField
*/
public function testCountByField(UsersModel $random)
{
@ -214,7 +214,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getManyByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getManyByField
*/
public function testGetManyByField(UsersModel $random)
{
@ -280,7 +280,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getManyMatching
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getManyMatching
*/
public function testGetManyMatching(UsersModel $random)
{
@ -304,7 +304,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testGetRandom
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getMatching
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getMatching
*/
public function testGetMatching(UsersModel $random)
{
@ -322,7 +322,7 @@ class UsersTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::deleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::deleteByField
*/
public function testDeleteByField()
{
@ -339,7 +339,7 @@ class UsersTest extends BaseTestCase
/**
* @depends testDeleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::deleteByField
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::deleteByField
* @param UsersModel[] $allDeleted
*/
public function testDeleteByFieldVerify(array $allDeleted)
@ -352,7 +352,7 @@ class UsersTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getTermPlural
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getTermPlural
*/
public function testGetTermPlural()
{
@ -360,7 +360,7 @@ class UsersTest extends BaseTestCase
}
/**
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersService::getTermSingular
* @covers \Benzine\ORM\Tests\Services\Base\BaseUsersAbstractService::getTermSingular
*/
public function testGetTermSingular()
{