From 79d76364a9098cffaa8393ec8752ddd30dfd95dd Mon Sep 17 00:00:00 2001 From: liquetsoft Date: Wed, 11 Sep 2024 19:21:03 +0200 Subject: [PATCH] Fix --- generator/ResourceTestGenerator.php | 5 +-- src/Storage/EloquentStorage.php | 42 +++++++++++------------ tests/BaseCase.php | 6 ++-- tests/Pipeline/InstallPipelineTest.php | 22 ++++++------ tests/Pipeline/UpdatePipelineTest.php | 22 ++++++------ tests/Resource/AddrObjDivisionTest.php | 4 ++- tests/Resource/AddrObjTest.php | 4 ++- tests/Resource/AddrObjTypesTest.php | 4 ++- tests/Resource/AdmHierarchyTest.php | 4 ++- tests/Resource/ApartmentTypesTest.php | 4 ++- tests/Resource/ApartmentsTest.php | 4 ++- tests/Resource/CarplacesTest.php | 4 ++- tests/Resource/ChangeHistoryTest.php | 4 ++- tests/Resource/FiasVersionTest.php | 4 ++- tests/Resource/HouseTypesTest.php | 4 ++- tests/Resource/HousesTest.php | 4 ++- tests/Resource/MunHierarchyTest.php | 4 ++- tests/Resource/NormativeDocsKindsTest.php | 4 ++- tests/Resource/NormativeDocsTest.php | 4 ++- tests/Resource/NormativeDocsTypesTest.php | 4 ++- tests/Resource/ObjectLevelsTest.php | 4 ++- tests/Resource/OperationTypesTest.php | 4 ++- tests/Resource/ParamTest.php | 4 ++- tests/Resource/ParamTypesTest.php | 4 ++- tests/Resource/ReestrObjectsTest.php | 4 ++- tests/Resource/RoomTypesTest.php | 4 ++- tests/Resource/RoomsTest.php | 4 ++- tests/Resource/SteadsTest.php | 4 ++- 28 files changed, 115 insertions(+), 74 deletions(-) diff --git a/generator/ResourceTestGenerator.php b/generator/ResourceTestGenerator.php index c5409d8..7c027a2 100644 --- a/generator/ResourceTestGenerator.php +++ b/generator/ResourceTestGenerator.php @@ -23,7 +23,8 @@ class ResourceTestGenerator extends AbstractGenerator protected function generateClassByDescriptor(EntityDescriptor $descriptor, \SplFileInfo $dir, string $namespace): void { $name = $this->unifyClassName($descriptor->getName()); - $fullPath = "{$dir->getPathname()}/{$name}Test.php"; + $testName = "{$name}Test"; + $fullPath = "{$dir->getPathname()}/{$testName}.php"; $phpFile = new PhpFile(); $phpFile->setStrictTypes(); @@ -31,7 +32,7 @@ protected function generateClassByDescriptor(EntityDescriptor $descriptor, \SplF $namespace = $phpFile->addNamespace($namespace); $this->decorateNamespace($namespace, $descriptor); - $class = $namespace->addClass($name)->setExtends(BaseCase::class); + $class = $namespace->addClass($testName)->setExtends(BaseCase::class); $this->decorateClass($class, $descriptor); file_put_contents($fullPath, (new PsrPrinter())->printFile($phpFile)); diff --git a/src/Storage/EloquentStorage.php b/src/Storage/EloquentStorage.php index 086ce6c..ef3413c 100644 --- a/src/Storage/EloquentStorage.php +++ b/src/Storage/EloquentStorage.php @@ -21,14 +21,14 @@ class EloquentStorage implements Storage * * @var int */ - protected $insertBatch; + private $insertBatch; /** * Объект для логгирования данных. * * @var LoggerInterface|null */ - protected $logger; + private $logger; /** * Сохраненные в памяти данные для множественной вставки. @@ -37,7 +37,7 @@ class EloquentStorage implements Storage * * @var array>> */ - protected $insertData = []; + private $insertData = []; /** * Сохраненные в памяти данные для множественного обновления. @@ -46,14 +46,14 @@ class EloquentStorage implements Storage * * @var array>> */ - protected $upsertData = []; + private $upsertData = []; /** * Список колонок для классов моделей. * * @var array */ - protected $columnsLists = []; + private $columnsLists = []; /** * Флаг, который обозначает, что после завершения работы нужно включить @@ -61,7 +61,7 @@ class EloquentStorage implements Storage * * @var bool */ - protected $needToEnableLogging = false; + private $needToEnableLogging = false; public function __construct(int $insertBatch = 1000, ?LoggerInterface $logger = null) { @@ -148,7 +148,7 @@ public function delete(object $entity): void } unset($persistedModel); } catch (\Throwable $e) { - throw new StorageException("Can't delete entity from storage.", 0, $e); + throw new StorageException("Can't delete entity from storage", 0, $e); } } @@ -173,15 +173,14 @@ public function truncate(string $entityClassName): void { if (!class_exists($entityClassName) || !is_subclass_of($entityClassName, Model::class)) { throw new StorageException( - "Entity class for truncating must exists and extends '" . Model::class . "'" - . "got '{$entityClassName}'." + "Entity class for truncating must exists and extends '" . Model::class . "' got '{$entityClassName}'" ); } try { $entityClassName::query()->delete(); } catch (\Throwable $e) { - throw new StorageException("Can't truncate storage.", 0, $e); + throw new StorageException("Can't truncate storage", 0, $e); } } @@ -191,7 +190,7 @@ public function truncate(string $entityClassName): void * * @throws StorageException */ - protected function checkAndFlushInsert(bool $forceInsert = false): void + private function checkAndFlushInsert(bool $forceInsert = false): void { foreach ($this->insertData as $className => $insertData) { if ($forceInsert || \count($insertData) >= $this->insertBatch) { @@ -209,7 +208,7 @@ protected function checkAndFlushInsert(bool $forceInsert = false): void * * @psalm-suppress InvalidStringClass */ - protected function checkAndFlushUpsert(bool $forceUpsert = false): void + private function checkAndFlushUpsert(bool $forceUpsert = false): void { foreach ($this->upsertData as $className => $upsertData) { if (!$forceUpsert && \count($upsertData) < $this->insertBatch) { @@ -231,7 +230,7 @@ protected function checkAndFlushUpsert(bool $forceUpsert = false): void try { $persistedModel->save(); } catch (\Throwable $e) { - throw new StorageException("Can't update item in storage.", 0, $e); + throw new StorageException("Can't update item in storage", 0, $e); } } else { $toInsert[] = $upsertItem; @@ -251,12 +250,11 @@ protected function checkAndFlushUpsert(bool $forceUpsert = false): void * * @throws StorageException */ - protected function checkIsEntityAllowedForEloquent(object $entity): Model + private function checkIsEntityAllowedForEloquent(object $entity): Model { if (!($entity instanceof Model)) { throw new StorageException( - "Entity must be instance of '" . Model::class - . "', got '" . \get_class($entity) . "'." + "Entity must be instance of '" . Model::class . "', got '" . \get_class($entity) . "'" ); } @@ -268,7 +266,7 @@ protected function checkIsEntityAllowedForEloquent(object $entity): Model * * @return array */ - protected function collectValuesFromModel(Model $entity): array + private function collectValuesFromModel(Model $entity): array { $columns = $this->getColumnsListForModel($entity); @@ -290,7 +288,7 @@ protected function collectValuesFromModel(Model $entity): array * * @return string[] */ - protected function getColumnsListForModel(Model $model): array + private function getColumnsListForModel(Model $model): array { $class = \get_class($model); @@ -312,7 +310,7 @@ protected function getColumnsListForModel(Model $model): array * * @psalm-suppress InvalidStringClass */ - protected function bulkInsert(string $className, array $data): void + private function bulkInsert(string $className, array $data): void { try { $className::insert($data); @@ -330,7 +328,7 @@ protected function bulkInsert(string $className, array $data): void * * @psalm-suppress InvalidStringClass */ - protected function bulkInsertFallback(string $className, array $data): void + private function bulkInsertFallback(string $className, array $data): void { foreach ($data as $item) { try { @@ -338,7 +336,7 @@ protected function bulkInsertFallback(string $className, array $data): void } catch (\Throwable $e) { $this->log( LogLevel::ERROR, - "Error while inserting item of class '{$className}' to eloquent storage. Item wasn't proceed.", + "Error while inserting item of class '{$className}' to eloquent storage. Item wasn't proceed", [ 'item' => $item, 'error_message' => $e->getMessage(), @@ -351,7 +349,7 @@ protected function bulkInsertFallback(string $className, array $data): void /** * Запись сообщения в лог. */ - protected function log(string $errorLevel, string $message, array $context = []): void + private function log(string $errorLevel, string $message, array $context = []): void { if ($this->logger) { $this->logger->log($errorLevel, $message, $context); diff --git a/tests/BaseCase.php b/tests/BaseCase.php index beed58e..a0bf96b 100644 --- a/tests/BaseCase.php +++ b/tests/BaseCase.php @@ -17,11 +17,11 @@ */ abstract class BaseCase extends TestCase { - private ?Generator $faker; + private ?Generator $faker = null; - private ?FileSystemHelperInterface $fs; + private ?FileSystemHelperInterface $fs = null; - private ?string $tempDir; + private ?string $tempDir = null; /** * Возвращает объект php faker для генерации случайных данных. diff --git a/tests/Pipeline/InstallPipelineTest.php b/tests/Pipeline/InstallPipelineTest.php index cdde118..cc17651 100644 --- a/tests/Pipeline/InstallPipelineTest.php +++ b/tests/Pipeline/InstallPipelineTest.php @@ -8,7 +8,6 @@ use Liquetsoft\Fias\Component\EntityField\BaseEntityField; use Liquetsoft\Fias\Component\EntityManager\BaseEntityManager; use Liquetsoft\Fias\Component\EntityRegistry\ArrayEntityRegistry; -use Liquetsoft\Fias\Component\FiasInformer\InformerResponse; use Liquetsoft\Fias\Component\Pipeline\Pipe\ArrayPipe; use Liquetsoft\Fias\Component\Pipeline\Pipe\Pipe; use Liquetsoft\Fias\Component\Pipeline\State\ArrayState; @@ -67,7 +66,10 @@ protected function setUp(): void 'type' => 'integer', 'primary' => true, ], - 'url' => [ + 'fullurl' => [ + 'type' => 'string', + ], + 'deltaurl' => [ 'type' => 'string', ], 'created_at' => [ @@ -86,17 +88,14 @@ public function testInstall(): void $testArchive = "{$testDir}/install.zip"; copy(__DIR__ . '/_fixtures/install.zip', $testArchive); - $version = $this->createFakeData()->numberBetween(1, 1000); - $versionUrl = $this->createFakeData()->url(); - $versionInfo = $this->getMockBuilder(InformerResponse::class)->getMock(); - $versionInfo->method('getVersion')->willReturn($version); - $versionInfo->method('getUrl')->willReturn($versionUrl); - $versionInfo->method('hasResult')->willReturn(true); + $version = 123; + $versionUrl = 'https://test.test/full'; $state = new ArrayState(); - $state->setAndLockParameter(StateParameter::DOWNLOAD_TO_FILE, new \SplFileInfo($testArchive)); - $state->setAndLockParameter(StateParameter::EXTRACT_TO_FOLDER, new \SplFileInfo($testDir)); - $state->setAndLockParameter(StateParameter::FIAS_INFO, $versionInfo); + $state->setAndLockParameter(StateParameter::PATH_TO_DOWNLOAD_FILE, $testArchive); + $state->setAndLockParameter(StateParameter::PATH_TO_EXTRACT_FOLDER, $testDir); + $state->setAndLockParameter(StateParameter::FIAS_NEXT_VERSION_NUMBER, $version); + $state->setAndLockParameter(StateParameter::FIAS_VERSION_ARCHIVE_URL, $versionUrl); $pipeline = $this->createPipeLine(); $pipeline->run($state); @@ -106,7 +105,6 @@ public function testInstall(): void 'fias_laravel_fias_version', [ 'version' => $version, - 'url' => $versionUrl, ] ); $this->assertDatabaseHasRow( diff --git a/tests/Pipeline/UpdatePipelineTest.php b/tests/Pipeline/UpdatePipelineTest.php index e43c99d..855ca47 100644 --- a/tests/Pipeline/UpdatePipelineTest.php +++ b/tests/Pipeline/UpdatePipelineTest.php @@ -8,7 +8,6 @@ use Liquetsoft\Fias\Component\EntityField\BaseEntityField; use Liquetsoft\Fias\Component\EntityManager\BaseEntityManager; use Liquetsoft\Fias\Component\EntityRegistry\ArrayEntityRegistry; -use Liquetsoft\Fias\Component\FiasInformer\InformerResponse; use Liquetsoft\Fias\Component\Pipeline\Pipe\ArrayPipe; use Liquetsoft\Fias\Component\Pipeline\Pipe\Pipe; use Liquetsoft\Fias\Component\Pipeline\State\ArrayState; @@ -66,7 +65,10 @@ protected function setUp(): void 'type' => 'integer', 'primary' => true, ], - 'url' => [ + 'fullurl' => [ + 'type' => 'string', + ], + 'deltaurl' => [ 'type' => 'string', ], 'created_at' => [ @@ -85,17 +87,14 @@ public function testUpdate(): void $testArchive = "{$testDir}/update.zip"; copy(__DIR__ . '/_fixtures/update.zip', $testArchive); - $version = $this->createFakeData()->numberBetween(1, 1000); - $versionUrl = $this->createFakeData()->url(); - $versionInfo = $this->getMockBuilder(InformerResponse::class)->getMock(); - $versionInfo->method('getVersion')->willReturn($version); - $versionInfo->method('getUrl')->willReturn($versionUrl); - $versionInfo->method('hasResult')->willReturn(true); + $version = 123; + $versionUrl = 'https://test.test/full'; $state = new ArrayState(); - $state->setAndLockParameter(StateParameter::DOWNLOAD_TO_FILE, new \SplFileInfo($testArchive)); - $state->setAndLockParameter(StateParameter::EXTRACT_TO_FOLDER, new \SplFileInfo($testDir)); - $state->setAndLockParameter(StateParameter::FIAS_INFO, $versionInfo); + $state->setAndLockParameter(StateParameter::PATH_TO_DOWNLOAD_FILE, $testArchive); + $state->setAndLockParameter(StateParameter::PATH_TO_EXTRACT_FOLDER, $testDir); + $state->setAndLockParameter(StateParameter::FIAS_NEXT_VERSION_NUMBER, $version); + $state->setAndLockParameter(StateParameter::FIAS_VERSION_ARCHIVE_URL, $versionUrl); $pipeline = $this->createPipeLine(); $pipeline->run($state); @@ -105,7 +104,6 @@ public function testUpdate(): void 'fias_laravel_fias_version', [ 'version' => $version, - 'url' => $versionUrl, ] ); $this->assertDatabaseHasRow( diff --git a/tests/Resource/AddrObjDivisionTest.php b/tests/Resource/AddrObjDivisionTest.php index 6f819eb..e103921 100644 --- a/tests/Resource/AddrObjDivisionTest.php +++ b/tests/Resource/AddrObjDivisionTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'AddrObjDivision'. + * + * @internal */ -class AddrObjDivision extends BaseCase +class AddrObjDivisionTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/AddrObjTest.php b/tests/Resource/AddrObjTest.php index 243b108..4247757 100644 --- a/tests/Resource/AddrObjTest.php +++ b/tests/Resource/AddrObjTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'AddrObj'. + * + * @internal */ -class AddrObj extends BaseCase +class AddrObjTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/AddrObjTypesTest.php b/tests/Resource/AddrObjTypesTest.php index 126a625..95a185b 100644 --- a/tests/Resource/AddrObjTypesTest.php +++ b/tests/Resource/AddrObjTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'AddrObjTypes'. + * + * @internal */ -class AddrObjTypes extends BaseCase +class AddrObjTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/AdmHierarchyTest.php b/tests/Resource/AdmHierarchyTest.php index d8c1b45..e62d195 100644 --- a/tests/Resource/AdmHierarchyTest.php +++ b/tests/Resource/AdmHierarchyTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'AdmHierarchy'. + * + * @internal */ -class AdmHierarchy extends BaseCase +class AdmHierarchyTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ApartmentTypesTest.php b/tests/Resource/ApartmentTypesTest.php index 002dd65..7d0056c 100644 --- a/tests/Resource/ApartmentTypesTest.php +++ b/tests/Resource/ApartmentTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'ApartmentTypes'. + * + * @internal */ -class ApartmentTypes extends BaseCase +class ApartmentTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ApartmentsTest.php b/tests/Resource/ApartmentsTest.php index 496a348..a525e9a 100644 --- a/tests/Resource/ApartmentsTest.php +++ b/tests/Resource/ApartmentsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'Apartments'. + * + * @internal */ -class Apartments extends BaseCase +class ApartmentsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/CarplacesTest.php b/tests/Resource/CarplacesTest.php index 4daeb5d..e20c4b2 100644 --- a/tests/Resource/CarplacesTest.php +++ b/tests/Resource/CarplacesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'Carplaces'. + * + * @internal */ -class Carplaces extends BaseCase +class CarplacesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ChangeHistoryTest.php b/tests/Resource/ChangeHistoryTest.php index a3350b8..89be5d2 100644 --- a/tests/Resource/ChangeHistoryTest.php +++ b/tests/Resource/ChangeHistoryTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'ChangeHistory'. + * + * @internal */ -class ChangeHistory extends BaseCase +class ChangeHistoryTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/FiasVersionTest.php b/tests/Resource/FiasVersionTest.php index 188df14..9dedec5 100644 --- a/tests/Resource/FiasVersionTest.php +++ b/tests/Resource/FiasVersionTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'FiasVersion'. + * + * @internal */ -class FiasVersion extends BaseCase +class FiasVersionTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/HouseTypesTest.php b/tests/Resource/HouseTypesTest.php index 25a523f..28c17b8 100644 --- a/tests/Resource/HouseTypesTest.php +++ b/tests/Resource/HouseTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'HouseTypes'. + * + * @internal */ -class HouseTypes extends BaseCase +class HouseTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/HousesTest.php b/tests/Resource/HousesTest.php index 6d883cf..fd4a45c 100644 --- a/tests/Resource/HousesTest.php +++ b/tests/Resource/HousesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'Houses'. + * + * @internal */ -class Houses extends BaseCase +class HousesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/MunHierarchyTest.php b/tests/Resource/MunHierarchyTest.php index 9b39229..d9d9044 100644 --- a/tests/Resource/MunHierarchyTest.php +++ b/tests/Resource/MunHierarchyTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'MunHierarchy'. + * + * @internal */ -class MunHierarchy extends BaseCase +class MunHierarchyTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/NormativeDocsKindsTest.php b/tests/Resource/NormativeDocsKindsTest.php index b8da3c4..46aae2f 100644 --- a/tests/Resource/NormativeDocsKindsTest.php +++ b/tests/Resource/NormativeDocsKindsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'NormativeDocsKinds'. + * + * @internal */ -class NormativeDocsKinds extends BaseCase +class NormativeDocsKindsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/NormativeDocsTest.php b/tests/Resource/NormativeDocsTest.php index fb80cf1..9ee5d89 100644 --- a/tests/Resource/NormativeDocsTest.php +++ b/tests/Resource/NormativeDocsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'NormativeDocs'. + * + * @internal */ -class NormativeDocs extends BaseCase +class NormativeDocsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/NormativeDocsTypesTest.php b/tests/Resource/NormativeDocsTypesTest.php index cad8a64..115d242 100644 --- a/tests/Resource/NormativeDocsTypesTest.php +++ b/tests/Resource/NormativeDocsTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'NormativeDocsTypes'. + * + * @internal */ -class NormativeDocsTypes extends BaseCase +class NormativeDocsTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ObjectLevelsTest.php b/tests/Resource/ObjectLevelsTest.php index adf1a02..badcd46 100644 --- a/tests/Resource/ObjectLevelsTest.php +++ b/tests/Resource/ObjectLevelsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'ObjectLevels'. + * + * @internal */ -class ObjectLevels extends BaseCase +class ObjectLevelsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/OperationTypesTest.php b/tests/Resource/OperationTypesTest.php index 15e6c47..2025df3 100644 --- a/tests/Resource/OperationTypesTest.php +++ b/tests/Resource/OperationTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'OperationTypes'. + * + * @internal */ -class OperationTypes extends BaseCase +class OperationTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ParamTest.php b/tests/Resource/ParamTest.php index 6050a71..423138d 100644 --- a/tests/Resource/ParamTest.php +++ b/tests/Resource/ParamTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'Param'. + * + * @internal */ -class Param extends BaseCase +class ParamTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ParamTypesTest.php b/tests/Resource/ParamTypesTest.php index 3835074..8c5af7c 100644 --- a/tests/Resource/ParamTypesTest.php +++ b/tests/Resource/ParamTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'ParamTypes'. + * + * @internal */ -class ParamTypes extends BaseCase +class ParamTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/ReestrObjectsTest.php b/tests/Resource/ReestrObjectsTest.php index 16d9027..5855c68 100644 --- a/tests/Resource/ReestrObjectsTest.php +++ b/tests/Resource/ReestrObjectsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'ReestrObjects'. + * + * @internal */ -class ReestrObjects extends BaseCase +class ReestrObjectsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/RoomTypesTest.php b/tests/Resource/RoomTypesTest.php index 69c1860..26c7b4f 100644 --- a/tests/Resource/RoomTypesTest.php +++ b/tests/Resource/RoomTypesTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'RoomTypes'. + * + * @internal */ -class RoomTypes extends BaseCase +class RoomTypesTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/RoomsTest.php b/tests/Resource/RoomsTest.php index 4b442d8..cdec3ec 100644 --- a/tests/Resource/RoomsTest.php +++ b/tests/Resource/RoomsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'Rooms'. + * + * @internal */ -class Rooms extends BaseCase +class RoomsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив. diff --git a/tests/Resource/SteadsTest.php b/tests/Resource/SteadsTest.php index 7dc5fa0..60119e0 100644 --- a/tests/Resource/SteadsTest.php +++ b/tests/Resource/SteadsTest.php @@ -10,8 +10,10 @@ /** * Тест ресурса для сущности 'Steads'. + * + * @internal */ -class Steads extends BaseCase +class SteadsTest extends BaseCase { /** * Проверяет, что ресурс верно преобразует сущность в массив.