diff --git a/CHANGELOG.md b/CHANGELOG.md index c7b47dec..3a885952 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,10 @@ - Uses `Dotenv::createArrayBacked()` for isolated, deterministic env loading - New `environment()` helper function and shorthand check methods: `isProduction()`, `isTesting()`, `isStaging()`, `isDevelopment()`, `isLocal()` - `env()` helper now delegates through `environment()->getValue()` +- **BREAKING:** Renamed `Quantum\\Service\\QtService` to `Quantum\\Service\\Service` (#500) +- **BREAKING:** Renamed `Quantum\\Middleware\\QtMiddleware` to `Quantum\\Middleware\\Middleware` (#500) +- **BREAKING:** Renamed `Quantum\\Migration\\QtMigration` to `Quantum\\Migration\\Migration` (#500) +- **BREAKING:** Renamed `Quantum\\Console\\QtCommand` to `Quantum\\Console\\CliCommand` (#500) - **BREAKING:** Minimum PHP version requirement raised from 7.3 to 7.4 - Modernized codebase with PHP 7.4+ syntax using Rector: diff --git a/src/Auth/Factories/AuthFactory.php b/src/Auth/Factories/AuthFactory.php index 80dff5f2..5ea1bd75 100644 --- a/src/Auth/Factories/AuthFactory.php +++ b/src/Auth/Factories/AuthFactory.php @@ -27,7 +27,7 @@ use Quantum\Auth\Adapters\JwtAuthAdapter; use Quantum\Di\Exceptions\DiException; use Quantum\Auth\Enums\AuthType; -use Quantum\Service\QtService; +use Quantum\Service\Service; use Quantum\Hasher\Hasher; use Quantum\Jwt\JwtToken; use Quantum\Loader\Setup; @@ -126,7 +126,7 @@ private function createAuthService(string $adapter): AuthServiceInterface { $authServiceClass = config()->get('auth.' . $adapter . '.service'); - /** @var class-string $authServiceClass */ + /** @var class-string $authServiceClass */ $authService = ServiceFactory::create($authServiceClass); if (!$authService instanceof AuthServiceInterface) { diff --git a/src/Console/QtCommand.php b/src/Console/CliCommand.php similarity index 98% rename from src/Console/QtCommand.php rename to src/Console/CliCommand.php index 4ec38fa0..4a6e20b4 100644 --- a/src/Console/QtCommand.php +++ b/src/Console/CliCommand.php @@ -26,10 +26,10 @@ use RuntimeException; /** - * Class QtCommand + * Class CliCommand * @package Quantum\Console */ -abstract class QtCommand extends Command implements CommandInterface +abstract class CliCommand extends Command implements CommandInterface { /** * Console command name @@ -65,7 +65,7 @@ abstract class QtCommand extends Command implements CommandInterface protected ?OutputInterface $output = null; /** - * QtCommand constructor. + * CliCommand constructor. */ public function __construct() { diff --git a/src/Console/CommandDiscovery.php b/src/Console/CommandDiscovery.php index 16bb17fa..0d2ff0c2 100644 --- a/src/Console/CommandDiscovery.php +++ b/src/Console/CommandDiscovery.php @@ -42,7 +42,7 @@ public static function discover(string $directory, string $namespace): array $commandReflection = new ReflectionClass($commandClass); - if (!$commandReflection->isInstantiable() || !$commandReflection->isSubclassOf(QtCommand::class)) { + if (!$commandReflection->isInstantiable() || !$commandReflection->isSubclassOf(CliCommand::class)) { continue; } diff --git a/src/Console/Commands/CronRunCommand.php b/src/Console/Commands/CronRunCommand.php index c6c22c50..ebb1b1e6 100644 --- a/src/Console/Commands/CronRunCommand.php +++ b/src/Console/Commands/CronRunCommand.php @@ -20,7 +20,7 @@ use Quantum\Cron\Exceptions\CronException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use Quantum\Cron\CronManager; use ReflectionException; use Throwable; @@ -29,7 +29,7 @@ * Class CronRunCommand * @package Quantum\Console */ -class CronRunCommand extends QtCommand +class CronRunCommand extends CliCommand { /** * The console command name. diff --git a/src/Console/Commands/DebugBarCommand.php b/src/Console/Commands/DebugBarCommand.php index ba501c48..38c382ed 100644 --- a/src/Console/Commands/DebugBarCommand.php +++ b/src/Console/Commands/DebugBarCommand.php @@ -20,14 +20,14 @@ use Quantum\Storage\Factories\FileSystemFactory; use Quantum\App\Exceptions\BaseException; use Quantum\Storage\FileSystem; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use ReflectionException; /** * Class DebugBarAssetsCommand * @package Quantum\Console */ -class DebugBarCommand extends QtCommand +class DebugBarCommand extends CliCommand { /** * File System diff --git a/src/Console/Commands/EnvCommand.php b/src/Console/Commands/EnvCommand.php index 83d982d7..69c22efc 100644 --- a/src/Console/Commands/EnvCommand.php +++ b/src/Console/Commands/EnvCommand.php @@ -20,7 +20,7 @@ use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use ReflectionException; use Quantum\App\App; @@ -28,7 +28,7 @@ * Class EnvCommand * @package Quantum\Console */ -class EnvCommand extends QtCommand +class EnvCommand extends CliCommand { /** * Command name diff --git a/src/Console/Commands/InstallToolkitCommand.php b/src/Console/Commands/InstallToolkitCommand.php index 8f0fcd38..f394abba 100644 --- a/src/Console/Commands/InstallToolkitCommand.php +++ b/src/Console/Commands/InstallToolkitCommand.php @@ -23,7 +23,7 @@ use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use ReflectionException; use RuntimeException; @@ -31,7 +31,7 @@ * Class InstallToolkitCommand * @package Quantum\Console */ -class InstallToolkitCommand extends QtCommand +class InstallToolkitCommand extends CliCommand { /** * Command name diff --git a/src/Console/Commands/KeyGenerateCommand.php b/src/Console/Commands/KeyGenerateCommand.php index e18c8b34..ce2dc50a 100644 --- a/src/Console/Commands/KeyGenerateCommand.php +++ b/src/Console/Commands/KeyGenerateCommand.php @@ -17,14 +17,14 @@ namespace Quantum\Console\Commands; use Quantum\Environment\Exceptions\EnvException; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use Exception; /** * Class KeyGenerateCommand * @package Quantum\Console */ -class KeyGenerateCommand extends QtCommand +class KeyGenerateCommand extends CliCommand { /** * Command name diff --git a/src/Console/Commands/MigrationGenerateCommand.php b/src/Console/Commands/MigrationGenerateCommand.php index 1cb21f8e..3f386aa9 100644 --- a/src/Console/Commands/MigrationGenerateCommand.php +++ b/src/Console/Commands/MigrationGenerateCommand.php @@ -18,13 +18,13 @@ use Quantum\Migration\Exceptions\MigrationException; use Quantum\Migration\MigrationManager; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; /** * Class MigrationGenerateCommand * @package Quantum\Console */ -class MigrationGenerateCommand extends QtCommand +class MigrationGenerateCommand extends CliCommand { /** * The console command name. diff --git a/src/Console/Commands/MigrationMigrateCommand.php b/src/Console/Commands/MigrationMigrateCommand.php index 57e1d329..b9237955 100644 --- a/src/Console/Commands/MigrationMigrateCommand.php +++ b/src/Console/Commands/MigrationMigrateCommand.php @@ -20,13 +20,13 @@ use Quantum\Database\Exceptions\DatabaseException; use Quantum\App\Exceptions\BaseException; use Quantum\Migration\MigrationManager; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; /** * Class MigrationMigrateCommand * @package Quantum\Console */ -class MigrationMigrateCommand extends QtCommand +class MigrationMigrateCommand extends CliCommand { /** * The console command name. diff --git a/src/Console/Commands/ModuleGenerateCommand.php b/src/Console/Commands/ModuleGenerateCommand.php index 3310b349..8c9b5d64 100644 --- a/src/Console/Commands/ModuleGenerateCommand.php +++ b/src/Console/Commands/ModuleGenerateCommand.php @@ -18,14 +18,14 @@ use Symfony\Component\VarExporter\Exception\ExceptionInterface; use Quantum\Module\ModuleManager; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use Exception; /** * Class ModuleGenerateCommand * @package Quantum\Console\Commands */ -class ModuleGenerateCommand extends QtCommand +class ModuleGenerateCommand extends CliCommand { /** * Command name diff --git a/src/Console/Commands/OpenApiCommand.php b/src/Console/Commands/OpenApiCommand.php index e8dc1c41..d13b866b 100644 --- a/src/Console/Commands/OpenApiCommand.php +++ b/src/Console/Commands/OpenApiCommand.php @@ -25,7 +25,7 @@ use Quantum\Module\ModuleLoader; use Quantum\Router\RouteBuilder; use Quantum\Storage\FileSystem; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use ReflectionException; use OpenApi\Generator; use Quantum\Di\Di; @@ -34,7 +34,7 @@ * Class OpenApiUiAssetsCommand * @package Quantum\Console */ -class OpenApiCommand extends QtCommand +class OpenApiCommand extends CliCommand { /** * File System diff --git a/src/Console/Commands/ResourceCacheClearCommand.php b/src/Console/Commands/ResourceCacheClearCommand.php index 25ccebb5..2401f505 100644 --- a/src/Console/Commands/ResourceCacheClearCommand.php +++ b/src/Console/Commands/ResourceCacheClearCommand.php @@ -22,7 +22,7 @@ use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; use Quantum\Storage\FileSystem; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use Quantum\Loader\Setup; use ReflectionException; use Exception; @@ -31,7 +31,7 @@ * Class ResourceCacheClearCommand * @package Quantum\Console */ -class ResourceCacheClearCommand extends QtCommand +class ResourceCacheClearCommand extends CliCommand { /** * Command name diff --git a/src/Console/Commands/RouteListCommand.php b/src/Console/Commands/RouteListCommand.php index 40005c6d..49370356 100644 --- a/src/Console/Commands/RouteListCommand.php +++ b/src/Console/Commands/RouteListCommand.php @@ -23,7 +23,7 @@ use Quantum\Router\RouteCollection; use Quantum\Router\RouteBuilder; use Quantum\Module\ModuleLoader; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use Quantum\Router\Route; use ReflectionException; use Quantum\Di\Di; @@ -32,7 +32,7 @@ * Class RouteListCommand * @package Quantum\Console */ -class RouteListCommand extends QtCommand +class RouteListCommand extends CliCommand { /** * The console command name. diff --git a/src/Console/Commands/ServeCommand.php b/src/Console/Commands/ServeCommand.php index 6027a158..84b48abc 100644 --- a/src/Console/Commands/ServeCommand.php +++ b/src/Console/Commands/ServeCommand.php @@ -16,7 +16,7 @@ namespace Quantum\Console\Commands; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use RuntimeException; use Throwable; @@ -24,7 +24,7 @@ * Class ServeCommand * @package Quantum\Console */ -class ServeCommand extends QtCommand +class ServeCommand extends CliCommand { /** * Platform Windows diff --git a/src/Console/Commands/VersionCommand.php b/src/Console/Commands/VersionCommand.php index dbae807d..ac762efa 100644 --- a/src/Console/Commands/VersionCommand.php +++ b/src/Console/Commands/VersionCommand.php @@ -16,14 +16,14 @@ namespace Quantum\Console\Commands; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; use Povils\Figlet\Figlet; /** * Class VersionCommand * @package Quantum\Console */ -class VersionCommand extends QtCommand +class VersionCommand extends CliCommand { /** * Command name diff --git a/src/Middleware/QtMiddleware.php b/src/Middleware/Middleware.php similarity index 92% rename from src/Middleware/QtMiddleware.php rename to src/Middleware/Middleware.php index 5dd6cbaa..23cd8f47 100644 --- a/src/Middleware/QtMiddleware.php +++ b/src/Middleware/Middleware.php @@ -21,10 +21,10 @@ use Closure; /** - * Class QtMiddleware + * Class Middleware * @package Quantum\Middleware */ -abstract class QtMiddleware +abstract class Middleware { /** * Applies the middleware diff --git a/src/Middleware/MiddlewareManager.php b/src/Middleware/MiddlewareManager.php index 570adf84..8d7052ed 100644 --- a/src/Middleware/MiddlewareManager.php +++ b/src/Middleware/MiddlewareManager.php @@ -67,9 +67,9 @@ public function applyMiddlewares(Request $request, Closure $terminal): Response /** * Loads and gets the current middleware instance - * @throws MiddlewareException|BaseException|ReflectionException + * @throws MiddlewareException|BaseException */ - private function getMiddleware(Request $request): QtMiddleware + private function getMiddleware(Request $request): Middleware { $middlewareClass = request()->getModuleBaseNamespace() . '\\' . $this->module . '\\Middlewares\\' . current($this->middlewares); @@ -79,8 +79,8 @@ private function getMiddleware(Request $request): QtMiddleware $middleware = new $middlewareClass($request); - if (!$middleware instanceof QtMiddleware) { - throw MiddlewareException::notInstanceOf($middlewareClass, QtMiddleware::class); + if (!$middleware instanceof Middleware) { + throw MiddlewareException::notInstanceOf($middlewareClass, Middleware::class); } return $middleware; diff --git a/src/Migration/Enums/ExceptionMessages.php b/src/Migration/Enums/ExceptionMessages.php index 361c6f80..e40bec7a 100644 --- a/src/Migration/Enums/ExceptionMessages.php +++ b/src/Migration/Enums/ExceptionMessages.php @@ -30,5 +30,5 @@ final class ExceptionMessages extends BaseExceptionMessages public const NOTHING_TO_MIGRATE = 'Nothing to migrate'; - public const INVALID_MIGRATION_CLASS = 'Migration class `{%1}` must extend QtMigration'; + public const INVALID_MIGRATION_CLASS = 'Migration class `{%1}` must extend Migration'; } diff --git a/src/Migration/QtMigration.php b/src/Migration/Migration.php similarity index 93% rename from src/Migration/QtMigration.php rename to src/Migration/Migration.php index 1bcea4e2..dc106a46 100644 --- a/src/Migration/QtMigration.php +++ b/src/Migration/Migration.php @@ -19,10 +19,10 @@ use Quantum\Database\Factories\TableFactory; /** - * Class QtMigration + * Class Migration * @package Quantum\Migration */ -abstract class QtMigration +abstract class Migration { /** * Upgrades with the specified migration class diff --git a/src/Migration/MigrationManager.php b/src/Migration/MigrationManager.php index 982583b2..18233e14 100644 --- a/src/Migration/MigrationManager.php +++ b/src/Migration/MigrationManager.php @@ -158,7 +158,7 @@ private function upgrade(): int $migration = new $migrationClassName(); - if (!$migration instanceof QtMigration) { + if (!$migration instanceof Migration) { throw MigrationException::invalidMigrationClass($migrationClassName); } @@ -195,7 +195,7 @@ private function downgrade(?int $step): int $migration = new $migrationClassName(); - if (!$migration instanceof QtMigration) { + if (!$migration instanceof Migration) { throw MigrationException::invalidMigrationClass($migrationClassName); } diff --git a/src/Migration/MigrationTable.php b/src/Migration/MigrationTable.php index edefeedc..63ed5cc3 100644 --- a/src/Migration/MigrationTable.php +++ b/src/Migration/MigrationTable.php @@ -24,7 +24,7 @@ * Class MigrationTable * @package Quantum\Migration */ -class MigrationTable extends QtMigration +class MigrationTable extends Migration { /** * Migrations table name diff --git a/src/Migration/Templates/MigrationTemplate.php b/src/Migration/Templates/MigrationTemplate.php index f482301c..b0d18ade 100644 --- a/src/Migration/Templates/MigrationTemplate.php +++ b/src/Migration/Templates/MigrationTemplate.php @@ -30,9 +30,10 @@ public static function create(string $className, string $tableName): string return 'emailService->deleteEmail($emailId); - redirect(base_url(true) . '/emails'); + return redirect(base_url(true) . '/emails'); } } diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl index c4c671dc..c970c1f2 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BaseMiddleware.php.tpl @@ -14,7 +14,7 @@ namespace Modules\Toolkit\Middlewares; -use Quantum\Middleware\QtMiddleware; +use Quantum\Middleware\Middleware; use Quantum\Validation\Validator; use Quantum\Http\Response; use Quantum\Http\Request; @@ -23,7 +23,7 @@ use Quantum\Http\Request; * Class BaseMiddleware * @package Modules\{{MODULE_NAME}} */ -abstract class BaseMiddleware extends QtMiddleware +abstract class BaseMiddleware extends Middleware { protected Validator $validator; diff --git a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl index 19e2b8d9..e99fbd93 100644 --- a/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl +++ b/src/Module/Templates/Toolkit/src/Middlewares/BasicAuth.php.tpl @@ -14,7 +14,7 @@ namespace Modules\Toolkit\Middlewares; -use Quantum\Middleware\QtMiddleware; +use Quantum\Middleware\Middleware; use Quantum\Loader\Setup; use Quantum\Http\Response; use Quantum\Http\Request; @@ -24,7 +24,7 @@ use Closure; * Class BasicAuth * @package Modules\Toolkit */ -class BasicAuth extends QtMiddleware +class BasicAuth extends Middleware { public function apply(Request $request, Closure $next): Response { diff --git a/src/Module/Templates/Toolkit/src/Services/DashboardService.php.tpl b/src/Module/Templates/Toolkit/src/Services/DashboardService.php.tpl index 431ee978..e3bfcd57 100644 --- a/src/Module/Templates/Toolkit/src/Services/DashboardService.php.tpl +++ b/src/Module/Templates/Toolkit/src/Services/DashboardService.php.tpl @@ -14,13 +14,13 @@ namespace Modules\Toolkit\Services; -use Quantum\Service\QtService; +use Quantum\Service\Service; /** * Class DashboardService * @package Modules\Toolkit */ -class DashboardService extends QtService +class DashboardService extends Service { public function __construct() { diff --git a/src/Module/Templates/Toolkit/src/Services/DatabaseService.php.tpl b/src/Module/Templates/Toolkit/src/Services/DatabaseService.php.tpl index f76148da..cf513b2c 100644 --- a/src/Module/Templates/Toolkit/src/Services/DatabaseService.php.tpl +++ b/src/Module/Templates/Toolkit/src/Services/DatabaseService.php.tpl @@ -19,14 +19,14 @@ use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; use Quantum\Paginator\Paginator; -use Quantum\Service\QtService; +use Quantum\Service\Service; use ReflectionException; /** * Class DatabaseService * @package Modules\Toolkit */ -class DatabaseService extends QtService +class DatabaseService extends Service { /** * @var string diff --git a/src/Module/Templates/Toolkit/src/Services/EmailService.php.tpl b/src/Module/Templates/Toolkit/src/Services/EmailService.php.tpl index df3a33b8..5d352228 100644 --- a/src/Module/Templates/Toolkit/src/Services/EmailService.php.tpl +++ b/src/Module/Templates/Toolkit/src/Services/EmailService.php.tpl @@ -20,7 +20,7 @@ use Quantum\Paginator\Factories\PaginatorFactory; use Quantum\Paginator\Enums\PaginatorType; use Quantum\App\Exceptions\BaseException; use Quantum\Paginator\Paginator; -use Quantum\Service\QtService; +use Quantum\Service\Service; use Quantum\Mailer\MailTrap; use ReflectionException; use Quantum\Di\Di; @@ -29,7 +29,7 @@ use Quantum\Di\Di; * Class EmailService * @package Modules\Toolkit */ -class EmailService extends QtService +class EmailService extends Service { /** * @var string diff --git a/src/Module/Templates/Toolkit/src/Services/LogsService.php.tpl b/src/Module/Templates/Toolkit/src/Services/LogsService.php.tpl index 4d29add8..6b01f784 100644 --- a/src/Module/Templates/Toolkit/src/Services/LogsService.php.tpl +++ b/src/Module/Templates/Toolkit/src/Services/LogsService.php.tpl @@ -21,14 +21,14 @@ use Quantum\Paginator\Enums\PaginatorType; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; use Quantum\Paginator\Paginator; -use Quantum\Service\QtService; +use Quantum\Service\Service; use ReflectionException; /** * Class LogsService * @package Modules\Toolkit */ -class LogsService extends QtService +class LogsService extends Service { /** * Retrieves a list of available log file names from the logs directory. diff --git a/src/Service/Factories/ServiceFactory.php b/src/Service/Factories/ServiceFactory.php index b800fbe0..a629d352 100644 --- a/src/Service/Factories/ServiceFactory.php +++ b/src/Service/Factories/ServiceFactory.php @@ -19,7 +19,7 @@ use Quantum\Service\Exceptions\ServiceException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Service\QtService; +use Quantum\Service\Service; use ReflectionException; use Quantum\Di\Di; @@ -31,7 +31,7 @@ class ServiceFactory { /** * Creates and initiates the service once - * @template T of QtService + * @template T of Service * @param class-string $serviceClass * @param array $args * @return T @@ -40,7 +40,7 @@ class ServiceFactory * @throws ReflectionException * @throws ServiceException */ - public static function get(string $serviceClass, array $args = []): QtService + public static function get(string $serviceClass, array $args = []): Service { self::validate($serviceClass); @@ -53,7 +53,7 @@ public static function get(string $serviceClass, array $args = []): QtService /** * Creates new service instance - * @template T of QtService + * @template T of Service * @param class-string $serviceClass * @param array $args * @return T @@ -62,7 +62,7 @@ public static function get(string $serviceClass, array $args = []): QtService * @throws ReflectionException * @throws ServiceException */ - public static function create(string $serviceClass, array $args = []): QtService + public static function create(string $serviceClass, array $args = []): Service { self::validate($serviceClass); @@ -80,8 +80,8 @@ private static function validate(string $serviceClass): void throw ServiceException::notFound('Service', $serviceClass); } - if (!is_subclass_of($serviceClass, QtService::class)) { - throw ServiceException::notInstanceOf($serviceClass, QtService::class); + if (!is_subclass_of($serviceClass, Service::class)) { + throw ServiceException::notInstanceOf($serviceClass, Service::class); } } } diff --git a/src/Service/Helpers/service.php b/src/Service/Helpers/service.php index fb377fbe..3a4810a3 100644 --- a/src/Service/Helpers/service.php +++ b/src/Service/Helpers/service.php @@ -16,7 +16,7 @@ use Quantum\Service\Factories\ServiceFactory; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Service\QtService; +use Quantum\Service\Service; /** * Gets or creates service instance @@ -26,9 +26,9 @@ * @throws DiException * @throws ReflectionException * @throws ServiceException - * @template T of QtService + * @template T of Service */ -function service(string $serviceClass, bool $singleton = false): QtService +function service(string $serviceClass, bool $singleton = false): Service { return $singleton ? ServiceFactory::get($serviceClass) : ServiceFactory::create($serviceClass); } diff --git a/src/Service/QtService.php b/src/Service/Service.php similarity index 85% rename from src/Service/QtService.php rename to src/Service/Service.php index 81f7a4f2..869238f6 100644 --- a/src/Service/QtService.php +++ b/src/Service/Service.php @@ -20,10 +20,10 @@ use Quantum\App\Exceptions\BaseException; /** - * Class QtService + * Class Service * @package Quantum\Service */ -class QtService +abstract class Service { /** * Handles the missing methods of the service @@ -33,6 +33,6 @@ class QtService */ public function __call(string $method, array $arguments) { - throw ServiceException::methodNotSupported($method, QtService::class); + throw ServiceException::methodNotSupported($method, Service::class); } } diff --git a/src/Storage/Factories/FileSystemFactory.php b/src/Storage/Factories/FileSystemFactory.php index 3c20a8ee..f7c9ab75 100644 --- a/src/Storage/Factories/FileSystemFactory.php +++ b/src/Storage/Factories/FileSystemFactory.php @@ -143,7 +143,7 @@ private function createTokenService(string $adapter): TokenServiceInterface { $serviceClass = (string) config()->get('fs.' . $adapter . '.service'); - /** @var class-string<\Quantum\Service\QtService> $serviceClass */ + /** @var class-string<\Quantum\Service\Service> $serviceClass */ $tokenService = ServiceFactory::create($serviceClass); if (!$tokenService instanceof TokenServiceInterface) { diff --git a/tests/Unit/Console/QtCommandTest.php b/tests/Unit/Console/CliCommandTest.php similarity index 94% rename from tests/Unit/Console/QtCommandTest.php rename to tests/Unit/Console/CliCommandTest.php index ebe89336..ddfa9222 100644 --- a/tests/Unit/Console/QtCommandTest.php +++ b/tests/Unit/Console/CliCommandTest.php @@ -9,7 +9,7 @@ use Quantum\Tests\Unit\AppTestCase; use RuntimeException; -class QtCommandTest extends AppTestCase +class CliCommandTest extends AppTestCase { private TestCommand $command; @@ -27,7 +27,7 @@ public function setUp(): void $this->tester = new CommandTester($this->command); } - public function testQtCommandMetadataIsConfigured(): void + public function testCliCommandMetadataIsConfigured(): void { $this->assertSame('test:dummy', $this->command->getName()); @@ -36,7 +36,7 @@ public function testQtCommandMetadataIsConfigured(): void $this->assertSame('Used only for core command discovery tests', $this->command->getHelp()); } - public function testQtCommandArgumentsAndOptionsAreRegistered(): void + public function testCliCommandArgumentsAndOptionsAreRegistered(): void { $definition = $this->command->getDefinition(); diff --git a/tests/Unit/Console/CommandDiscoveryTest.php b/tests/Unit/Console/CommandDiscoveryTest.php index 45283dc6..e5cf798b 100644 --- a/tests/Unit/Console/CommandDiscoveryTest.php +++ b/tests/Unit/Console/CommandDiscoveryTest.php @@ -4,7 +4,7 @@ use Quantum\Console\CommandDiscovery; use Quantum\Tests\Unit\AppTestCase; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; class CommandDiscoveryTest extends AppTestCase { @@ -36,7 +36,7 @@ public function testDiscoverCoreCommands(): void $instance = new $command['class'](); - $this->assertInstanceOf(QtCommand::class, $instance); + $this->assertInstanceOf(CliCommand::class, $instance); $this->assertNotEmpty($instance->getName()); } diff --git a/tests/Unit/Di/DiTest.php b/tests/Unit/Di/DiTest.php index 477bb2ed..d15a0445 100644 --- a/tests/Unit/Di/DiTest.php +++ b/tests/Unit/Di/DiTest.php @@ -27,7 +27,7 @@ interface DummyServiceInterface { } - class DummyService extends QtService implements DummyServiceInterface + class DummyService extends Service implements DummyServiceInterface { } diff --git a/tests/Unit/Middleware/MiddlewareManagerTest.php b/tests/Unit/Middleware/MiddlewareManagerTest.php index cb1ae851..6ae23737 100644 --- a/tests/Unit/Middleware/MiddlewareManagerTest.php +++ b/tests/Unit/Middleware/MiddlewareManagerTest.php @@ -1,12 +1,12 @@ applyMiddlewares(request(), fn (Request $request): Response => response()->json([])); } - public function testMiddlewareManagerThrowsWhenNotInstanceOfQtMiddleware(): void + public function testMiddlewareManagerThrowsWhenNotInstanceOfMiddleware(): void { $this->expectException(MiddlewareException::class); diff --git a/tests/Unit/Migration/Exceptions/MigrationExceptionTest.php b/tests/Unit/Migration/Exceptions/MigrationExceptionTest.php index 7ee61163..9e28b492 100644 --- a/tests/Unit/Migration/Exceptions/MigrationExceptionTest.php +++ b/tests/Unit/Migration/Exceptions/MigrationExceptionTest.php @@ -39,7 +39,7 @@ public function testInvalidMigrationClass(): void $exception = MigrationException::invalidMigrationClass('FooMigration'); $this->assertInstanceOf(MigrationException::class, $exception); - $this->assertSame('Migration class `FooMigration` must extend QtMigration', $exception->getMessage()); + $this->assertSame('Migration class `FooMigration` must extend Migration', $exception->getMessage()); $this->assertSame(E_ERROR, $exception->getCode()); } } diff --git a/tests/Unit/Migration/MigrationManagerTest.php b/tests/Unit/Migration/MigrationManagerTest.php index 0666e55b..20b5ede0 100644 --- a/tests/Unit/Migration/MigrationManagerTest.php +++ b/tests/Unit/Migration/MigrationManagerTest.php @@ -179,7 +179,7 @@ public function testApplyMigrationsUpgradeThrowsForInvalidMigrationClass(): void $manager = new MigrationManager(); $this->expectException(MigrationException::class); - $this->expectExceptionMessage('Migration class `create_table_gamma_table_1003` must extend QtMigration'); + $this->expectExceptionMessage('Migration class `create_table_gamma_table_1003` must extend Migration'); $manager->applyMigrations(MigrationManager::UPGRADE); } @@ -211,7 +211,7 @@ public function testApplyMigrationsDowngradeThrowsWhenNoEntriesExist(): void private function createValidMigrationFile(string $className, string $tableName): void { $content = "assertStringContainsString('class Create_table_users_1001 extends QtMigration', $template); + $this->assertStringContainsString('use Quantum\Migration\Migration;', $template); + $this->assertStringContainsString('class Create_table_users_1001 extends Migration', $template); $this->assertStringContainsString("\$tableFactory->create('users')", $template); $this->assertStringContainsString("\$tableFactory->drop('users')", $template); } @@ -20,7 +21,8 @@ public function testAlterTemplateContainsExpectedOperations(): void { $template = MigrationTemplate::alter('alter_table_users_1002', 'users'); - $this->assertStringContainsString('class Alter_table_users_1002 extends QtMigration', $template); + $this->assertStringContainsString('use Quantum\Migration\Migration;', $template); + $this->assertStringContainsString('class Alter_table_users_1002 extends Migration', $template); $this->assertStringContainsString("\$tableFactory->get('users')", $template); } @@ -28,7 +30,8 @@ public function testRenameTemplateContainsExpectedOperations(): void { $template = MigrationTemplate::rename('rename_table_users_1003', 'users'); - $this->assertStringContainsString('class Rename_table_users_1003 extends QtMigration', $template); + $this->assertStringContainsString('use Quantum\Migration\Migration;', $template); + $this->assertStringContainsString('class Rename_table_users_1003 extends Migration', $template); $this->assertStringContainsString("\$tableFactory->rename('users', \$newName)", $template); $this->assertStringContainsString("\$tableFactory->rename(\$newName, 'users')", $template); } @@ -37,7 +40,8 @@ public function testDropTemplateContainsExpectedOperations(): void { $template = MigrationTemplate::drop('drop_table_users_1004', 'users'); - $this->assertStringContainsString('class Drop_table_users_1004 extends QtMigration', $template); + $this->assertStringContainsString('use Quantum\Migration\Migration;', $template); + $this->assertStringContainsString('class Drop_table_users_1004 extends Migration', $template); $this->assertStringContainsString("\$tableFactory->drop('users')", $template); } } diff --git a/tests/Unit/Service/Factories/ServiceFactoryTest.php b/tests/Unit/Service/Factories/ServiceFactoryTest.php index a491da55..43ab12be 100644 --- a/tests/Unit/Service/Factories/ServiceFactoryTest.php +++ b/tests/Unit/Service/Factories/ServiceFactoryTest.php @@ -2,10 +2,10 @@ namespace Quantum\Services { - use Quantum\Service\QtService; + use Quantum\Service\Service; use Quantum\Models\TestModel; - class TestService extends QtService + class TestService extends Service { public static $count = 0; @@ -43,7 +43,7 @@ class TestModel extends DbModel use Quantum\Service\Factories\ServiceFactory; use Quantum\Tests\Unit\AppTestCase; use Quantum\Services\TestService; - use Quantum\Service\QtService; + use Quantum\Service\Service; use Quantum\Model\DbModel; class ServiceFactoryTest extends AppTestCase @@ -62,7 +62,7 @@ public function testServiceFactoryGetInstance(): void { $service = ServiceFactory::get(TestService::class); - $this->assertInstanceOf(QtService::class, $service); + $this->assertInstanceOf(Service::class, $service); $this->assertInstanceOf(TestService::class, $service); } @@ -84,7 +84,7 @@ public function testServiceFactoryCreateInstance(): void { $service = ServiceFactory::create(TestService::class); - $this->assertInstanceOf(QtService::class, $service); + $this->assertInstanceOf(Service::class, $service); $this->assertInstanceOf(TestService::class, $service); } diff --git a/tests/Unit/Service/Helpers/ServiceHelperFunctionTest.php b/tests/Unit/Service/Helpers/ServiceHelperFunctionTest.php index 8473c8f7..d2783afa 100644 --- a/tests/Unit/Service/Helpers/ServiceHelperFunctionTest.php +++ b/tests/Unit/Service/Helpers/ServiceHelperFunctionTest.php @@ -5,17 +5,17 @@ use Quantum\Tests\_root\shared\Services\TokenService; use Quantum\Service\Exceptions\ServiceException; use Quantum\Tests\Unit\AppTestCase; -use Quantum\Service\QtService; +use Quantum\Service\Service; class ServiceHelperFunctionTest extends AppTestCase { - public function testServiceReturnsQtServiceInstance(): void + public function testServiceReturnsServiceInstance(): void { $service = service(TokenService::class); $this->assertInstanceOf(TokenService::class, $service); - $this->assertInstanceOf(QtService::class, $service); + $this->assertInstanceOf(Service::class, $service); } public function testModelThrowsOnInvalidClass(): void diff --git a/tests/Unit/Service/QtServiceTest.php b/tests/Unit/Service/ServiceTest.php similarity index 78% rename from tests/Unit/Service/QtServiceTest.php rename to tests/Unit/Service/ServiceTest.php index 49fc275b..3f30df30 100644 --- a/tests/Unit/Service/QtServiceTest.php +++ b/tests/Unit/Service/ServiceTest.php @@ -2,9 +2,9 @@ namespace Quantum\Services { - use Quantum\Service\QtService; + use Quantum\Service\Service; - class TestingService extends QtService + class TestingService extends Service { } } @@ -15,13 +15,13 @@ class TestingService extends QtService use Quantum\Service\Factories\ServiceFactory; use Quantum\Services\TestingService; use Quantum\Tests\Unit\AppTestCase; - use Quantum\Service\QtService; + use Quantum\Service\Service; /** * @runTestsInSeparateProcesses * @preserveGlobalState disabled */ - class QtServiceTest extends AppTestCase + class ServiceTest extends AppTestCase { public function setUp(): void { @@ -32,7 +32,7 @@ public function testMissingMethods(): void { $this->expectException(ServiceException::class); - $this->expectExceptionMessage('The method `undefinedMethod` is not supported for `' . QtService::class . '`'); + $this->expectExceptionMessage('The method `undefinedMethod` is not supported for `' . Service::class . '`'); $service = (new ServiceFactory())->get(TestingService::class); diff --git a/tests/_root/modules/Test/Services/AuthService.php b/tests/_root/modules/Test/Services/AuthService.php index df90fcb8..b967b09a 100644 --- a/tests/_root/modules/Test/Services/AuthService.php +++ b/tests/_root/modules/Test/Services/AuthService.php @@ -3,10 +3,10 @@ namespace Quantum\Tests\_root\modules\Test\Services; use Quantum\Auth\Contracts\AuthServiceInterface; -use Quantum\Service\QtService; +use Quantum\Service\Service; use Quantum\Auth\User; -class AuthService extends QtService implements AuthServiceInterface +class AuthService extends Service implements AuthServiceInterface { public function get(string $field, ?string $value): ?User { diff --git a/tests/_root/shared/Commands/TestCommand.php b/tests/_root/shared/Commands/TestCommand.php index d7f72e64..e6f5b642 100644 --- a/tests/_root/shared/Commands/TestCommand.php +++ b/tests/_root/shared/Commands/TestCommand.php @@ -2,9 +2,9 @@ namespace Quantum\Tests\_root\shared\Commands; -use Quantum\Console\QtCommand; +use Quantum\Console\CliCommand; -class TestCommand extends QtCommand +class TestCommand extends CliCommand { protected ?string $name = 'test:dummy'; protected ?string $description = 'Dummy test command'; diff --git a/tests/_root/shared/Services/TokenService.php b/tests/_root/shared/Services/TokenService.php index fa6e4527..3dd0843d 100644 --- a/tests/_root/shared/Services/TokenService.php +++ b/tests/_root/shared/Services/TokenService.php @@ -3,9 +3,9 @@ namespace Quantum\Tests\_root\shared\Services; use Quantum\Storage\Contracts\TokenServiceInterface; -use Quantum\Service\QtService; +use Quantum\Service\Service; -class TokenService extends QtService implements TokenServiceInterface +class TokenService extends Service implements TokenServiceInterface { public function getAccessToken(): string {