diff --git a/.gitattributes b/.gitattributes index 691616ebc..434fb00c6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,4 +7,23 @@ *.md text eol=lf *.sh text eol=lf *.js text eol=lf -*.css text eol=lf \ No newline at end of file +*.css text eol=lf + +# Export ignore - exclude development and test files +tests/ export-ignore +.git/ export-ignore +.github/ export-ignore +.idea/ export-ignore +nbproject/ export-ignore +vendor/ export-ignore +.php-cs-fixer.cache export-ignore +.php-cs-fixer.php export-ignore +.phpunit.result.cache export-ignore +coverage.xml export-ignore +test-teamcity.log export-ignore +phpstan.neon.dist export-ignore +phpunit.xml export-ignore +rector.php export-ignore +.scrutinizer.yml export-ignore +composer.lock export-ignore +_config.yml export-ignore \ No newline at end of file diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 97fb03912..09ce7d060 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -52,7 +52,7 @@ jobs: ${{ runner.os }}-php- - name: Install dependencies - run: composer install --prefer-dist --no-progress + run: composer update --prefer-dist --no-progress --no-interaction - name: Run PHP-CS-Fixer run: composer cs:check diff --git a/composer.json b/composer.json index 9eaef8f08..17adf3e6a 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "ext-openssl": "*", "ext-bcmath": "*", "j4mie/paris": "^1.5", - "firebase/php-jwt": "^6.0", + "firebase/php-jwt": "^6.0 || ^7.0", "gumlet/php-image-resize": "^2.0", "symfony/var-dumper": "^5.4", "symfony/var-exporter": "^5.2", @@ -84,5 +84,12 @@ "test": "vendor/bin/phpunit --stderr --testdox --coverage-clover coverage.xml" }, "minimum-stability": "stable", - "prefer-stable": true + "prefer-stable": true, + "config": { + "audit": { + "ignore": [ + "CVE-2025-45769" + ] + } + } } diff --git a/src/App/Adapters/AppAdapter.php b/src/App/Adapters/AppAdapter.php index 441b19a44..eff84e1ac 100644 --- a/src/App/Adapters/AppAdapter.php +++ b/src/App/Adapters/AppAdapter.php @@ -31,7 +31,7 @@ abstract class AppAdapter implements AppInterface /** * @var string */ - private static $baseDir; + private static string $baseDir; /** * @throws BaseException @@ -42,7 +42,6 @@ public function __construct() { $this->loadCoreDependencies(); $this->loadComponentHelperFunctions(); - $this->loadLibraryHelperFunctions(); $this->loadAppHelperFunctions(); $this->loadModuleHelperFunctions(); } diff --git a/src/App/Adapters/ConsoleAppAdapter.php b/src/App/Adapters/ConsoleAppAdapter.php index ef3fadd77..1cf0cefd4 100644 --- a/src/App/Adapters/ConsoleAppAdapter.php +++ b/src/App/Adapters/ConsoleAppAdapter.php @@ -14,13 +14,13 @@ namespace Quantum\App\Adapters; -use Quantum\Libraries\Lang\Exceptions\LangException; use Symfony\Component\Console\Output\ConsoleOutput; use Quantum\App\Exceptions\StopExecutionException; use Quantum\Environment\Exceptions\EnvException; use Symfony\Component\Console\Input\ArgvInput; use Quantum\Config\Exceptions\ConfigException; use Symfony\Component\Console\Application; +use Quantum\Lang\Exceptions\LangException; use Quantum\App\Exceptions\BaseException; use Quantum\App\Traits\ConsoleAppTrait; use Quantum\Di\Exceptions\DiException; @@ -41,17 +41,17 @@ class ConsoleAppAdapter extends AppAdapter /** * @var ArgvInput */ - protected $input; + protected ArgvInput $input; /** * @var ConsoleOutput */ - protected $output; + protected ConsoleOutput $output; /** - * @var Application + * @var Application|null */ - protected $application; + protected ?Application $application = null; public function __construct() { diff --git a/src/App/Adapters/WebAppAdapter.php b/src/App/Adapters/WebAppAdapter.php index 6dab806a3..8a8555b4d 100644 --- a/src/App/Adapters/WebAppAdapter.php +++ b/src/App/Adapters/WebAppAdapter.php @@ -14,17 +14,17 @@ namespace Quantum\App\Adapters; -use Quantum\Libraries\Database\Exceptions\DatabaseException; -use Quantum\Libraries\Session\Exceptions\SessionException; use Quantum\Middleware\Exceptions\MiddlewareException; -use Quantum\Libraries\Csrf\Exceptions\CsrfException; -use Quantum\Libraries\Lang\Exceptions\LangException; +use Quantum\Database\Exceptions\DatabaseException; use Quantum\App\Exceptions\StopExecutionException; +use Quantum\Session\Exceptions\SessionException; use Quantum\Environment\Exceptions\EnvException; use Quantum\Module\Exceptions\ModuleException; use Quantum\Config\Exceptions\ConfigException; use Quantum\Router\Exceptions\RouteException; use Quantum\Http\Exceptions\HttpException; +use Quantum\Csrf\Exceptions\CsrfException; +use Quantum\Lang\Exceptions\LangException; use Quantum\Middleware\MiddlewareManager; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; diff --git a/src/App/Traits/AppTrait.php b/src/App/Traits/AppTrait.php index bc22f6a58..8642ddf33 100644 --- a/src/App/Traits/AppTrait.php +++ b/src/App/Traits/AppTrait.php @@ -14,11 +14,11 @@ namespace Quantum\App\Traits; -use Quantum\Libraries\Logger\Factories\LoggerFactory; -use Quantum\Libraries\Lang\Exceptions\LangException; -use Quantum\Libraries\Lang\Factories\LangFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Logger\Factories\LoggerFactory; +use Quantum\Lang\Exceptions\LangException; use Quantum\App\Exceptions\BaseException; +use Quantum\Lang\Factories\LangFactory; use Quantum\Di\Exceptions\DiException; use Quantum\Tracer\ErrorHandler; use Quantum\Loader\Loader; @@ -52,6 +52,9 @@ public static function getBaseDir(): string return self::$baseDir; } + /** + * @throws DiException + */ protected function loadCoreDependencies() { $file = dirname(__DIR__) . DS . 'Config' . DS . 'dependencies.php'; @@ -70,37 +73,16 @@ protected function loadComponentHelperFunctions(): void { $loader = Di::get(Loader::class); - $components = [ - 'Environment', - 'Config', - 'Router', - 'Service', - 'Model', - 'Hook', - 'Http', - 'View', - 'App', - ]; - - foreach ($components as $component) { - $componentHelperPath = dirname(__DIR__, 2) . DS . $component . DS . 'Helpers'; - if (is_dir($componentHelperPath)) { - $loader->loadDir($componentHelperPath); + $srcDir = dirname(__DIR__, 2); + + foreach (glob($srcDir . DS . '*', GLOB_ONLYDIR) as $componentDir) { + $helperPath = $componentDir . DS . 'Helpers'; + if (is_dir($helperPath)) { + $loader->loadDir($helperPath); } } } - /** - * Loads library helper functions - * @throws DiException - * @throws ReflectionException - */ - protected function loadLibraryHelperFunctions() - { - $loader = Di::get(Loader::class); - $loader->loadDir(dirname(__DIR__, 2) . DS . 'Libraries' . DS . '*' . DS . 'Helpers'); - } - /** * Loads app helper functions * @throws DiException diff --git a/src/App/Traits/WebAppTrait.php b/src/App/Traits/WebAppTrait.php index 2b98a8778..7362527ce 100644 --- a/src/App/Traits/WebAppTrait.php +++ b/src/App/Traits/WebAppTrait.php @@ -15,11 +15,11 @@ namespace Quantum\App\Traits; use Quantum\Environment\Exceptions\EnvException; -use Quantum\Libraries\ResourceCache\ViewCache; use Quantum\Config\Exceptions\ConfigException; use Quantum\Http\Exceptions\HttpException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; +use Quantum\ResourceCache\ViewCache; use Quantum\Environment\Environment; use DebugBar\DebugBarException; use Quantum\Environment\Server; diff --git a/src/Libraries/Archive/Adapters/PharAdapter.php b/src/Archive/Adapters/PharAdapter.php similarity index 94% rename from src/Libraries/Archive/Adapters/PharAdapter.php rename to src/Archive/Adapters/PharAdapter.php index 362aa867a..7f14f7388 100644 --- a/src/Libraries/Archive/Adapters/PharAdapter.php +++ b/src/Archive/Adapters/PharAdapter.php @@ -12,19 +12,19 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive\Adapters; +namespace Quantum\Archive\Adapters; -use Quantum\Libraries\Archive\Exceptions\ArchiveException; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; -use Quantum\Libraries\Archive\Contracts\ArchiveInterface; +use Quantum\Archive\Exceptions\ArchiveException; +use Quantum\Storage\Factories\FileSystemFactory; +use Quantum\Archive\Contracts\ArchiveInterface; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Storage\FileSystem; +use Quantum\Storage\FileSystem; use Exception; use Phar; /** * Class PharAdapter - * @package Quantum\Libraries\Archive + * @package Quantum\Archive */ class PharAdapter implements ArchiveInterface { diff --git a/src/Libraries/Archive/Adapters/ZipAdapter.php b/src/Archive/Adapters/ZipAdapter.php similarity index 93% rename from src/Libraries/Archive/Adapters/ZipAdapter.php rename to src/Archive/Adapters/ZipAdapter.php index 19b0a80d9..5cad5a6e1 100644 --- a/src/Libraries/Archive/Adapters/ZipAdapter.php +++ b/src/Archive/Adapters/ZipAdapter.php @@ -12,19 +12,19 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive\Adapters; +namespace Quantum\Archive\Adapters; -use Quantum\Libraries\Archive\Exceptions\ArchiveException; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; -use Quantum\Libraries\Archive\Contracts\ArchiveInterface; -use Quantum\Libraries\Storage\FileSystem; +use Quantum\Archive\Exceptions\ArchiveException; +use Quantum\Storage\Factories\FileSystemFactory; +use Quantum\Archive\Contracts\ArchiveInterface; +use Quantum\Storage\FileSystem; use Quantum\App\Exceptions\BaseException; use ZipArchive; use Exception; /** * Class ZipAdapter - * @package Quantum\Libraries\Archive\Adapters + * @package Quantum\Archive\Adapters */ class ZipAdapter implements ArchiveInterface { diff --git a/src/Libraries/Archive/Archive.php b/src/Archive/Archive.php similarity index 90% rename from src/Libraries/Archive/Archive.php rename to src/Archive/Archive.php index c19f6dec0..5a461db90 100644 --- a/src/Libraries/Archive/Archive.php +++ b/src/Archive/Archive.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive; +namespace Quantum\Archive; -use Quantum\Libraries\Archive\Exceptions\ArchiveException; -use Quantum\Libraries\Archive\Contracts\ArchiveInterface; +use Quantum\Archive\Exceptions\ArchiveException; +use Quantum\Archive\Contracts\ArchiveInterface; use Quantum\App\Exceptions\BaseException; /** * Class Archive - * @package Quantum\Libraries\Archive + * @package Quantum\Archive * @method void setName(string $archiveName) * @method bool offsetExists(string $filename) * @method bool addEmptyDir(string $directory) diff --git a/src/Libraries/Archive/Contracts/ArchiveInterface.php b/src/Archive/Contracts/ArchiveInterface.php similarity index 95% rename from src/Libraries/Archive/Contracts/ArchiveInterface.php rename to src/Archive/Contracts/ArchiveInterface.php index a9907a3c9..874129b08 100644 --- a/src/Libraries/Archive/Contracts/ArchiveInterface.php +++ b/src/Archive/Contracts/ArchiveInterface.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive\Contracts; +namespace Quantum\Archive\Contracts; /** * Interface ArchiveInterface - * @package Quantum\Libraries\Archive + * @package Quantum\Archive */ interface ArchiveInterface { diff --git a/src/Libraries/Archive/Enums/ExceptionMessages.php b/src/Archive/Enums/ExceptionMessages.php similarity index 87% rename from src/Libraries/Archive/Enums/ExceptionMessages.php rename to src/Archive/Enums/ExceptionMessages.php index 293e682b5..5da1f8a27 100644 --- a/src/Libraries/Archive/Enums/ExceptionMessages.php +++ b/src/Archive/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive\Enums; +namespace Quantum\Archive\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Archive + * @package Quantum\Archive */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Archive/Exceptions/ArchiveException.php b/src/Archive/Exceptions/ArchiveException.php similarity index 86% rename from src/Libraries/Archive/Exceptions/ArchiveException.php rename to src/Archive/Exceptions/ArchiveException.php index 647918871..5d40aaa2b 100644 --- a/src/Libraries/Archive/Exceptions/ArchiveException.php +++ b/src/Archive/Exceptions/ArchiveException.php @@ -14,14 +14,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive\Exceptions; +namespace Quantum\Archive\Exceptions; -use Quantum\Libraries\Archive\Enums\ExceptionMessages; +use Quantum\Archive\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; /** * Class CacheException - * @package Quantum\Libraries\Archive + * @package Quantum\Archive */ class ArchiveException extends BaseException { diff --git a/src/Libraries/Archive/Factories/ArchiveFactory.php b/src/Archive/Factories/ArchiveFactory.php similarity index 82% rename from src/Libraries/Archive/Factories/ArchiveFactory.php rename to src/Archive/Factories/ArchiveFactory.php index f396243ad..73668eb5f 100644 --- a/src/Libraries/Archive/Factories/ArchiveFactory.php +++ b/src/Archive/Factories/ArchiveFactory.php @@ -12,17 +12,17 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Archive\Factories; +namespace Quantum\Archive\Factories; -use Quantum\Libraries\Archive\Exceptions\ArchiveException; -use Quantum\Libraries\Archive\Adapters\PharAdapter; -use Quantum\Libraries\Archive\Adapters\ZipAdapter; +use Quantum\Archive\Exceptions\ArchiveException; +use Quantum\Archive\Adapters\PharAdapter; +use Quantum\Archive\Adapters\ZipAdapter; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Archive\Archive; +use Quantum\Archive\Archive; /** * Class Cryptor - * @package Quantum\Libraries\Encryption + * @package Quantum\Encryption */ class ArchiveFactory { diff --git a/src/Libraries/Asset/Asset.php b/src/Asset/Asset.php similarity index 97% rename from src/Libraries/Asset/Asset.php rename to src/Asset/Asset.php index 37cdd9aac..6e8bfe85f 100644 --- a/src/Libraries/Asset/Asset.php +++ b/src/Asset/Asset.php @@ -13,11 +13,11 @@ * */ -namespace Quantum\Libraries\Asset; +namespace Quantum\Asset; /** * Class Asset - * @package Quantum\Libraries\Asset + * @package Quantum\Asset */ class Asset { diff --git a/src/Libraries/Asset/AssetManager.php b/src/Asset/AssetManager.php similarity index 96% rename from src/Libraries/Asset/AssetManager.php rename to src/Asset/AssetManager.php index 685c91f9a..7ccb79fa2 100644 --- a/src/Libraries/Asset/AssetManager.php +++ b/src/Asset/AssetManager.php @@ -12,14 +12,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Asset; +namespace Quantum\Asset; -use Quantum\Libraries\Asset\Exceptions\AssetException; -use Quantum\Libraries\Lang\Exceptions\LangException; +use Quantum\Asset\Exceptions\AssetException; +use Quantum\Lang\Exceptions\LangException; /** * Class AssetFactory - * @package Quantum\Libraries\Asset + * @package Quantum\Asset */ class AssetManager { diff --git a/src/Libraries/Asset/Enums/ExceptionMessages.php b/src/Asset/Enums/ExceptionMessages.php similarity index 88% rename from src/Libraries/Asset/Enums/ExceptionMessages.php rename to src/Asset/Enums/ExceptionMessages.php index ed4cb01f7..918b33783 100644 --- a/src/Libraries/Asset/Enums/ExceptionMessages.php +++ b/src/Asset/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Asset\Enums; +namespace Quantum\Asset\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Asset + * @package Quantum\Asset */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Asset/Exceptions/AssetException.php b/src/Asset/Exceptions/AssetException.php similarity index 88% rename from src/Libraries/Asset/Exceptions/AssetException.php rename to src/Asset/Exceptions/AssetException.php index 1f5d47ca3..394216080 100644 --- a/src/Libraries/Asset/Exceptions/AssetException.php +++ b/src/Asset/Exceptions/AssetException.php @@ -14,13 +14,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Asset\Exceptions; +namespace Quantum\Asset\Exceptions; -use Quantum\Libraries\Asset\Enums\ExceptionMessages; +use Quantum\Asset\Enums\ExceptionMessages; /** * Class AssetException - * @package Quantum\Libraries\Asset + * @package Quantum\Asset */ class AssetException extends \Exception { diff --git a/src/Libraries/Asset/Helpers/asset.php b/src/Asset/Helpers/asset.php similarity index 81% rename from src/Libraries/Asset/Helpers/asset.php rename to src/Asset/Helpers/asset.php index 4484e702b..6c5429930 100644 --- a/src/Libraries/Asset/Helpers/asset.php +++ b/src/Asset/Helpers/asset.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -use Quantum\Libraries\Asset\Exceptions\AssetException; -use Quantum\Libraries\Lang\Exceptions\LangException; -use Quantum\Libraries\Asset\AssetManager; +use Quantum\Asset\Exceptions\AssetException; +use Quantum\Lang\Exceptions\LangException; +use Quantum\Asset\AssetManager; /** * Gets the AssetFactory instance diff --git a/src/Libraries/Auth/Adapters/JwtAuthAdapter.php b/src/Auth/Adapters/JwtAuthAdapter.php similarity index 90% rename from src/Libraries/Auth/Adapters/JwtAuthAdapter.php rename to src/Auth/Adapters/JwtAuthAdapter.php index bca67e65a..44e3bd68d 100644 --- a/src/Libraries/Auth/Adapters/JwtAuthAdapter.php +++ b/src/Auth/Adapters/JwtAuthAdapter.php @@ -12,25 +12,25 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Adapters; - -use Quantum\Libraries\Auth\Contracts\AuthenticatableInterface; -use Quantum\Libraries\Auth\Contracts\AuthServiceInterface; -use Quantum\Libraries\Auth\Exceptions\AuthException; -use Quantum\Libraries\Jwt\Exceptions\JwtException; -use Quantum\Libraries\Auth\Traits\AuthTrait; -use Quantum\Libraries\Auth\Enums\AuthKeys; -use Quantum\Libraries\Mailer\Mailer; -use Quantum\Libraries\Hasher\Hasher; -use Quantum\Libraries\Jwt\JwtToken; -use Quantum\Libraries\Auth\User; +namespace Quantum\Auth\Adapters; + +use Quantum\Auth\Contracts\AuthenticatableInterface; +use Quantum\Auth\Contracts\AuthServiceInterface; +use Quantum\Auth\Exceptions\AuthException; +use Quantum\Jwt\Exceptions\JwtException; +use Quantum\Auth\Traits\AuthTrait; +use Quantum\Auth\Enums\AuthKeys; +use Quantum\Mailer\Mailer; +use Quantum\Hasher\Hasher; use Quantum\Http\Response; use Quantum\Http\Request; +use Quantum\Jwt\JwtToken; +use Quantum\Auth\User; use Exception; /** * Class ApiAuth - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ class JwtAuthAdapter implements AuthenticatableInterface { @@ -221,7 +221,7 @@ private function getUserFromRefreshToken(): ?User $user = $this->checkRefreshToken(); - if ($user instanceof \Quantum\Libraries\Auth\User) { + if ($user instanceof User) { $this->setUpdatedTokens($user); return $this->user(); } diff --git a/src/Libraries/Auth/Adapters/SessionAuthAdapter.php b/src/Auth/Adapters/SessionAuthAdapter.php similarity index 91% rename from src/Libraries/Auth/Adapters/SessionAuthAdapter.php rename to src/Auth/Adapters/SessionAuthAdapter.php index fbde6e208..49ea54953 100644 --- a/src/Libraries/Auth/Adapters/SessionAuthAdapter.php +++ b/src/Auth/Adapters/SessionAuthAdapter.php @@ -12,27 +12,27 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Adapters; +namespace Quantum\Auth\Adapters; -use Quantum\Libraries\Auth\Contracts\AuthenticatableInterface; -use Quantum\Libraries\Database\Exceptions\DatabaseException; -use Quantum\Libraries\Auth\Contracts\AuthServiceInterface; -use Quantum\Libraries\Session\Exceptions\SessionException; -use Quantum\Libraries\Auth\Exceptions\AuthException; +use Quantum\Auth\Contracts\AuthenticatableInterface; +use Quantum\Database\Exceptions\DatabaseException; +use Quantum\Auth\Contracts\AuthServiceInterface; +use Quantum\Session\Exceptions\SessionException; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\Auth\Traits\AuthTrait; -use Quantum\Libraries\Auth\Enums\AuthKeys; +use Quantum\Auth\Exceptions\AuthException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Hasher\Hasher; -use Quantum\Libraries\Mailer\Mailer; -use Quantum\Libraries\Auth\User; +use Quantum\Auth\Traits\AuthTrait; +use Quantum\Auth\Enums\AuthKeys; +use Quantum\Hasher\Hasher; +use Quantum\Mailer\Mailer; use ReflectionException; +use Quantum\Auth\User; use Exception; /** * Class WebAuth - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ class SessionAuthAdapter implements AuthenticatableInterface { diff --git a/src/Libraries/Auth/Auth.php b/src/Auth/Auth.php similarity index 88% rename from src/Libraries/Auth/Auth.php rename to src/Auth/Auth.php index 44ae2dca7..a481c4c88 100644 --- a/src/Libraries/Auth/Auth.php +++ b/src/Auth/Auth.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth; +namespace Quantum\Auth; -use Quantum\Libraries\Auth\Contracts\AuthenticatableInterface; -use Quantum\Libraries\Auth\Exceptions\AuthException; +use Quantum\Auth\Contracts\AuthenticatableInterface; +use Quantum\Auth\Exceptions\AuthException; use Quantum\App\Exceptions\BaseException; /** * Class Auth - * @package Quantum\Libraries\Auth + * @package Quantum\Auth * @method mixed signin(string $username, string $password, bool $remember = false) * @method bool signout() * @method bool check() diff --git a/src/Libraries/Auth/Contracts/AuthServiceInterface.php b/src/Auth/Contracts/AuthServiceInterface.php similarity index 89% rename from src/Libraries/Auth/Contracts/AuthServiceInterface.php rename to src/Auth/Contracts/AuthServiceInterface.php index 139d5380e..09c45f45d 100644 --- a/src/Libraries/Auth/Contracts/AuthServiceInterface.php +++ b/src/Auth/Contracts/AuthServiceInterface.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Contracts; +namespace Quantum\Auth\Contracts; -use Quantum\Libraries\Auth\User; +use Quantum\Auth\User; /** * Interface AuthServiceInterface - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ interface AuthServiceInterface { diff --git a/src/Libraries/Auth/Contracts/AuthenticatableInterface.php b/src/Auth/Contracts/AuthenticatableInterface.php similarity index 88% rename from src/Libraries/Auth/Contracts/AuthenticatableInterface.php rename to src/Auth/Contracts/AuthenticatableInterface.php index aa93ed739..faf37aba8 100644 --- a/src/Libraries/Auth/Contracts/AuthenticatableInterface.php +++ b/src/Auth/Contracts/AuthenticatableInterface.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Contracts; +namespace Quantum\Auth\Contracts; -use Quantum\Libraries\Auth\User; +use Quantum\Auth\User; /** * Interface AuthenticatableInterface - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ interface AuthenticatableInterface { diff --git a/src/Libraries/Auth/Enums/AuthKeys.php b/src/Auth/Enums/AuthKeys.php similarity index 94% rename from src/Libraries/Auth/Enums/AuthKeys.php rename to src/Auth/Enums/AuthKeys.php index e4c160a4d..e72060f32 100644 --- a/src/Libraries/Auth/Enums/AuthKeys.php +++ b/src/Auth/Enums/AuthKeys.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Enums; +namespace Quantum\Auth\Enums; /** * Class AuthKeys - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ class AuthKeys { diff --git a/src/Libraries/Auth/Enums/ExceptionMessages.php b/src/Auth/Enums/ExceptionMessages.php similarity index 91% rename from src/Libraries/Auth/Enums/ExceptionMessages.php rename to src/Auth/Enums/ExceptionMessages.php index 752e2da08..04293789b 100644 --- a/src/Libraries/Auth/Enums/ExceptionMessages.php +++ b/src/Auth/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Enums; +namespace Quantum\Auth\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Auth/Exceptions/AuthException.php b/src/Auth/Exceptions/AuthException.php similarity index 94% rename from src/Libraries/Auth/Exceptions/AuthException.php rename to src/Auth/Exceptions/AuthException.php index 28c6099e8..d668dd90b 100644 --- a/src/Libraries/Auth/Exceptions/AuthException.php +++ b/src/Auth/Exceptions/AuthException.php @@ -14,9 +14,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Exceptions; +namespace Quantum\Auth\Exceptions; -use Quantum\Libraries\Auth\Enums\ExceptionMessages; +use Quantum\Auth\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; /** diff --git a/src/Libraries/Auth/Factories/AuthFactory.php b/src/Auth/Factories/AuthFactory.php similarity index 89% rename from src/Libraries/Auth/Factories/AuthFactory.php rename to src/Auth/Factories/AuthFactory.php index 54296358a..d34582704 100644 --- a/src/Libraries/Auth/Factories/AuthFactory.php +++ b/src/Auth/Factories/AuthFactory.php @@ -12,26 +12,26 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Factories; +namespace Quantum\Auth\Factories; -use Quantum\Libraries\Auth\Contracts\AuthServiceInterface; -use Quantum\Libraries\Auth\Adapters\SessionAuthAdapter; -use Quantum\Libraries\Auth\Exceptions\AuthException; -use Quantum\Libraries\Auth\Adapters\JwtAuthAdapter; +use Quantum\Auth\Contracts\AuthServiceInterface; use Quantum\Service\Exceptions\ServiceException; use Quantum\Config\Exceptions\ConfigException; use Quantum\Service\Factories\ServiceFactory; +use Quantum\Auth\Adapters\SessionAuthAdapter; +use Quantum\Auth\Exceptions\AuthException; +use Quantum\Auth\Adapters\JwtAuthAdapter; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Hasher\Hasher; -use Quantum\Libraries\Jwt\JwtToken; -use Quantum\Libraries\Auth\Auth; +use Quantum\Hasher\Hasher; +use Quantum\Jwt\JwtToken; use Quantum\Loader\Setup; use ReflectionException; +use Quantum\Auth\Auth; /** * Class AuthFactory - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ class AuthFactory { diff --git a/src/Libraries/Auth/Helpers/auth.php b/src/Auth/Helpers/auth.php similarity index 85% rename from src/Libraries/Auth/Helpers/auth.php rename to src/Auth/Helpers/auth.php index 596080893..1f869fe4c 100644 --- a/src/Libraries/Auth/Helpers/auth.php +++ b/src/Auth/Helpers/auth.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -use Quantum\Libraries\Auth\Exceptions\AuthException; -use Quantum\Libraries\Auth\Factories\AuthFactory; use Quantum\Service\Exceptions\ServiceException; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Auth\Exceptions\AuthException; use Quantum\App\Exceptions\BaseException; +use Quantum\Auth\Factories\AuthFactory; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Auth\Auth; +use Quantum\Auth\Auth; /** * Gets the Auth handler diff --git a/src/Libraries/Auth/Traits/AuthTrait.php b/src/Auth/Traits/AuthTrait.php similarity index 95% rename from src/Libraries/Auth/Traits/AuthTrait.php rename to src/Auth/Traits/AuthTrait.php index 9d5cdc39d..94be7a394 100644 --- a/src/Libraries/Auth/Traits/AuthTrait.php +++ b/src/Auth/Traits/AuthTrait.php @@ -12,20 +12,20 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth\Traits; +namespace Quantum\Auth\Traits; -use Quantum\Libraries\Auth\Contracts\AuthServiceInterface; -use Quantum\Libraries\Auth\Exceptions\AuthException; -use Quantum\Libraries\Jwt\Exceptions\JwtException; +use Quantum\Auth\Contracts\AuthServiceInterface; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\Auth\Enums\AuthKeys; +use Quantum\Auth\Exceptions\AuthException; use Quantum\App\Exceptions\BaseException; +use Quantum\Jwt\Exceptions\JwtException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Mailer\Mailer; -use Quantum\Libraries\Hasher\Hasher; -use Quantum\Libraries\Jwt\JwtToken; -use Quantum\Libraries\Auth\User; +use Quantum\Auth\Enums\AuthKeys; +use Quantum\Mailer\Mailer; +use Quantum\Hasher\Hasher; +use Quantum\Jwt\JwtToken; use ReflectionException; +use Quantum\Auth\User; use ReflectionClass; use DateInterval; use Exception; @@ -33,7 +33,7 @@ /** * Trait AuthTrait - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ trait AuthTrait { diff --git a/src/Libraries/Auth/User.php b/src/Auth/User.php similarity index 96% rename from src/Libraries/Auth/User.php rename to src/Auth/User.php index 895e5279a..cc7d38397 100644 --- a/src/Libraries/Auth/User.php +++ b/src/Auth/User.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Auth; +namespace Quantum\Auth; /** * Class User - * @package Quantum\Libraries\Auth + * @package Quantum\Auth */ class User { diff --git a/src/Libraries/Cache/Adapters/DatabaseAdapter.php b/src/Cache/Adapters/DatabaseAdapter.php similarity index 97% rename from src/Libraries/Cache/Adapters/DatabaseAdapter.php rename to src/Cache/Adapters/DatabaseAdapter.php index b94582437..ea5997934 100644 --- a/src/Libraries/Cache/Adapters/DatabaseAdapter.php +++ b/src/Cache/Adapters/DatabaseAdapter.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Adapters; +namespace Quantum\Cache\Adapters; -use Quantum\Libraries\Cache\Enums\ExceptionMessages; +use Quantum\Cache\Enums\ExceptionMessages; use Quantum\Model\Factories\ModelFactory; use Psr\SimpleCache\CacheInterface; use InvalidArgumentException; @@ -23,7 +23,7 @@ /** * Class DatabaseAdapter - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ class DatabaseAdapter implements CacheInterface { diff --git a/src/Libraries/Cache/Adapters/FileAdapter.php b/src/Cache/Adapters/FileAdapter.php similarity index 95% rename from src/Libraries/Cache/Adapters/FileAdapter.php rename to src/Cache/Adapters/FileAdapter.php index 137e92d2b..614c1ca7d 100644 --- a/src/Libraries/Cache/Adapters/FileAdapter.php +++ b/src/Cache/Adapters/FileAdapter.php @@ -12,21 +12,21 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Adapters; +namespace Quantum\Cache\Adapters; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; -use Quantum\Libraries\Cache\Enums\ExceptionMessages; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Cache\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Storage\FileSystem; use Quantum\Di\Exceptions\DiException; use Psr\SimpleCache\CacheInterface; +use Quantum\Storage\FileSystem; use InvalidArgumentException; use ReflectionException; /** * Class FileAdapter - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ class FileAdapter implements CacheInterface { diff --git a/src/Libraries/Cache/Adapters/MemcachedAdapter.php b/src/Cache/Adapters/MemcachedAdapter.php similarity index 95% rename from src/Libraries/Cache/Adapters/MemcachedAdapter.php rename to src/Cache/Adapters/MemcachedAdapter.php index bb8b085ff..fd4f2dcc9 100644 --- a/src/Libraries/Cache/Adapters/MemcachedAdapter.php +++ b/src/Cache/Adapters/MemcachedAdapter.php @@ -12,10 +12,10 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Adapters; +namespace Quantum\Cache\Adapters; -use Quantum\Libraries\Cache\Exceptions\CacheException; -use Quantum\Libraries\Cache\Enums\ExceptionMessages; +use Quantum\Cache\Exceptions\CacheException; +use Quantum\Cache\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; use Psr\SimpleCache\CacheInterface; use InvalidArgumentException; @@ -24,7 +24,7 @@ /** * Class MemcachedAdapter - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ class MemcachedAdapter implements CacheInterface { diff --git a/src/Libraries/Cache/Adapters/RedisAdapter.php b/src/Cache/Adapters/RedisAdapter.php similarity index 96% rename from src/Libraries/Cache/Adapters/RedisAdapter.php rename to src/Cache/Adapters/RedisAdapter.php index 4b43c9257..d77c329ea 100644 --- a/src/Libraries/Cache/Adapters/RedisAdapter.php +++ b/src/Cache/Adapters/RedisAdapter.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Adapters; +namespace Quantum\Cache\Adapters; -use Quantum\Libraries\Cache\Enums\ExceptionMessages; +use Quantum\Cache\Enums\ExceptionMessages; use Psr\SimpleCache\CacheInterface; use InvalidArgumentException; use RedisException; @@ -23,7 +23,7 @@ /** * Class RedisAdapter - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ class RedisAdapter implements CacheInterface { diff --git a/src/Libraries/Cache/Cache.php b/src/Cache/Cache.php similarity index 93% rename from src/Libraries/Cache/Cache.php rename to src/Cache/Cache.php index f6068858f..dc0d18789 100644 --- a/src/Libraries/Cache/Cache.php +++ b/src/Cache/Cache.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache; +namespace Quantum\Cache; -use Quantum\Libraries\Cache\Exceptions\CacheException; +use Quantum\Cache\Exceptions\CacheException; use Quantum\App\Exceptions\BaseException; use Psr\SimpleCache\CacheInterface; /** * Class Cache - * @package Quantum\Libraries\Cache + * @package Quantum\Cache * @method mixed get($key, $default = null) * @method array getMultiple($keys, $default = null) * @method has($key): bool diff --git a/src/Libraries/Cache/Enums/ExceptionMessages.php b/src/Cache/Enums/ExceptionMessages.php similarity index 87% rename from src/Libraries/Cache/Enums/ExceptionMessages.php rename to src/Cache/Enums/ExceptionMessages.php index f9b910412..f4eef93f0 100644 --- a/src/Libraries/Cache/Enums/ExceptionMessages.php +++ b/src/Cache/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Enums; +namespace Quantum\Cache\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Cache/Exceptions/CacheException.php b/src/Cache/Exceptions/CacheException.php similarity index 84% rename from src/Libraries/Cache/Exceptions/CacheException.php rename to src/Cache/Exceptions/CacheException.php index 87818205a..934e9c0c4 100644 --- a/src/Libraries/Cache/Exceptions/CacheException.php +++ b/src/Cache/Exceptions/CacheException.php @@ -14,13 +14,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Exceptions; +namespace Quantum\Cache\Exceptions; use Quantum\App\Exceptions\BaseException; /** * Class CacheException - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ class CacheException extends BaseException { diff --git a/src/Libraries/Cache/Factories/CacheFactory.php b/src/Cache/Factories/CacheFactory.php similarity index 85% rename from src/Libraries/Cache/Factories/CacheFactory.php rename to src/Cache/Factories/CacheFactory.php index c45c2031a..d7407b834 100644 --- a/src/Libraries/Cache/Factories/CacheFactory.php +++ b/src/Cache/Factories/CacheFactory.php @@ -12,23 +12,23 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cache\Factories; +namespace Quantum\Cache\Factories; -use Quantum\Libraries\Cache\Exceptions\CacheException; -use Quantum\Libraries\Cache\Adapters\MemcachedAdapter; -use Quantum\Libraries\Cache\Adapters\DatabaseAdapter; -use Quantum\Libraries\Cache\Adapters\RedisAdapter; -use Quantum\Libraries\Cache\Adapters\FileAdapter; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Cache\Exceptions\CacheException; +use Quantum\Cache\Adapters\MemcachedAdapter; +use Quantum\Cache\Adapters\DatabaseAdapter; use Quantum\App\Exceptions\BaseException; +use Quantum\Cache\Adapters\RedisAdapter; +use Quantum\Cache\Adapters\FileAdapter; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Cache\Cache; use Quantum\Loader\Setup; use ReflectionException; +use Quantum\Cache\Cache; /** * Class CacheFactory - * @package Quantum\Libraries\Cache + * @package Quantum\Cache */ class CacheFactory { diff --git a/src/Libraries/Cache/Helpers/cache.php b/src/Cache/Helpers/cache.php similarity index 88% rename from src/Libraries/Cache/Helpers/cache.php rename to src/Cache/Helpers/cache.php index f7d708727..cde21b342 100644 --- a/src/Libraries/Cache/Helpers/cache.php +++ b/src/Cache/Helpers/cache.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -use Quantum\Libraries\Cache\Factories\CacheFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Cache\Factories\CacheFactory; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Cache\Cache; +use Quantum\Cache\Cache; /** * @param string|null $adapter diff --git a/src/Libraries/Captcha/Adapters/HcaptchaAdapter.php b/src/Captcha/Adapters/HcaptchaAdapter.php similarity index 82% rename from src/Libraries/Captcha/Adapters/HcaptchaAdapter.php rename to src/Captcha/Adapters/HcaptchaAdapter.php index f2fa2f20a..5e652b147 100644 --- a/src/Libraries/Captcha/Adapters/HcaptchaAdapter.php +++ b/src/Captcha/Adapters/HcaptchaAdapter.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha\Adapters; +namespace Quantum\Captcha\Adapters; -use Quantum\Libraries\Captcha\Contracts\CaptchaInterface; -use Quantum\Libraries\Captcha\Traits\CaptchaTrait; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Captcha\Contracts\CaptchaInterface; +use Quantum\Captcha\Traits\CaptchaTrait; +use Quantum\HttpClient\HttpClient; /** * Class HcaptchaAdapter - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha */ class HcaptchaAdapter implements CaptchaInterface { diff --git a/src/Libraries/Captcha/Adapters/RecaptchaAdapter.php b/src/Captcha/Adapters/RecaptchaAdapter.php similarity index 82% rename from src/Libraries/Captcha/Adapters/RecaptchaAdapter.php rename to src/Captcha/Adapters/RecaptchaAdapter.php index 54d1447fb..7078e4c09 100644 --- a/src/Libraries/Captcha/Adapters/RecaptchaAdapter.php +++ b/src/Captcha/Adapters/RecaptchaAdapter.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha\Adapters; +namespace Quantum\Captcha\Adapters; -use Quantum\Libraries\Captcha\Contracts\CaptchaInterface; -use Quantum\Libraries\Captcha\Traits\CaptchaTrait; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Captcha\Contracts\CaptchaInterface; +use Quantum\Captcha\Traits\CaptchaTrait; +use Quantum\HttpClient\HttpClient; /** * Class RecaptchaAdapter - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha */ class RecaptchaAdapter implements CaptchaInterface { diff --git a/src/Libraries/Captcha/Captcha.php b/src/Captcha/Captcha.php similarity index 89% rename from src/Libraries/Captcha/Captcha.php rename to src/Captcha/Captcha.php index e981472d7..531f4cef7 100644 --- a/src/Libraries/Captcha/Captcha.php +++ b/src/Captcha/Captcha.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha; +namespace Quantum\Captcha; -use Quantum\Libraries\Captcha\Exceptions\CaptchaException; -use Quantum\Libraries\Captcha\Contracts\CaptchaInterface; +use Quantum\Captcha\Exceptions\CaptchaException; +use Quantum\Captcha\Contracts\CaptchaInterface; use Quantum\App\Exceptions\BaseException; /** * Class Captcha - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha * @method string getName() * @method string|null getType() * @method CaptchaInterface setType(string $type) diff --git a/src/Libraries/Captcha/Contracts/CaptchaInterface.php b/src/Captcha/Contracts/CaptchaInterface.php similarity index 93% rename from src/Libraries/Captcha/Contracts/CaptchaInterface.php rename to src/Captcha/Contracts/CaptchaInterface.php index 56e9b0691..7a5971b6a 100644 --- a/src/Libraries/Captcha/Contracts/CaptchaInterface.php +++ b/src/Captcha/Contracts/CaptchaInterface.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha\Contracts; +namespace Quantum\Captcha\Contracts; /** * Interface CaptchaInterface - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha */ interface CaptchaInterface { diff --git a/src/Libraries/Captcha/Exceptions/CaptchaException.php b/src/Captcha/Exceptions/CaptchaException.php similarity index 83% rename from src/Libraries/Captcha/Exceptions/CaptchaException.php rename to src/Captcha/Exceptions/CaptchaException.php index ff4f51f5c..a4c4d5be4 100644 --- a/src/Libraries/Captcha/Exceptions/CaptchaException.php +++ b/src/Captcha/Exceptions/CaptchaException.php @@ -14,13 +14,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha\Exceptions; +namespace Quantum\Captcha\Exceptions; use Quantum\App\Exceptions\BaseException; /** * Class CacheException - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha */ class CaptchaException extends BaseException { diff --git a/src/Libraries/Captcha/Factories/CaptchaFactory.php b/src/Captcha/Factories/CaptchaFactory.php similarity index 86% rename from src/Libraries/Captcha/Factories/CaptchaFactory.php rename to src/Captcha/Factories/CaptchaFactory.php index 3cc447d86..efad95056 100644 --- a/src/Libraries/Captcha/Factories/CaptchaFactory.php +++ b/src/Captcha/Factories/CaptchaFactory.php @@ -12,22 +12,22 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha\Factories; +namespace Quantum\Captcha\Factories; -use Quantum\Libraries\Captcha\Exceptions\CaptchaException; -use Quantum\Libraries\Captcha\Adapters\RecaptchaAdapter; -use Quantum\Libraries\Captcha\Adapters\HcaptchaAdapter; +use Quantum\Captcha\Exceptions\CaptchaException; +use Quantum\Captcha\Adapters\RecaptchaAdapter; +use Quantum\Captcha\Adapters\HcaptchaAdapter; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\HttpClient\HttpClient; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Captcha\Captcha; +use Quantum\Captcha\Captcha; use Quantum\Loader\Setup; use ReflectionException; /** * Class CaptchaFactory - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha */ class CaptchaFactory { diff --git a/src/Libraries/Captcha/Helpers/captcha.php b/src/Captcha/Helpers/captcha.php similarity index 87% rename from src/Libraries/Captcha/Helpers/captcha.php rename to src/Captcha/Helpers/captcha.php index ab36c426a..def4c3f95 100644 --- a/src/Libraries/Captcha/Helpers/captcha.php +++ b/src/Captcha/Helpers/captcha.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -use Quantum\Libraries\Captcha\Factories\CaptchaFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Captcha\Factories\CaptchaFactory; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Captcha\Captcha; +use Quantum\Captcha\Captcha; /** * @param string|null $adapter diff --git a/src/Libraries/Captcha/Traits/CaptchaTrait.php b/src/Captcha/Traits/CaptchaTrait.php similarity index 91% rename from src/Libraries/Captcha/Traits/CaptchaTrait.php rename to src/Captcha/Traits/CaptchaTrait.php index 28e65fbf3..10357f3f8 100644 --- a/src/Libraries/Captcha/Traits/CaptchaTrait.php +++ b/src/Captcha/Traits/CaptchaTrait.php @@ -12,39 +12,39 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Captcha\Traits; +namespace Quantum\Captcha\Traits; -use Quantum\Libraries\Captcha\Contracts\CaptchaInterface; -use Quantum\Libraries\Asset\Exceptions\AssetException; -use Quantum\Libraries\Lang\Exceptions\LangException; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Captcha\Contracts\CaptchaInterface; +use Quantum\Asset\Exceptions\AssetException; +use Quantum\Lang\Exceptions\LangException; use Quantum\Http\Exceptions\HttpException; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Asset\AssetManager; -use Quantum\Libraries\Asset\Asset; +use Quantum\HttpClient\HttpClient; +use Quantum\Asset\AssetManager; +use Quantum\Asset\Asset; use ErrorException; use Exception; /** * Trait CaptchaTrait - * @package Quantum\Libraries\Captcha + * @package Quantum\Captcha */ trait CaptchaTrait { /** - * @var string + * @var string|null */ - protected $siteKey; + protected ?string $siteKey; /** - * @var string + * @var string|null */ - protected $secretKey; + protected ?string $secretKey; /** * @var HttpClient */ - protected $http; + protected HttpClient $http; /** * @var mixed|null @@ -54,12 +54,12 @@ trait CaptchaTrait /** * @var array */ - protected $errorCodes = []; + protected array $errorCodes = []; /** * @var array */ - protected $elementAttributes = []; + protected array $elementAttributes = []; /** * @return string|null diff --git a/src/Console/Commands/CronRunCommand.php b/src/Console/Commands/CronRunCommand.php index 43d7693c9..eceb55a24 100644 --- a/src/Console/Commands/CronRunCommand.php +++ b/src/Console/Commands/CronRunCommand.php @@ -14,9 +14,9 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Cron\Exceptions\CronException; -use Quantum\Libraries\Cron\CronManager; +use Quantum\Cron\Exceptions\CronException; use Quantum\Console\QtCommand; +use Quantum\Cron\CronManager; /** * Class CronRunCommand diff --git a/src/Console/Commands/DebugBarCommand.php b/src/Console/Commands/DebugBarCommand.php index 30af5cc7a..423087086 100644 --- a/src/Console/Commands/DebugBarCommand.php +++ b/src/Console/Commands/DebugBarCommand.php @@ -14,12 +14,12 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Storage\Exceptions\FileSystemException; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Exceptions\FileSystemException; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Storage\FileSystem; use Quantum\Di\Exceptions\DiException; +use Quantum\Storage\FileSystem; use Quantum\Console\QtCommand; use ReflectionException; @@ -31,9 +31,9 @@ class DebugBarCommand extends QtCommand { /** * File System - * @var FileSystem + * @var FileSystem|null */ - protected $fs; + protected ?FileSystem $fs = null; /** * Command name @@ -57,13 +57,13 @@ class DebugBarCommand extends QtCommand * Path to public debug bar resources * @var string */ - private $publicDebugBarFolderPath = 'public/assets/DebugBar/Resources'; + private string $publicDebugBarFolderPath = 'public/assets/DebugBar/Resources'; /** * Path to vendor debug bar resources * @var string */ - private $vendorDebugBarFolderPath = 'vendor/php-debugbar/php-debugbar/src/DebugBar/Resources'; + private string $vendorDebugBarFolderPath = 'vendor/php-debugbar/php-debugbar/src/DebugBar/Resources'; /** * Executes the command and publishes the debug bar assets diff --git a/src/Console/Commands/EnvCommand.php b/src/Console/Commands/EnvCommand.php index 06e73720e..5d8a48267 100644 --- a/src/Console/Commands/EnvCommand.php +++ b/src/Console/Commands/EnvCommand.php @@ -14,7 +14,7 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; diff --git a/src/Console/Commands/MigrationGenerateCommand.php b/src/Console/Commands/MigrationGenerateCommand.php index b2b8a1364..edb6da4e9 100644 --- a/src/Console/Commands/MigrationGenerateCommand.php +++ b/src/Console/Commands/MigrationGenerateCommand.php @@ -14,8 +14,8 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Lang\Exceptions\LangException; use Quantum\Migration\Exceptions\MigrationException; +use Quantum\Lang\Exceptions\LangException; use Quantum\Migration\MigrationManager; use Quantum\Console\QtCommand; diff --git a/src/Console/Commands/MigrationMigrateCommand.php b/src/Console/Commands/MigrationMigrateCommand.php index 65ef7d6ff..f9c870d94 100644 --- a/src/Console/Commands/MigrationMigrateCommand.php +++ b/src/Console/Commands/MigrationMigrateCommand.php @@ -14,10 +14,10 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Database\Exceptions\DatabaseException; -use Quantum\Libraries\Lang\Exceptions\LangException; use Quantum\Migration\Exceptions\MigrationException; +use Quantum\Database\Exceptions\DatabaseException; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Lang\Exceptions\LangException; use Quantum\App\Exceptions\BaseException; use Quantum\Migration\MigrationManager; use Quantum\Di\Exceptions\DiException; diff --git a/src/Console/Commands/OpenApiCommand.php b/src/Console/Commands/OpenApiCommand.php index 49bc0634d..c63f4bded 100644 --- a/src/Console/Commands/OpenApiCommand.php +++ b/src/Console/Commands/OpenApiCommand.php @@ -14,18 +14,18 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Module\Exceptions\ModuleException; use Quantum\Router\Exceptions\RouteException; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Storage\FileSystem; use Quantum\Di\Exceptions\DiException; use Quantum\Router\RouteCollection; use Quantum\Module\ModuleLoader; use Quantum\Router\RouteBuilder; +use Quantum\Storage\FileSystem; use Quantum\Console\QtCommand; -use Quantum\Di\Di; use OpenApi\Generator; +use Quantum\Di\Di; /** * Class OpenApiUiAssetsCommand @@ -191,7 +191,7 @@ private function openapiRoutes(string $module): string }); $route->get("spec", function (Quantum\Http\Response $response) { - $fs = Quantum\Libraries\Storage\Factories\FileSystemFactory::get(); + $fs = Quantum\Storage\Factories\FileSystemFactory::get(); $response->json($fs->getJson(modules_dir() . "' . DS . $module . DS . 'resources' . DS . 'openapi' . DS . 'spec.json")); }); });' . PHP_EOL; diff --git a/src/Console/Commands/ResourceCacheClearCommand.php b/src/Console/Commands/ResourceCacheClearCommand.php index 5a3ec413d..6cdaa32f4 100644 --- a/src/Console/Commands/ResourceCacheClearCommand.php +++ b/src/Console/Commands/ResourceCacheClearCommand.php @@ -14,10 +14,11 @@ namespace Quantum\Console\Commands; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; +use Quantum\Storage\FileSystem; use Quantum\Console\QtCommand; use Quantum\Loader\Setup; use ReflectionException; @@ -60,35 +61,35 @@ class ResourceCacheClearCommand extends QtCommand /** * @var array */ - protected $types = ['views', 'asserts']; + protected array $types = ['views', 'asserts']; /** * @var array */ - protected $modules; + protected array $modules = []; /** * @var string|null */ - protected $type = null; + protected ?string $type = null; /** * @var string|null */ - protected $module = null; + protected ?string $module = null; /** * @var string */ - protected $cacheDir; + protected string $cacheDir = ''; /** - * @var object + * @var FileSystem|null */ - protected $fs; + protected ?FileSystem $fs = null; /** - * @throws BaseException + * @throws BaseException|ReflectionException */ public function exec() { diff --git a/src/Libraries/Cookie/Contracts/CookieStorageInterface.php b/src/Cookie/Contracts/CookieStorageInterface.php similarity index 92% rename from src/Libraries/Cookie/Contracts/CookieStorageInterface.php rename to src/Cookie/Contracts/CookieStorageInterface.php index 250e0152a..fa5351dae 100644 --- a/src/Libraries/Cookie/Contracts/CookieStorageInterface.php +++ b/src/Cookie/Contracts/CookieStorageInterface.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cookie\Contracts; +namespace Quantum\Cookie\Contracts; use Quantum\Contracts\StorageInterface; /** * Interface CookieStorageInterface - * @package Quantum\Libraries\Cookie + * @package Quantum\Cookie */ interface CookieStorageInterface extends StorageInterface { diff --git a/src/Libraries/Cookie/Cookie.php b/src/Cookie/Cookie.php similarity index 95% rename from src/Libraries/Cookie/Cookie.php rename to src/Cookie/Cookie.php index 5154f91e1..a52d6d8f4 100644 --- a/src/Libraries/Cookie/Cookie.php +++ b/src/Cookie/Cookie.php @@ -12,14 +12,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cookie; +namespace Quantum\Cookie; -use Quantum\Libraries\Cookie\Contracts\CookieStorageInterface; +use Quantum\Cookie\Contracts\CookieStorageInterface; use Quantum\App\Exceptions\BaseException; /** * Class Cookie - * @package Quantum\Libraries\Cookie + * @package Quantum\Cookie */ class Cookie implements CookieStorageInterface { diff --git a/src/Libraries/Cookie/Helpers/cookie.php b/src/Cookie/Helpers/cookie.php similarity index 91% rename from src/Libraries/Cookie/Helpers/cookie.php rename to src/Cookie/Helpers/cookie.php index 98738979b..0b70ed964 100644 --- a/src/Libraries/Cookie/Helpers/cookie.php +++ b/src/Cookie/Helpers/cookie.php @@ -12,7 +12,7 @@ * @since 3.0.0 */ -use Quantum\Libraries\Cookie\Cookie; +use Quantum\Cookie\Cookie; /** * Gets cookie handler diff --git a/src/Libraries/Cron/Contracts/CronTaskInterface.php b/src/Cron/Contracts/CronTaskInterface.php similarity index 91% rename from src/Libraries/Cron/Contracts/CronTaskInterface.php rename to src/Cron/Contracts/CronTaskInterface.php index 90c991ccd..49e63a10f 100644 --- a/src/Libraries/Cron/Contracts/CronTaskInterface.php +++ b/src/Cron/Contracts/CronTaskInterface.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Cron\Contracts; +namespace Quantum\Cron\Contracts; /** * Interface CronTaskInterface - * @package Quantum\Libraries\Cron + * @package Quantum\Cron */ interface CronTaskInterface { diff --git a/src/Libraries/Cron/CronLock.php b/src/Cron/CronLock.php similarity index 98% rename from src/Libraries/Cron/CronLock.php rename to src/Cron/CronLock.php index 203a076ad..590b8aec6 100644 --- a/src/Libraries/Cron/CronLock.php +++ b/src/Cron/CronLock.php @@ -1,8 +1,8 @@ append($envFilePath, PHP_EOL . $key . '=' . $value . PHP_EOL); } - $this->envContent = $this->loadDotenvFile(true); + $this->envContent[$key] = $value; } /** diff --git a/src/Libraries/Hasher/Enums/ExceptionMessages.php b/src/Hasher/Enums/ExceptionMessages.php similarity index 88% rename from src/Libraries/Hasher/Enums/ExceptionMessages.php rename to src/Hasher/Enums/ExceptionMessages.php index f190dff22..2d08717df 100644 --- a/src/Libraries/Hasher/Enums/ExceptionMessages.php +++ b/src/Hasher/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Hasher\Enums; +namespace Quantum\Hasher\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Hasher + * @package Quantum\Hasher */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Hasher/Exceptions/HasherException.php b/src/Hasher/Exceptions/HasherException.php similarity index 87% rename from src/Libraries/Hasher/Exceptions/HasherException.php rename to src/Hasher/Exceptions/HasherException.php index 58537d415..239c5b775 100644 --- a/src/Libraries/Hasher/Exceptions/HasherException.php +++ b/src/Hasher/Exceptions/HasherException.php @@ -14,14 +14,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Hasher\Exceptions; +namespace Quantum\Hasher\Exceptions; -use Quantum\Libraries\Hasher\Enums\ExceptionMessages; +use Quantum\Hasher\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; /** * Class HasherException - * @package Quantum\Libraries\Hasher + * @package Quantum\Hasher */ class HasherException extends BaseException { diff --git a/src/Libraries/Hasher/Hasher.php b/src/Hasher/Hasher.php similarity index 95% rename from src/Libraries/Hasher/Hasher.php rename to src/Hasher/Hasher.php index 2706a0e22..c1bd05af2 100644 --- a/src/Libraries/Hasher/Hasher.php +++ b/src/Hasher/Hasher.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Hasher; +namespace Quantum\Hasher; -use Quantum\Libraries\Hasher\Exceptions\HasherException; +use Quantum\Hasher\Exceptions\HasherException; /** * Hasher class - * @package Quantum\Libraries\Hasher + * @package Quantum\Hasher */ class Hasher { diff --git a/src/Http/Request/HttpRequest.php b/src/Http/Request/HttpRequest.php index 625a1267b..b72a1c593 100644 --- a/src/Http/Request/HttpRequest.php +++ b/src/Http/Request/HttpRequest.php @@ -27,9 +27,9 @@ use Quantum\Http\Traits\Request\Body; use Quantum\Http\Traits\Request\File; use Quantum\Http\Traits\Request\Url; -use Quantum\Libraries\Csrf\Csrf; use Quantum\Environment\Server; use ReflectionException; +use Quantum\Csrf\Csrf; /** * Class HttpRequest diff --git a/src/Http/Traits/Request/File.php b/src/Http/Traits/Request/File.php index 05e841f14..b28f1a4a4 100644 --- a/src/Http/Traits/Request/File.php +++ b/src/Http/Traits/Request/File.php @@ -14,9 +14,9 @@ namespace Quantum\Http\Traits\Request; -use Quantum\Libraries\Storage\Exceptions\FileUploadException; -use Quantum\Libraries\Storage\UploadedFile; +use Quantum\Storage\Exceptions\FileUploadException; use Quantum\App\Exceptions\BaseException; +use Quantum\Storage\UploadedFile; use ReflectionException; /** @@ -29,7 +29,7 @@ trait File * Files * @var array */ - private static $__files = []; + private static array $__files = []; /** * Checks to see if request contains file diff --git a/src/Http/Traits/Request/RawInput.php b/src/Http/Traits/Request/RawInput.php index 90c61a29d..c135f0899 100644 --- a/src/Http/Traits/Request/RawInput.php +++ b/src/Http/Traits/Request/RawInput.php @@ -14,12 +14,12 @@ namespace Quantum\Http\Traits\Request; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\Storage\UploadedFile; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; use Quantum\Http\Enums\ContentType; +use Quantum\Storage\UploadedFile; use Quantum\Environment\Server; use ReflectionException; diff --git a/src/Libraries/HttpClient/Enums/ExceptionMessages.php b/src/HttpClient/Enums/ExceptionMessages.php similarity index 85% rename from src/Libraries/HttpClient/Enums/ExceptionMessages.php rename to src/HttpClient/Enums/ExceptionMessages.php index 8c89d0924..c81c7240d 100644 --- a/src/Libraries/HttpClient/Enums/ExceptionMessages.php +++ b/src/HttpClient/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\HttpClient\Enums; +namespace Quantum\HttpClient\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\HttpClient + * @package Quantum\HttpClient */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/HttpClient/Exceptions/HttpClientException.php b/src/HttpClient/Exceptions/HttpClientException.php similarity index 82% rename from src/Libraries/HttpClient/Exceptions/HttpClientException.php rename to src/HttpClient/Exceptions/HttpClientException.php index dc9f3543d..ccef57249 100644 --- a/src/Libraries/HttpClient/Exceptions/HttpClientException.php +++ b/src/HttpClient/Exceptions/HttpClientException.php @@ -14,14 +14,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\HttpClient\Exceptions; +namespace Quantum\HttpClient\Exceptions; -use Quantum\Libraries\HttpClient\Enums\ExceptionMessages; +use Quantum\HttpClient\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; /** * Class HasherException - * @package Quantum\Libraries\Hasher + * @package Quantum\Hasher */ class HttpClientException extends BaseException { diff --git a/src/Libraries/HttpClient/HttpClient.php b/src/HttpClient/HttpClient.php similarity index 98% rename from src/Libraries/HttpClient/HttpClient.php rename to src/HttpClient/HttpClient.php index 80b0d19b8..5407eb832 100644 --- a/src/Libraries/HttpClient/HttpClient.php +++ b/src/HttpClient/HttpClient.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\HttpClient; +namespace Quantum\HttpClient; -use Quantum\Libraries\HttpClient\Exceptions\HttpClientException; +use Quantum\HttpClient\Exceptions\HttpClientException; use Quantum\App\Exceptions\BaseException; use Curl\CaseInsensitiveArray; use Curl\MultiCurl; @@ -23,7 +23,7 @@ /** * HttpClient Class - * @package Quantum\Libraries\HttpClient + * @package Quantum\HttpClient * @uses php-curl-class/php-curl-class * @method object addGet(string $url, array $data = []) * @method object addPost(string $url, string $data = '', bool $follow_303_with_post = false) diff --git a/src/Libraries/Jwt/Enums/ExceptionMessages.php b/src/Jwt/Enums/ExceptionMessages.php similarity index 87% rename from src/Libraries/Jwt/Enums/ExceptionMessages.php rename to src/Jwt/Enums/ExceptionMessages.php index 5b3f1b619..a01ca80a6 100644 --- a/src/Libraries/Jwt/Enums/ExceptionMessages.php +++ b/src/Jwt/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Jwt\Enums; +namespace Quantum\Jwt\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Jwt + * @package Quantum\Jwt */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Jwt/Exceptions/JwtException.php b/src/Jwt/Exceptions/JwtException.php similarity index 82% rename from src/Libraries/Jwt/Exceptions/JwtException.php rename to src/Jwt/Exceptions/JwtException.php index 3448a7066..bdb3edf6c 100644 --- a/src/Libraries/Jwt/Exceptions/JwtException.php +++ b/src/Jwt/Exceptions/JwtException.php @@ -14,14 +14,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Jwt\Exceptions; +namespace Quantum\Jwt\Exceptions; -use Quantum\Libraries\Jwt\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; +use Quantum\Jwt\Enums\ExceptionMessages; /** * Class JwtException - * @package Quantum\Libraries\JwtToken + * @package Quantum\JwtToken */ class JwtException extends BaseException { diff --git a/src/Libraries/Jwt/JwtToken.php b/src/Jwt/JwtToken.php similarity index 93% rename from src/Libraries/Jwt/JwtToken.php rename to src/Jwt/JwtToken.php index acf22922d..82393ca80 100644 --- a/src/Libraries/Jwt/JwtToken.php +++ b/src/Jwt/JwtToken.php @@ -12,16 +12,16 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Jwt; +namespace Quantum\Jwt; -use Quantum\Libraries\Jwt\Exceptions\JwtException; use Quantum\Environment\Exceptions\EnvException; +use Quantum\Jwt\Exceptions\JwtException; use Firebase\JWT\JWT; use Firebase\JWT\Key; /** * Class JwtToken - * @package Quantum\Libraries\JwtToken + * @package Quantum\JwtToken * @uses JWT */ class JwtToken extends JWT @@ -30,24 +30,24 @@ class JwtToken extends JWT * JWT secret key * @var string */ - private $key; + private string $key; /** * Encryption algorithm * @var string */ - private $algorithm = 'HS256'; + private string $algorithm = 'HS256'; /** * Payload data * @var array */ - private $payload = []; + private array $payload = []; /** * @var object|null */ - private $fetchedPayload = null; + private ?object $fetchedPayload = null; /** * JwtToken constructor. diff --git a/src/Libraries/Lang/Enums/ExceptionMessages.php b/src/Lang/Enums/ExceptionMessages.php similarity index 89% rename from src/Libraries/Lang/Enums/ExceptionMessages.php rename to src/Lang/Enums/ExceptionMessages.php index 665e5f0d3..8b8354a9e 100644 --- a/src/Libraries/Lang/Enums/ExceptionMessages.php +++ b/src/Lang/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Lang\Enums; +namespace Quantum\Lang\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Lang + * @package Quantum\Lang */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Lang/Exceptions/LangException.php b/src/Lang/Exceptions/LangException.php similarity index 87% rename from src/Libraries/Lang/Exceptions/LangException.php rename to src/Lang/Exceptions/LangException.php index 30ed55f43..7c5eb097c 100644 --- a/src/Libraries/Lang/Exceptions/LangException.php +++ b/src/Lang/Exceptions/LangException.php @@ -14,14 +14,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Lang\Exceptions; +namespace Quantum\Lang\Exceptions; -use Quantum\Libraries\Lang\Enums\ExceptionMessages; +use Quantum\Lang\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; /** * Class LangException - * @package Quantum\Libraries\Lang + * @package Quantum\Lang */ class LangException extends BaseException { diff --git a/src/Libraries/Lang/Factories/LangFactory.php b/src/Lang/Factories/LangFactory.php similarity index 93% rename from src/Libraries/Lang/Factories/LangFactory.php rename to src/Lang/Factories/LangFactory.php index db9e98d26..5c2d47186 100644 --- a/src/Libraries/Lang/Factories/LangFactory.php +++ b/src/Lang/Factories/LangFactory.php @@ -12,27 +12,27 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Lang\Factories; +namespace Quantum\Lang\Factories; -use Quantum\Libraries\Lang\Exceptions\LangException; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Lang\Exceptions\LangException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Lang\Translator; -use Quantum\Libraries\Lang\Lang; +use Quantum\Lang\Translator; use Quantum\Http\Request; use Quantum\Loader\Setup; use ReflectionException; +use Quantum\Lang\Lang; /** * Class LangFactory - * @package Quantum\Libraries\Lang + * @package Quantum\Lang */ class LangFactory { /** * @var Lang|null Cached Lang instance */ - private static $instance = null; + private static ?Lang $instance = null; /** * @return Lang diff --git a/src/Libraries/Lang/Helpers/lang.php b/src/Lang/Helpers/lang.php similarity index 92% rename from src/Libraries/Lang/Helpers/lang.php rename to src/Lang/Helpers/lang.php index 732285c8f..1649d99ba 100644 --- a/src/Libraries/Lang/Helpers/lang.php +++ b/src/Lang/Helpers/lang.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -use Quantum\Libraries\Lang\Exceptions\LangException; -use Quantum\Libraries\Lang\Factories\LangFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Lang\Exceptions\LangException; +use Quantum\Lang\Factories\LangFactory; use Quantum\Di\Exceptions\DiException; /** diff --git a/src/Libraries/Lang/Lang.php b/src/Lang/Lang.php similarity index 96% rename from src/Libraries/Lang/Lang.php rename to src/Lang/Lang.php index 87039c29c..b4d96eaea 100644 --- a/src/Libraries/Lang/Lang.php +++ b/src/Lang/Lang.php @@ -12,7 +12,7 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Lang; +namespace Quantum\Lang; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; @@ -21,7 +21,7 @@ /** * Class Lang - * @package Quantum\Libraries\Lang + * @package Quantum\Lang */ class Lang { diff --git a/src/Libraries/Lang/Translator.php b/src/Lang/Translator.php similarity index 94% rename from src/Libraries/Lang/Translator.php rename to src/Lang/Translator.php index 30e7a0b53..66d3e9341 100644 --- a/src/Libraries/Lang/Translator.php +++ b/src/Lang/Translator.php @@ -12,10 +12,10 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Lang; +namespace Quantum\Lang; -use Quantum\Libraries\Lang\Exceptions\LangException; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Lang\Exceptions\LangException; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; use Dflydev\DotAccessData\Data; @@ -23,16 +23,16 @@ /** * Class Translator - * @package Quantum\Libraries\Lang + * @package Quantum\Lang */ class Translator { - protected $lang; + protected string $lang; /** * @var Data|null */ - private $translations = null; + private ?Data $translations = null; /** * @param string $lang diff --git a/src/Libraries/Logger/Adapters/DailyAdapter.php b/src/Logger/Adapters/DailyAdapter.php similarity index 83% rename from src/Libraries/Logger/Adapters/DailyAdapter.php rename to src/Logger/Adapters/DailyAdapter.php index 7f0477142..9047a3c53 100644 --- a/src/Libraries/Logger/Adapters/DailyAdapter.php +++ b/src/Logger/Adapters/DailyAdapter.php @@ -12,14 +12,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Adapters; +namespace Quantum\Logger\Adapters; -use Quantum\Libraries\Logger\Contracts\ReportableInterface; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; -use Quantum\Libraries\Logger\Exceptions\LoggerException; -use Quantum\Libraries\Logger\Traits\LoggerTrait; +use Quantum\Logger\Contracts\ReportableInterface; +use Quantum\Storage\Factories\FileSystemFactory; +use Quantum\Logger\Exceptions\LoggerException; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; +use Quantum\Logger\Traits\LoggerTrait; use Quantum\Di\Exceptions\DiException; use ReflectionException; diff --git a/src/Libraries/Logger/Adapters/MessageAdapter.php b/src/Logger/Adapters/MessageAdapter.php similarity index 89% rename from src/Libraries/Logger/Adapters/MessageAdapter.php rename to src/Logger/Adapters/MessageAdapter.php index a2b7c3ea3..27d57e4bf 100644 --- a/src/Libraries/Logger/Adapters/MessageAdapter.php +++ b/src/Logger/Adapters/MessageAdapter.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Adapters; +namespace Quantum\Logger\Adapters; -use Quantum\Libraries\Logger\Contracts\ReportableInterface; +use Quantum\Logger\Contracts\ReportableInterface; use DebugBar\DebugBarException; use Quantum\Debugger\Debugger; diff --git a/src/Libraries/Logger/Adapters/SingleAdapter.php b/src/Logger/Adapters/SingleAdapter.php similarity index 82% rename from src/Libraries/Logger/Adapters/SingleAdapter.php rename to src/Logger/Adapters/SingleAdapter.php index 7f99e32e5..62cfe7d19 100644 --- a/src/Libraries/Logger/Adapters/SingleAdapter.php +++ b/src/Logger/Adapters/SingleAdapter.php @@ -12,14 +12,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Adapters; +namespace Quantum\Logger\Adapters; -use Quantum\Libraries\Logger\Contracts\ReportableInterface; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; -use Quantum\Libraries\Logger\Exceptions\LoggerException; -use Quantum\Libraries\Logger\Traits\LoggerTrait; +use Quantum\Logger\Contracts\ReportableInterface; +use Quantum\Storage\Factories\FileSystemFactory; +use Quantum\Logger\Exceptions\LoggerException; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; +use Quantum\Logger\Traits\LoggerTrait; use Quantum\Di\Exceptions\DiException; use ReflectionException; diff --git a/src/Libraries/Logger/Contracts/ReportableInterface.php b/src/Logger/Contracts/ReportableInterface.php similarity index 92% rename from src/Libraries/Logger/Contracts/ReportableInterface.php rename to src/Logger/Contracts/ReportableInterface.php index 095ee2ddc..a483680f6 100644 --- a/src/Libraries/Logger/Contracts/ReportableInterface.php +++ b/src/Logger/Contracts/ReportableInterface.php @@ -12,7 +12,7 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Contracts; +namespace Quantum\Logger\Contracts; /** * Interface ReportableInterface diff --git a/src/Libraries/Logger/Enums/ExceptionMessages.php b/src/Logger/Enums/ExceptionMessages.php similarity index 88% rename from src/Libraries/Logger/Enums/ExceptionMessages.php rename to src/Logger/Enums/ExceptionMessages.php index cb814e7e4..663398e76 100644 --- a/src/Libraries/Logger/Enums/ExceptionMessages.php +++ b/src/Logger/Enums/ExceptionMessages.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Enums; +namespace Quantum\Logger\Enums; use Quantum\App\Enums\ExceptionMessages as BaseExceptionMessages; /** * Class ExceptionMessages - * @package Quantum\Libraries\Logger + * @package Quantum\Logger */ final class ExceptionMessages extends BaseExceptionMessages { diff --git a/src/Libraries/Logger/Exceptions/LoggerException.php b/src/Logger/Exceptions/LoggerException.php similarity index 91% rename from src/Libraries/Logger/Exceptions/LoggerException.php rename to src/Logger/Exceptions/LoggerException.php index f42a774fc..f22d8c596 100644 --- a/src/Libraries/Logger/Exceptions/LoggerException.php +++ b/src/Logger/Exceptions/LoggerException.php @@ -14,9 +14,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Exceptions; +namespace Quantum\Logger\Exceptions; -use Quantum\Libraries\Logger\Enums\ExceptionMessages; +use Quantum\Logger\Enums\ExceptionMessages; use Quantum\App\Exceptions\BaseException; /** diff --git a/src/Libraries/Logger/Factories/LoggerFactory.php b/src/Logger/Factories/LoggerFactory.php similarity index 88% rename from src/Libraries/Logger/Factories/LoggerFactory.php rename to src/Logger/Factories/LoggerFactory.php index 95325e790..b340149c2 100644 --- a/src/Libraries/Logger/Factories/LoggerFactory.php +++ b/src/Logger/Factories/LoggerFactory.php @@ -12,17 +12,17 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Factories; +namespace Quantum\Logger\Factories; -use Quantum\Libraries\Logger\Exceptions\LoggerException; -use Quantum\Libraries\Logger\Adapters\MessageAdapter; -use Quantum\Libraries\Logger\Adapters\SingleAdapter; -use Quantum\Libraries\Logger\Adapters\DailyAdapter; +use Quantum\Logger\Exceptions\LoggerException; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\Logger\LoggerConfig; +use Quantum\Logger\Adapters\MessageAdapter; +use Quantum\Logger\Adapters\SingleAdapter; +use Quantum\Logger\Adapters\DailyAdapter; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Logger\Logger; +use Quantum\Logger\LoggerConfig; +use Quantum\Logger\Logger; use Quantum\Loader\Setup; use ReflectionException; diff --git a/src/Libraries/Logger/Helpers/logger.php b/src/Logger/Helpers/logger.php similarity index 95% rename from src/Libraries/Logger/Helpers/logger.php rename to src/Logger/Helpers/logger.php index a64077b72..7ac80c358 100644 --- a/src/Libraries/Logger/Helpers/logger.php +++ b/src/Logger/Helpers/logger.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -use Quantum\Libraries\Logger\Factories\LoggerFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Logger\Factories\LoggerFactory; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Logger\Logger; +use Quantum\Logger\Logger; /** * @param string|null $adapter diff --git a/src/Libraries/Logger/Logger.php b/src/Logger/Logger.php similarity index 96% rename from src/Libraries/Logger/Logger.php rename to src/Logger/Logger.php index 10016fc38..29c4889f0 100644 --- a/src/Libraries/Logger/Logger.php +++ b/src/Logger/Logger.php @@ -12,9 +12,9 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger; +namespace Quantum\Logger; -use Quantum\Libraries\Logger\Contracts\ReportableInterface; +use Quantum\Logger\Contracts\ReportableInterface; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; diff --git a/src/Libraries/Logger/LoggerConfig.php b/src/Logger/LoggerConfig.php similarity index 97% rename from src/Libraries/Logger/LoggerConfig.php rename to src/Logger/LoggerConfig.php index 1a232002a..b80aa40f9 100644 --- a/src/Libraries/Logger/LoggerConfig.php +++ b/src/Logger/LoggerConfig.php @@ -12,7 +12,7 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger; +namespace Quantum\Logger; /** * Class LoggerConfig diff --git a/src/Libraries/Logger/Traits/LoggerTrait.php b/src/Logger/Traits/LoggerTrait.php similarity index 91% rename from src/Libraries/Logger/Traits/LoggerTrait.php rename to src/Logger/Traits/LoggerTrait.php index 0ddf4fd9d..cf6c297b0 100644 --- a/src/Libraries/Logger/Traits/LoggerTrait.php +++ b/src/Logger/Traits/LoggerTrait.php @@ -12,10 +12,10 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Logger\Traits; +namespace Quantum\Logger\Traits; -use Quantum\Libraries\Logger\Exceptions\LoggerException; -use Quantum\Libraries\Storage\FileSystem; +use Quantum\Logger\Exceptions\LoggerException; +use Quantum\Storage\FileSystem; /** * Trait LoggerTrait diff --git a/src/Libraries/Mailer/Adapters/MailgunAdapter.php b/src/Mailer/Adapters/MailgunAdapter.php similarity index 91% rename from src/Libraries/Mailer/Adapters/MailgunAdapter.php rename to src/Mailer/Adapters/MailgunAdapter.php index 6a2c97da7..e86c4854d 100644 --- a/src/Libraries/Mailer/Adapters/MailgunAdapter.php +++ b/src/Mailer/Adapters/MailgunAdapter.php @@ -12,16 +12,16 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Adapters; +namespace Quantum\Mailer\Adapters; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; -use Quantum\Libraries\Mailer\Traits\MailerTrait; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Mailer\Contracts\MailerInterface; +use Quantum\Mailer\Traits\MailerTrait; +use Quantum\HttpClient\HttpClient; use Exception; /** * class MailgunAdapter - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class MailgunAdapter implements MailerInterface { diff --git a/src/Libraries/Mailer/Adapters/MandrillAdapter.php b/src/Mailer/Adapters/MandrillAdapter.php similarity index 90% rename from src/Libraries/Mailer/Adapters/MandrillAdapter.php rename to src/Mailer/Adapters/MandrillAdapter.php index ed958cb80..60284ef2a 100644 --- a/src/Libraries/Mailer/Adapters/MandrillAdapter.php +++ b/src/Mailer/Adapters/MandrillAdapter.php @@ -12,16 +12,16 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Adapters; +namespace Quantum\Mailer\Adapters; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; -use Quantum\Libraries\Mailer\Traits\MailerTrait; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Mailer\Contracts\MailerInterface; +use Quantum\Mailer\Traits\MailerTrait; +use Quantum\HttpClient\HttpClient; use Exception; /** * class MandrillAdapter - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class MandrillAdapter implements MailerInterface { diff --git a/src/Libraries/Mailer/Adapters/SendgridAdapter.php b/src/Mailer/Adapters/SendgridAdapter.php similarity index 90% rename from src/Libraries/Mailer/Adapters/SendgridAdapter.php rename to src/Mailer/Adapters/SendgridAdapter.php index 22ccf6e40..b7f0af01e 100644 --- a/src/Libraries/Mailer/Adapters/SendgridAdapter.php +++ b/src/Mailer/Adapters/SendgridAdapter.php @@ -12,16 +12,16 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Adapters; +namespace Quantum\Mailer\Adapters; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; -use Quantum\Libraries\Mailer\Traits\MailerTrait; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Mailer\Contracts\MailerInterface; +use Quantum\Mailer\Traits\MailerTrait; +use Quantum\HttpClient\HttpClient; use Exception; /** * class SendgridAdapter - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class SendgridAdapter implements MailerInterface { diff --git a/src/Libraries/Mailer/Adapters/SendinblueAdapter.php b/src/Mailer/Adapters/SendinblueAdapter.php similarity index 90% rename from src/Libraries/Mailer/Adapters/SendinblueAdapter.php rename to src/Mailer/Adapters/SendinblueAdapter.php index f3b4417ab..1407697ee 100644 --- a/src/Libraries/Mailer/Adapters/SendinblueAdapter.php +++ b/src/Mailer/Adapters/SendinblueAdapter.php @@ -12,16 +12,16 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Adapters; +namespace Quantum\Mailer\Adapters; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; -use Quantum\Libraries\Mailer\Traits\MailerTrait; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Mailer\Contracts\MailerInterface; +use Quantum\Mailer\Traits\MailerTrait; +use Quantum\HttpClient\HttpClient; use Exception; /** * class SendinblueAdapter - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class SendinblueAdapter implements MailerInterface { diff --git a/src/Libraries/Mailer/Adapters/SmtpAdapter.php b/src/Mailer/Adapters/SmtpAdapter.php similarity index 97% rename from src/Libraries/Mailer/Adapters/SmtpAdapter.php rename to src/Mailer/Adapters/SmtpAdapter.php index 850cd4a32..0cd69b7e3 100644 --- a/src/Libraries/Mailer/Adapters/SmtpAdapter.php +++ b/src/Mailer/Adapters/SmtpAdapter.php @@ -12,10 +12,10 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Adapters; +namespace Quantum\Mailer\Adapters; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; -use Quantum\Libraries\Mailer\Traits\MailerTrait; +use Quantum\Mailer\Contracts\MailerInterface; +use Quantum\Mailer\Traits\MailerTrait; use PHPMailer\PHPMailer\PHPMailer; use Quantum\Debugger\Debugger; use PHPMailer\PHPMailer\SMTP; @@ -23,7 +23,7 @@ /** * class SmtpAdapter - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class SmtpAdapter implements MailerInterface { diff --git a/src/Libraries/Mailer/Contracts/MailerInterface.php b/src/Mailer/Contracts/MailerInterface.php similarity index 95% rename from src/Libraries/Mailer/Contracts/MailerInterface.php rename to src/Mailer/Contracts/MailerInterface.php index a0ffe9ffe..e9506a4c3 100644 --- a/src/Libraries/Mailer/Contracts/MailerInterface.php +++ b/src/Mailer/Contracts/MailerInterface.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Contracts; +namespace Quantum\Mailer\Contracts; /** * Interface MailerInterface - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ interface MailerInterface { diff --git a/src/Libraries/Mailer/Exceptions/MailerException.php b/src/Mailer/Exceptions/MailerException.php similarity index 84% rename from src/Libraries/Mailer/Exceptions/MailerException.php rename to src/Mailer/Exceptions/MailerException.php index 57a38003c..ba1aa54c9 100644 --- a/src/Libraries/Mailer/Exceptions/MailerException.php +++ b/src/Mailer/Exceptions/MailerException.php @@ -14,13 +14,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Exceptions; +namespace Quantum\Mailer\Exceptions; use Quantum\App\Exceptions\BaseException; /** * Class MailerException - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class MailerException extends BaseException { diff --git a/src/Libraries/Mailer/Factories/MailerFactory.php b/src/Mailer/Factories/MailerFactory.php similarity index 83% rename from src/Libraries/Mailer/Factories/MailerFactory.php rename to src/Mailer/Factories/MailerFactory.php index 1307a5137..b1f799e3c 100644 --- a/src/Libraries/Mailer/Factories/MailerFactory.php +++ b/src/Mailer/Factories/MailerFactory.php @@ -12,24 +12,24 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Factories; +namespace Quantum\Mailer\Factories; -use Quantum\Libraries\Mailer\Adapters\SendinblueAdapter; -use Quantum\Libraries\Mailer\Exceptions\MailerException; -use Quantum\Libraries\Mailer\Adapters\MandrillAdapter; -use Quantum\Libraries\Mailer\Adapters\SendgridAdapter; -use Quantum\Libraries\Mailer\Adapters\MailgunAdapter; -use Quantum\Libraries\Mailer\Adapters\SmtpAdapter; +use Quantum\Mailer\Adapters\SendinblueAdapter; +use Quantum\Mailer\Exceptions\MailerException; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Mailer\Adapters\MandrillAdapter; +use Quantum\Mailer\Adapters\SendgridAdapter; +use Quantum\Mailer\Adapters\MailgunAdapter; use Quantum\App\Exceptions\BaseException; +use Quantum\Mailer\Adapters\SmtpAdapter; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Mailer\Mailer; +use Quantum\Mailer\Mailer; use Quantum\Loader\Setup; use ReflectionException; /** * class MailerFactory - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class MailerFactory { diff --git a/src/Libraries/Mailer/Helpers/mailer.php b/src/Mailer/Helpers/mailer.php similarity index 88% rename from src/Libraries/Mailer/Helpers/mailer.php rename to src/Mailer/Helpers/mailer.php index 45d4ad382..1544ea737 100644 --- a/src/Libraries/Mailer/Helpers/mailer.php +++ b/src/Mailer/Helpers/mailer.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -use Quantum\Libraries\Mailer\Factories\MailerFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Mailer\Factories\MailerFactory; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Mailer\Mailer; +use Quantum\Mailer\Mailer; /** * @param string|null $adapter diff --git a/src/Libraries/Mailer/MailTrap.php b/src/Mailer/MailTrap.php similarity index 94% rename from src/Libraries/Mailer/MailTrap.php rename to src/Mailer/MailTrap.php index a063fca74..0a769d2c3 100644 --- a/src/Libraries/Mailer/MailTrap.php +++ b/src/Mailer/MailTrap.php @@ -12,34 +12,34 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer; +namespace Quantum\Mailer; -use Quantum\Libraries\Storage\Exceptions\FileSystemException; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Exceptions\FileSystemException; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; use Phemail\Message\MessagePartInterface; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Storage\FileSystem; use Quantum\Di\Exceptions\DiException; use Phemail\Message\MessagePart; +use Quantum\Storage\FileSystem; use Phemail\MessageParser; use ReflectionException; /** * class MailTrap - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ class MailTrap { /** * @var FileSystem */ - private $fs; + private FileSystem $fs; /** * @var MessageParser */ - private $parser; + private MessageParser $parser; /** * @var MessagePart|MessagePartInterface @@ -49,12 +49,12 @@ class MailTrap /** * @var MailTrap|null */ - private static $instance = null; + private static ?MailTrap $instance = null; /** * @var string */ - private $emailsDirectory; + private string $emailsDirectory; /** * @throws BaseException diff --git a/src/Libraries/Mailer/Mailer.php b/src/Mailer/Mailer.php similarity index 91% rename from src/Libraries/Mailer/Mailer.php rename to src/Mailer/Mailer.php index 82ea97e0a..af4bf5bf7 100644 --- a/src/Libraries/Mailer/Mailer.php +++ b/src/Mailer/Mailer.php @@ -12,15 +12,15 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer; +namespace Quantum\Mailer; -use Quantum\Libraries\Mailer\Exceptions\MailerException; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; +use Quantum\Mailer\Exceptions\MailerException; +use Quantum\Mailer\Contracts\MailerInterface; use Quantum\App\Exceptions\BaseException; /** * Class Mailer - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer * @method MailerInterface setFrom(string $email, ?string $name = null) * @method array getFrom() * @method MailerInterface setAddress(string $email, ?string $name = null) diff --git a/src/Libraries/Mailer/Traits/MailerTrait.php b/src/Mailer/Traits/MailerTrait.php similarity index 97% rename from src/Libraries/Mailer/Traits/MailerTrait.php rename to src/Mailer/Traits/MailerTrait.php index 8c5b417c6..552189be6 100644 --- a/src/Libraries/Mailer/Traits/MailerTrait.php +++ b/src/Mailer/Traits/MailerTrait.php @@ -12,20 +12,20 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Mailer\Traits; +namespace Quantum\Mailer\Traits; -use Quantum\Libraries\Mailer\Contracts\MailerInterface; -use Quantum\Libraries\HttpClient\HttpClient; +use Quantum\Mailer\Contracts\MailerInterface; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Mailer\MailTrap; +use Quantum\HttpClient\HttpClient; use PHPMailer\PHPMailer\PHPMailer; use Quantum\Debugger\Debugger; +use Quantum\Mailer\MailTrap; use ReflectionException; use Exception; /** * trait MailerTrait - * @package Quantum\Libraries\Mailer + * @package Quantum\Mailer */ trait MailerTrait { diff --git a/src/Migration/MigrationManager.php b/src/Migration/MigrationManager.php index f9fdd7418..5513a3b7b 100644 --- a/src/Migration/MigrationManager.php +++ b/src/Migration/MigrationManager.php @@ -14,18 +14,18 @@ namespace Quantum\Migration; -use Quantum\Libraries\Storage\Exceptions\FileSystemException; -use Quantum\Libraries\Database\Exceptions\DatabaseException; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; -use Quantum\Libraries\Database\Factories\TableFactory; -use Quantum\Libraries\Lang\Exceptions\LangException; use Quantum\Migration\Exceptions\MigrationException; +use Quantum\Storage\Exceptions\FileSystemException; use Quantum\Migration\Templates\MigrationTemplate; +use Quantum\Database\Exceptions\DatabaseException; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Database\Factories\TableFactory; +use Quantum\Lang\Exceptions\LangException; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Storage\FileSystem; -use Quantum\Libraries\Database\Database; use Quantum\Di\Exceptions\DiException; +use Quantum\Storage\FileSystem; +use Quantum\Database\Database; use ReflectionException; /** @@ -57,27 +57,27 @@ class MigrationManager /** * @var array */ - private $migrations = []; + private array $migrations = []; /** * @var TableFactory */ - private $tableFactory; + private TableFactory $tableFactory; /** * @var string */ - private $migrationFolder; + private string $migrationFolder; /** * @var FileSystem */ - private $fs; + private FileSystem $fs; /** * @var Database */ - private $db; + private Database $db; /** * @throws BaseException diff --git a/src/Migration/MigrationTable.php b/src/Migration/MigrationTable.php index eba903755..0b571969e 100644 --- a/src/Migration/MigrationTable.php +++ b/src/Migration/MigrationTable.php @@ -14,9 +14,9 @@ namespace Quantum\Migration; -use Quantum\Libraries\Database\Exceptions\DatabaseException; -use Quantum\Libraries\Database\Factories\TableFactory; -use Quantum\Libraries\Database\Enums\Type; +use Quantum\Database\Exceptions\DatabaseException; +use Quantum\Database\Factories\TableFactory; +use Quantum\Database\Enums\Type; /** * Class MigrationTable diff --git a/src/Migration/QtMigration.php b/src/Migration/QtMigration.php index 048e6acb8..dfc2b4267 100644 --- a/src/Migration/QtMigration.php +++ b/src/Migration/QtMigration.php @@ -14,7 +14,7 @@ namespace Quantum\Migration; -use Quantum\Libraries\Database\Factories\TableFactory; +use Quantum\Database\Factories\TableFactory; /** * Class QtMigration diff --git a/src/Migration/Templates/MigrationTemplate.php b/src/Migration/Templates/MigrationTemplate.php index fe181a72e..5777ba6e1 100644 --- a/src/Migration/Templates/MigrationTemplate.php +++ b/src/Migration/Templates/MigrationTemplate.php @@ -30,7 +30,7 @@ public static function create(string $className, string $tableName): string { return ' 'The uploaded file exceeds the upload_max_filesize directive in php.ini', 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form', 3 => 'The uploaded file was only partially uploaded', @@ -104,7 +104,7 @@ class UploadedFile extends SplFileInfo * Allowed mime types => allowed extensions map * @var array */ - protected $allowedMimeTypes = [ + protected array $allowedMimeTypes = [ 'image/jpeg' => ['jpg', 'jpeg'], 'image/png' => ['png'], 'application/pdf' => ['pdf'], @@ -114,7 +114,7 @@ class UploadedFile extends SplFileInfo * Upload error code * @var int */ - protected $errorCode; + protected int $errorCode; /** * @param array $meta diff --git a/src/Tracer/ErrorHandler.php b/src/Tracer/ErrorHandler.php index 12d5831e5..b24c3ec65 100644 --- a/src/Tracer/ErrorHandler.php +++ b/src/Tracer/ErrorHandler.php @@ -14,15 +14,15 @@ namespace Quantum\Tracer; -use Quantum\Libraries\Storage\Contracts\LocalFilesystemAdapterInterface; +use Quantum\Storage\Contracts\LocalFilesystemAdapterInterface; use Symfony\Component\Console\Output\ConsoleOutput; use Quantum\Renderer\Exceptions\RendererException; use Quantum\Config\Exceptions\ConfigException; use Quantum\App\Exceptions\BaseException; use Quantum\View\Factories\ViewFactory; use Quantum\Di\Exceptions\DiException; -use Quantum\Libraries\Logger\Logger; use DebugBar\DebugBarException; +use Quantum\Logger\Logger; use Quantum\Http\Response; use ReflectionException; use Psr\Log\LogLevel; @@ -68,7 +68,7 @@ class ErrorHandler /** * @var ErrorHandler|null */ - private static $instance = null; + private static ?ErrorHandler $instance = null; private function __construct() { diff --git a/src/Libraries/Transformer/Contracts/TransformerInterface.php b/src/Transformer/Contracts/TransformerInterface.php similarity index 84% rename from src/Libraries/Transformer/Contracts/TransformerInterface.php rename to src/Transformer/Contracts/TransformerInterface.php index 19ff9263e..a54dfcbcb 100644 --- a/src/Libraries/Transformer/Contracts/TransformerInterface.php +++ b/src/Transformer/Contracts/TransformerInterface.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Transformer\Contracts; +namespace Quantum\Transformer\Contracts; /** * Interface TransformerInterface - * @package Quantum\Libraries\Transformer + * @package Quantum\Transformer */ interface TransformerInterface { diff --git a/src/Libraries/Transformer/Helpers/transformer.php b/src/Transformer/Helpers/transformer.php similarity index 83% rename from src/Libraries/Transformer/Helpers/transformer.php rename to src/Transformer/Helpers/transformer.php index b3f667875..1f3097412 100644 --- a/src/Libraries/Transformer/Helpers/transformer.php +++ b/src/Transformer/Helpers/transformer.php @@ -12,8 +12,8 @@ * @since 3.0.0 */ -use Quantum\Libraries\Transformer\Contracts\TransformerInterface; -use Quantum\Libraries\Transformer\Transformer; +use Quantum\Transformer\Contracts\TransformerInterface; +use Quantum\Transformer\Transformer; /** * Transforms the data by given transformer signature diff --git a/src/Libraries/Transformer/Transformer.php b/src/Transformer/Transformer.php similarity index 82% rename from src/Libraries/Transformer/Transformer.php rename to src/Transformer/Transformer.php index aa04922d6..ca376de44 100644 --- a/src/Libraries/Transformer/Transformer.php +++ b/src/Transformer/Transformer.php @@ -12,13 +12,13 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Transformer; +namespace Quantum\Transformer; -use Quantum\Libraries\Transformer\Contracts\TransformerInterface; +use Quantum\Transformer\Contracts\TransformerInterface; /** * Class TransformerManager - * @package Quantum\Libraries\Transformer + * @package Quantum\Transformer */ class Transformer { diff --git a/src/Libraries/Validation/Rule.php b/src/Validation/Rule.php similarity index 98% rename from src/Libraries/Validation/Rule.php rename to src/Validation/Rule.php index 585fcd23e..2dfe892c0 100644 --- a/src/Libraries/Validation/Rule.php +++ b/src/Validation/Rule.php @@ -12,7 +12,7 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation; +namespace Quantum\Validation; /** * Rule class diff --git a/src/Libraries/Validation/Traits/File.php b/src/Validation/Traits/File.php similarity index 90% rename from src/Libraries/Validation/Traits/File.php rename to src/Validation/Traits/File.php index c840c17db..deb31ac37 100644 --- a/src/Libraries/Validation/Traits/File.php +++ b/src/Validation/Traits/File.php @@ -12,14 +12,14 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation\Traits; +namespace Quantum\Validation\Traits; -use Quantum\Libraries\Storage\Exceptions\FileUploadException; -use Quantum\Libraries\Storage\UploadedFile; +use Quantum\Storage\Exceptions\FileUploadException; +use Quantum\Storage\UploadedFile; /** * Trait File - * @package Quantum\Libraries\Validation\Rules + * @package Quantum\Validation\Rules */ trait File { diff --git a/src/Libraries/Validation/Traits/General.php b/src/Validation/Traits/General.php similarity index 97% rename from src/Libraries/Validation/Traits/General.php rename to src/Validation/Traits/General.php index 83dabab60..57f3e27d6 100644 --- a/src/Libraries/Validation/Traits/General.php +++ b/src/Validation/Traits/General.php @@ -12,10 +12,10 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation\Traits; +namespace Quantum\Validation\Traits; -use Quantum\Libraries\Captcha\Factories\CaptchaFactory; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Captcha\Factories\CaptchaFactory; use Quantum\Model\Exceptions\ModelException; use Quantum\App\Exceptions\BaseException; use Quantum\Model\Factories\ModelFactory; @@ -26,7 +26,7 @@ /** * Trait General - * @package Quantum\Libraries\Validation + * @package Quantum\Validation */ trait General { diff --git a/src/Libraries/Validation/Traits/Length.php b/src/Validation/Traits/Length.php similarity index 92% rename from src/Libraries/Validation/Traits/Length.php rename to src/Validation/Traits/Length.php index d8d7676ff..2a743ba13 100644 --- a/src/Libraries/Validation/Traits/Length.php +++ b/src/Validation/Traits/Length.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation\Traits; +namespace Quantum\Validation\Traits; /** * Trait Length - * @package Quantum\Libraries\Validation\Rules + * @package Quantum\Validation\Rules */ trait Length { diff --git a/src/Libraries/Validation/Traits/Lists.php b/src/Validation/Traits/Lists.php similarity index 94% rename from src/Libraries/Validation/Traits/Lists.php rename to src/Validation/Traits/Lists.php index 6471f4c45..4288feb2c 100644 --- a/src/Libraries/Validation/Traits/Lists.php +++ b/src/Validation/Traits/Lists.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation\Traits; +namespace Quantum\Validation\Traits; /** * Trait Lists - * @package Quantum\Libraries\Validation\Rules + * @package Quantum\Validation\Rules */ trait Lists { diff --git a/src/Libraries/Validation/Traits/Resource.php b/src/Validation/Traits/Resource.php similarity index 95% rename from src/Libraries/Validation/Traits/Resource.php rename to src/Validation/Traits/Resource.php index bcf648fea..429337b4e 100644 --- a/src/Libraries/Validation/Traits/Resource.php +++ b/src/Validation/Traits/Resource.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation\Traits; +namespace Quantum\Validation\Traits; /** * Trait Resource - * @package Quantum\Libraries\Validation\Rules + * @package Quantum\Validation\Rules */ trait Resource { diff --git a/src/Libraries/Validation/Traits/Type.php b/src/Validation/Traits/Type.php similarity index 97% rename from src/Libraries/Validation/Traits/Type.php rename to src/Validation/Traits/Type.php index 03e7d352c..2f9b5d24a 100644 --- a/src/Libraries/Validation/Traits/Type.php +++ b/src/Validation/Traits/Type.php @@ -12,11 +12,11 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation\Traits; +namespace Quantum\Validation\Traits; /** * Trait Type - * @package Quantum\Libraries\Validation\Rules + * @package Quantum\Validation\Rules */ trait Type { diff --git a/src/Libraries/Validation/Validator.php b/src/Validation/Validator.php similarity index 92% rename from src/Libraries/Validation/Validator.php rename to src/Validation/Validator.php index b0ba6a3b7..ac9ac9546 100644 --- a/src/Libraries/Validation/Validator.php +++ b/src/Validation/Validator.php @@ -12,17 +12,17 @@ * @since 3.0.0 */ -namespace Quantum\Libraries\Validation; +namespace Quantum\Validation; -use Quantum\Libraries\Lang\Exceptions\LangException; -use Quantum\Libraries\Validation\Traits\Resource; -use Quantum\Libraries\Validation\Traits\General; -use Quantum\Libraries\Validation\Traits\Length; -use Quantum\Libraries\Validation\Traits\Lists; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\Validation\Traits\Type; -use Quantum\Libraries\Validation\Traits\File; +use Quantum\Lang\Exceptions\LangException; +use Quantum\Validation\Traits\Resource; use Quantum\Di\Exceptions\DiException; +use Quantum\Validation\Traits\General; +use Quantum\Validation\Traits\Length; +use Quantum\Validation\Traits\Lists; +use Quantum\Validation\Traits\Type; +use Quantum\Validation\Traits\File; use BadMethodCallException; use ReflectionException; use RuntimeException; @@ -30,7 +30,7 @@ /** * Class Validator - * @package Quantum\Libraries\Validation + * @package Quantum\Validation */ class Validator { @@ -45,25 +45,25 @@ class Validator * Rules * @var array */ - private $rules = []; + private array $rules = []; /** * Validation Errors * @var array */ - private $errors = []; + private array $errors = []; /** * Request data * @var array */ - private $data = []; + private array $data = []; /** * Custom validation callbacks * @var Closure[] */ - private $customRules = []; + private array $customRules = []; /** * Add rules for a single field diff --git a/src/View/Factories/ViewFactory.php b/src/View/Factories/ViewFactory.php index 8531d0cad..9c080ede5 100644 --- a/src/View/Factories/ViewFactory.php +++ b/src/View/Factories/ViewFactory.php @@ -15,12 +15,12 @@ namespace Quantum\View\Factories; use Quantum\Renderer\Factories\RendererFactory; -use Quantum\Libraries\ResourceCache\ViewCache; +use Quantum\ResourceCache\ViewCache; use Quantum\Config\Exceptions\ConfigException; -use Quantum\Libraries\Asset\AssetManager; use Quantum\App\Exceptions\BaseException; use Quantum\Di\Exceptions\DiException; use DebugBar\DebugBarException; +use Quantum\Asset\AssetManager; use Quantum\Debugger\Debugger; use Quantum\View\QtView; use ReflectionException; @@ -36,7 +36,7 @@ class ViewFactory * Instance of QtView * @var QtView|null */ - private static $instance = null; + private static ?QtView $instance = null; /** * QtView instance diff --git a/src/View/QtView.php b/src/View/QtView.php index ada3f60e9..729cd243c 100644 --- a/src/View/QtView.php +++ b/src/View/QtView.php @@ -14,16 +14,16 @@ namespace Quantum\View; -use Quantum\Libraries\Database\Exceptions\DatabaseException; -use Quantum\Libraries\Session\Exceptions\SessionException; -use Quantum\Libraries\Asset\Exceptions\AssetException; -use Quantum\Libraries\ResourceCache\ViewCache; +use Quantum\Database\Exceptions\DatabaseException; +use Quantum\Session\Exceptions\SessionException; use Quantum\Config\Exceptions\ConfigException; +use Quantum\Asset\Exceptions\AssetException; use Quantum\View\Exceptions\ViewException; use Quantum\App\Exceptions\BaseException; -use Quantum\Libraries\Asset\AssetManager; use Quantum\Di\Exceptions\DiException; +use Quantum\ResourceCache\ViewCache; use Quantum\Renderer\Renderer; +use Quantum\Asset\AssetManager; use Quantum\Debugger\Debugger; use ReflectionException; use Psr\Log\LogLevel; @@ -37,46 +37,46 @@ class QtView /** * @var Renderer */ - private $renderer; + private Renderer $renderer; /** * @var AssetManager */ - private $assetManager; + private AssetManager $assetManager; /** * @var Debugger */ - private $debugger; + private Debugger $debugger; /** * @var ViewCache */ - private $viewCache; + private ViewCache $viewCache; /** * Layout file - * @var string + * @var string|null */ - private $layoutFile = null; + private ?string $layoutFile = null; /** * Rendered view - * @var string + * @var string|null */ - private $viewContent; + private ?string $viewContent = null; /** * Assets to be included * @var array */ - private $assets = []; + private array $assets = []; /** * View params * @var array */ - private $params = []; + private array $params = []; /** * @param Renderer $renderer @@ -172,11 +172,10 @@ public function setParams(array $params) */ public function getParams(): array { - $params = []; - foreach ($this->params as $key => $param) { - $params[$key] = ($param instanceof RawParam) ? $param->getValue() : $param; - } + $params = array_map(function ($param) { + return ($param instanceof RawParam) ? $param->getValue() : $param; + }, $this->params); return $params; } diff --git a/tests/Unit/AppTestCase.php b/tests/Unit/AppTestCase.php index 7d36dc785..e2bce7587 100644 --- a/tests/Unit/AppTestCase.php +++ b/tests/Unit/AppTestCase.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\Unit; -use Quantum\Libraries\Storage\Factories\FileSystemFactory; +use Quantum\Storage\Factories\FileSystemFactory; use Quantum\App\Factories\AppFactory; use Quantum\Environment\Environment; use Quantum\Router\MatchedRoute; @@ -46,7 +46,7 @@ protected function setPrivateProperty($object, $property, $value): void $reflection = new ReflectionClass($object); $property = $reflection->getProperty($property); $property->setAccessible(true); - $property->setValue($value); + $property->setValue($object, $value); } protected function getPrivateProperty($object, $property) diff --git a/tests/Unit/Libraries/Archive/Adapters/PharAdapterTest.php b/tests/Unit/Archive/Adapters/PharAdapterTest.php similarity index 97% rename from tests/Unit/Libraries/Archive/Adapters/PharAdapterTest.php rename to tests/Unit/Archive/Adapters/PharAdapterTest.php index 3376ef440..7172f18ad 100644 --- a/tests/Unit/Libraries/Archive/Adapters/PharAdapterTest.php +++ b/tests/Unit/Archive/Adapters/PharAdapterTest.php @@ -1,8 +1,8 @@ load(new Setup('config', 'env')); - $this->authService = Mockery::mock(\Quantum\Libraries\Auth\Contracts\AuthServiceInterface::class); + $this->authService = Mockery::mock(\Quantum\Auth\Contracts\AuthServiceInterface::class); $this->authService->shouldReceive('userSchema')->andReturn($this->userSchema); diff --git a/tests/Unit/Libraries/Auth/Factories/AuthFactoryTest.php b/tests/Unit/Auth/Factories/AuthFactoryTest.php similarity index 82% rename from tests/Unit/Libraries/Auth/Factories/AuthFactoryTest.php rename to tests/Unit/Auth/Factories/AuthFactoryTest.php index f636ec3ea..f6d304021 100644 --- a/tests/Unit/Libraries/Auth/Factories/AuthFactoryTest.php +++ b/tests/Unit/Auth/Factories/AuthFactoryTest.php @@ -1,13 +1,13 @@ lockDirectory); + $lock = new CronLock('locked-task', $this->lockDirectory); $lock->acquire(); $command = new CronRunCommand(); diff --git a/tests/Unit/Libraries/Cookie/CookieTest.php b/tests/Unit/Cookie/CookieTest.php similarity index 95% rename from tests/Unit/Libraries/Cookie/CookieTest.php rename to tests/Unit/Cookie/CookieTest.php index 9a5e9ca62..51643fff9 100644 --- a/tests/Unit/Libraries/Cookie/CookieTest.php +++ b/tests/Unit/Cookie/CookieTest.php @@ -1,9 +1,9 @@ createTaskFile('due-task.php', [ 'name' => 'due-task', 'expression' => '* * * * *', // Always due - 'body' => "\\Quantum\\Tests\\Unit\\Libraries\\Cron\\CronManagerTest::recordExecution('due-task');", + 'body' => "\\Quantum\\Tests\\Unit\\Cron\\CronManagerTest::recordExecution('due-task');", ]); $this->createTaskFile('not-due-task.php', [ 'name' => 'not-due-task', 'expression' => '0 0 1 1 *', // Once a year (Jan 1st) - 'body' => "\\Quantum\\Tests\\Unit\\Libraries\\Cron\\CronManagerTest::recordExecution('not-due-task');", + 'body' => "\\Quantum\\Tests\\Unit\\Cron\\CronManagerTest::recordExecution('not-due-task');", ]); $manager = new CronManager($this->cronDirectory); @@ -119,7 +119,7 @@ public function testRunTaskByName() $this->createTaskFile('specific-task.php', [ 'name' => 'specific-task', 'expression' => '* * * * *', - 'body' => "\\Quantum\\Tests\\Unit\\Libraries\\Cron\\CronManagerTest::recordExecution('specific-task');", + 'body' => "\\Quantum\\Tests\\Unit\\Cron\\CronManagerTest::recordExecution('specific-task');", ]); $manager = new CronManager($this->cronDirectory); @@ -142,7 +142,7 @@ public function testRunDueTasksWithForceIgnoresLocks() $this->createTaskFile('locked-task.php', [ 'name' => 'locked-task', 'expression' => '* * * * *', - 'body' => "\\Quantum\\Tests\\Unit\\Libraries\\Cron\\CronManagerTest::recordExecution('locked-task');", + 'body' => "\\Quantum\\Tests\\Unit\\Cron\\CronManagerTest::recordExecution('locked-task');", ]); $manager = new CronManager($this->cronDirectory); @@ -256,7 +256,7 @@ public function testTaskExecutionFailureIsRecorded() private function createTaskFile(string $filename, array $definition, ?string $directory = null): void { $directory = $directory ?? $this->cronDirectory; - $body = $definition['body'] ?? "\\Quantum\\Tests\\Unit\\Libraries\\Cron\\CronManagerTest::recordExecution('{$definition['name']}');"; + $body = $definition['body'] ?? "\\Quantum\\Tests\\Unit\\Cron\\CronManagerTest::recordExecution('{$definition['name']}');"; $content = " '{$definition['name']}',\n"; diff --git a/tests/Unit/Libraries/Cron/CronTaskTest.php b/tests/Unit/Cron/CronTaskTest.php similarity index 93% rename from tests/Unit/Libraries/Cron/CronTaskTest.php rename to tests/Unit/Cron/CronTaskTest.php index b0f4cc2c2..a3db12a1c 100644 --- a/tests/Unit/Libraries/Cron/CronTaskTest.php +++ b/tests/Unit/Cron/CronTaskTest.php @@ -1,14 +1,14 @@ tableFactory = new TableFactory(); Mockery::getConfiguration()->setConstantsMap([ - \Quantum\Libraries\Database\Schemas\Table::class => [ + \Quantum\Database\Schemas\Table::class => [ 'CREATE' => 1, 'ALTER' => 2, 'DROP' => 3, @@ -38,7 +38,7 @@ public function setUp(): void ], ]); - $this->table = Mockery::mock('overload:Quantum\Libraries\Database\Schemas\Table'); + $this->table = Mockery::mock('overload:Quantum\Database\Schemas\Table'); $this->table->shouldReceive('setAction')->andReturnUsing(fn ($action) => $this->table); diff --git a/tests/Unit/Libraries/Database/Schema/ColumnTest.php b/tests/Unit/Database/Schema/ColumnTest.php similarity index 96% rename from tests/Unit/Libraries/Database/Schema/ColumnTest.php rename to tests/Unit/Database/Schema/ColumnTest.php index d18ce2c88..e677adfa6 100644 --- a/tests/Unit/Libraries/Database/Schema/ColumnTest.php +++ b/tests/Unit/Database/Schema/ColumnTest.php @@ -1,9 +1,9 @@ shouldReceive('execute')->andReturn(true); } diff --git a/tests/Unit/Libraries/Encryption/Adapters/AsymmetricEncryptionAdapterTest.php b/tests/Unit/Encryption/Adapters/AsymmetricEncryptionAdapterTest.php similarity index 89% rename from tests/Unit/Libraries/Encryption/Adapters/AsymmetricEncryptionAdapterTest.php rename to tests/Unit/Encryption/Adapters/AsymmetricEncryptionAdapterTest.php index 84db8ff8c..c5b46f7de 100644 --- a/tests/Unit/Libraries/Encryption/Adapters/AsymmetricEncryptionAdapterTest.php +++ b/tests/Unit/Encryption/Adapters/AsymmetricEncryptionAdapterTest.php @@ -1,10 +1,10 @@ assertEquals('TRUE', $this->env->getValue('DEBUG')); - $this->assertEquals('XYZ1234567890', $this->env->getValue('APP_KEY')); + $this->assertEquals('XYZ1234567890ABCDEFG123456789HIGKLMNOPQRSTUVWXYZ0123456789abcdefgh', $this->env->getValue('APP_KEY')); } public function testEnvironmentHasKey() @@ -44,11 +44,14 @@ public function testEnvironmentGetRow() { $this->assertNull($this->env->getRow('NON_EXISTING_KEY')); - $this->assertEquals('APP_KEY=XYZ1234567890', $this->env->getRow('APP_KEY')); + $this->assertEquals('APP_KEY=XYZ1234567890ABCDEFG123456789HIGKLMNOPQRSTUVWXYZ0123456789abcdefgh', $this->env->getRow('APP_KEY')); } public function testEnvironmentAddAndUpdateRow() { + $envFilePath = App::getBaseDir() . DS . '.env.testing'; + $originalContent = $this->fs->get($envFilePath); + $this->assertNull($this->env->getValue('SOMETHING')); $this->env->updateRow('SOMETHING', 'Something'); @@ -59,6 +62,6 @@ public function testEnvironmentAddAndUpdateRow() $this->assertEquals('Something_else', $this->env->getValue('SOMETHING')); - $this->fs->remove(App::getBaseDir() . DS . '.env.testing'); + $this->fs->put($envFilePath, $originalContent); } } diff --git a/tests/Unit/Libraries/Hasher/HasherTest.php b/tests/Unit/Hasher/HasherTest.php similarity index 95% rename from tests/Unit/Libraries/Hasher/HasherTest.php rename to tests/Unit/Hasher/HasherTest.php index bb602f750..dee6b76f5 100644 --- a/tests/Unit/Libraries/Hasher/HasherTest.php +++ b/tests/Unit/Hasher/HasherTest.php @@ -1,9 +1,9 @@ key = config()->get('app.key'); + $claims = [ 'jti' => uniqid(), 'iss' => 'issuer', diff --git a/tests/Unit/Libraries/Lang/Factories/LangFactoryTest.php b/tests/Unit/Lang/Factories/LangFactoryTest.php similarity index 94% rename from tests/Unit/Libraries/Lang/Factories/LangFactoryTest.php rename to tests/Unit/Lang/Factories/LangFactoryTest.php index 77dbb3904..79b4d56cf 100644 --- a/tests/Unit/Libraries/Lang/Factories/LangFactoryTest.php +++ b/tests/Unit/Lang/Factories/LangFactoryTest.php @@ -1,11 +1,11 @@ assertIsArray($deps); - $this->assertArrayHasKey(\Quantum\Libraries\Transformer\Contracts\TransformerInterface::class, $deps); - $this->assertSame(\Quantum\Tests\_root\modules\Test\Transformers\PostTransformer::class, $deps[\Quantum\Libraries\Transformer\Contracts\TransformerInterface::class]); + $this->assertArrayHasKey(\Quantum\Transformer\Contracts\TransformerInterface::class, $deps); + $this->assertSame(\Quantum\Tests\_root\modules\Test\Transformers\PostTransformer::class, $deps[\Quantum\Transformer\Contracts\TransformerInterface::class]); - $this->assertArrayHasKey(\Quantum\Libraries\Storage\Contracts\TokenServiceInterface::class, $deps); - $this->assertSame(\Quantum\Tests\_root\shared\Services\TokenService::class, $deps[\Quantum\Libraries\Storage\Contracts\TokenServiceInterface::class]); + $this->assertArrayHasKey(\Quantum\Storage\Contracts\TokenServiceInterface::class, $deps); + $this->assertSame(\Quantum\Tests\_root\shared\Services\TokenService::class, $deps[\Quantum\Storage\Contracts\TokenServiceInterface::class]); } public function testGetModuleConfigs() diff --git a/tests/Unit/Paginator/PaginatorTestCase.php b/tests/Unit/Paginator/PaginatorTestCase.php index aed746080..09c68211b 100644 --- a/tests/Unit/Paginator/PaginatorTestCase.php +++ b/tests/Unit/Paginator/PaginatorTestCase.php @@ -2,9 +2,9 @@ namespace Quantum\Tests\Unit\Paginator; -use Quantum\Libraries\Database\Adapters\Idiorm\IdiormDbal; -use Quantum\Libraries\Database\Database; +use Quantum\Database\Adapters\Idiorm\IdiormDbal; use Quantum\Tests\Unit\AppTestCase; +use Quantum\Database\Database; class PaginatorTestCase extends AppTestCase { diff --git a/tests/Unit/Libraries/ResourceCache/ViewCacheTest.php b/tests/Unit/ResourceCache/ViewCacheTest.php similarity index 95% rename from tests/Unit/Libraries/ResourceCache/ViewCacheTest.php rename to tests/Unit/ResourceCache/ViewCacheTest.php index 8ae8eec8a..df5de1031 100644 --- a/tests/Unit/Libraries/ResourceCache/ViewCacheTest.php +++ b/tests/Unit/ResourceCache/ViewCacheTest.php @@ -1,9 +1,9 @@ - * @copyright Copyright (c) 2018 Softberg LLC (https://softberg.org) - * @link http://quantum.softberg.org/ - * @since 2.9.8 - */ - namespace Quantum\Tests\_root\modules\Test\Transformers; -use Quantum\Libraries\Transformer\Contracts\TransformerInterface; +use Quantum\Transformer\Contracts\TransformerInterface; -/** - * Class PostTransformer - * @package Modules\Api - */ class PostTransformer implements TransformerInterface { - /** - * Transforms the post data - * @param $item - * @return mixed - */ public function transform($item): array { return [ diff --git a/tests/_root/modules/Test/config/dependencies.php b/tests/_root/modules/Test/config/dependencies.php index 04ba0041b..bd9393e73 100644 --- a/tests/_root/modules/Test/config/dependencies.php +++ b/tests/_root/modules/Test/config/dependencies.php @@ -1,9 +1,9 @@ PostTransformer::class, diff --git a/tests/_root/shared/Models/TestEventModel.php b/tests/_root/shared/Models/TestEventModel.php index 57e520efe..98527966d 100644 --- a/tests/_root/shared/Models/TestEventModel.php +++ b/tests/_root/shared/Models/TestEventModel.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Models; -use Quantum\Libraries\Database\Enums\Relation; +use Quantum\Database\Enums\Relation; use Quantum\Model\DbModel; class TestEventModel extends DbModel diff --git a/tests/_root/shared/Models/TestProfileModel.php b/tests/_root/shared/Models/TestProfileModel.php index cee6dfefd..51e06879d 100644 --- a/tests/_root/shared/Models/TestProfileModel.php +++ b/tests/_root/shared/Models/TestProfileModel.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Models; -use Quantum\Libraries\Database\Enums\Relation; +use Quantum\Database\Enums\Relation; use Quantum\Model\DbModel; class TestProfileModel extends DbModel diff --git a/tests/_root/shared/Models/TestTicketModel.php b/tests/_root/shared/Models/TestTicketModel.php index 60a2131cc..3a5ec9cc2 100644 --- a/tests/_root/shared/Models/TestTicketModel.php +++ b/tests/_root/shared/Models/TestTicketModel.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Models; -use Quantum\Libraries\Database\Enums\Relation; +use Quantum\Database\Enums\Relation; use Quantum\Model\DbModel; class TestTicketModel extends DbModel diff --git a/tests/_root/shared/Models/TestUserEventModel.php b/tests/_root/shared/Models/TestUserEventModel.php index 833d1a3a8..1619c3b18 100644 --- a/tests/_root/shared/Models/TestUserEventModel.php +++ b/tests/_root/shared/Models/TestUserEventModel.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Models; -use Quantum\Libraries\Database\Enums\Relation; +use Quantum\Database\Enums\Relation; use Quantum\Model\DbModel; class TestUserEventModel extends DbModel diff --git a/tests/_root/shared/Models/TestUserMeetingModel.php b/tests/_root/shared/Models/TestUserMeetingModel.php index e906431ea..51103976c 100644 --- a/tests/_root/shared/Models/TestUserMeetingModel.php +++ b/tests/_root/shared/Models/TestUserMeetingModel.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Models; -use Quantum\Libraries\Database\Enums\Relation; +use Quantum\Database\Enums\Relation; use Quantum\Model\DbModel; class TestUserMeetingModel extends DbModel diff --git a/tests/_root/shared/Models/TestUserModel.php b/tests/_root/shared/Models/TestUserModel.php index 2cdfd69e7..98483b5b6 100644 --- a/tests/_root/shared/Models/TestUserModel.php +++ b/tests/_root/shared/Models/TestUserModel.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Models; -use Quantum\Libraries\Database\Enums\Relation; +use Quantum\Database\Enums\Relation; use Quantum\Model\DbModel; class TestUserModel extends DbModel diff --git a/tests/_root/shared/Services/TokenService.php b/tests/_root/shared/Services/TokenService.php index 894add54b..fa6e45276 100644 --- a/tests/_root/shared/Services/TokenService.php +++ b/tests/_root/shared/Services/TokenService.php @@ -2,7 +2,7 @@ namespace Quantum\Tests\_root\shared\Services; -use Quantum\Libraries\Storage\Contracts\TokenServiceInterface; +use Quantum\Storage\Contracts\TokenServiceInterface; use Quantum\Service\QtService; class TokenService extends QtService implements TokenServiceInterface