From 428b1d99a9252a15f9faec8a7790c746bcc97f4a Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Thu, 29 Feb 2024 14:01:52 +0400 Subject: [PATCH] Rename ScopeName to Spiral and mark it internal --- src/Core/tests/Attribute/ScopeTest.php | 4 ++-- src/Core/tests/Scope/UseCaseTest.php | 4 ++-- src/Framework/Console/ConsoleDispatcher.php | 4 ++-- src/Framework/Framework/{ScopeName.php => Spiral.php} | 5 ++++- tests/Framework/Attribute/DispatcherScopeTest.php | 4 ++-- tests/Framework/KernelTest.php | 4 ++-- tests/app/src/Dispatcher/DispatcherWithScopeName.php | 4 ++-- 7 files changed, 16 insertions(+), 13 deletions(-) rename src/Framework/Framework/{ScopeName.php => Spiral.php} (93%) diff --git a/src/Core/tests/Attribute/ScopeTest.php b/src/Core/tests/Attribute/ScopeTest.php index 81c443b48..f88e3247f 100644 --- a/src/Core/tests/Attribute/ScopeTest.php +++ b/src/Core/tests/Attribute/ScopeTest.php @@ -7,7 +7,7 @@ use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Spiral\Core\Attribute\Scope; -use Spiral\Framework\ScopeName; +use Spiral\Framework\Spiral; use Spiral\Tests\Core\Fixtures\ScopeEnum; final class ScopeTest extends TestCase @@ -23,7 +23,7 @@ public function testScope(string|\BackedEnum $name, string $expected): void public static function scopeNameDataProvider(): \Traversable { yield ['foo', 'foo']; - yield [ScopeName::HttpRequest, 'http.request']; + yield [Spiral::HttpRequest, 'http.request']; yield [ScopeEnum::A, 'a']; } } diff --git a/src/Core/tests/Scope/UseCaseTest.php b/src/Core/tests/Scope/UseCaseTest.php index 88ea5bf13..1943a5857 100644 --- a/src/Core/tests/Scope/UseCaseTest.php +++ b/src/Core/tests/Scope/UseCaseTest.php @@ -11,7 +11,7 @@ use Spiral\Core\Config\Shared; use Spiral\Core\Container; use Spiral\Core\Scope; -use Spiral\Framework\ScopeName; +use Spiral\Framework\Spiral; use Spiral\Tests\Core\Fixtures\Bucket; use Spiral\Tests\Core\Fixtures\Factory; use Spiral\Tests\Core\Fixtures\SampleClass; @@ -406,7 +406,7 @@ public function testHasInParentScopeWithScopeAttribute(): void public static function scopeEnumDataProvider(): \Traversable { - yield [ScopeName::HttpRequest, 'http.request']; + yield [Spiral::HttpRequest, 'http.request']; yield [ScopeEnum::A, 'a']; } } diff --git a/src/Framework/Console/ConsoleDispatcher.php b/src/Framework/Console/ConsoleDispatcher.php index 34f6b6803..e8b60b36b 100644 --- a/src/Framework/Console/ConsoleDispatcher.php +++ b/src/Framework/Console/ConsoleDispatcher.php @@ -12,7 +12,7 @@ use Spiral\Console\Logger\DebugListener; use Spiral\Exceptions\ExceptionHandlerInterface; use Spiral\Exceptions\Verbosity; -use Spiral\Framework\ScopeName; +use Spiral\Framework\Spiral; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\ConsoleOutput; @@ -22,7 +22,7 @@ /** * Manages Console commands and exception. Lazy loads console service. */ -#[DispatcherScope(scope: ScopeName::Console)] +#[DispatcherScope(scope: Spiral::Console)] final class ConsoleDispatcher implements DispatcherInterface { public function __construct( diff --git a/src/Framework/Framework/ScopeName.php b/src/Framework/Framework/Spiral.php similarity index 93% rename from src/Framework/Framework/ScopeName.php rename to src/Framework/Framework/Spiral.php index 564af59c8..3b1e510b1 100644 --- a/src/Framework/Framework/ScopeName.php +++ b/src/Framework/Framework/Spiral.php @@ -4,7 +4,10 @@ namespace Spiral\Framework; -enum ScopeName: string +/** + * @internal + */ +enum Spiral: string { case Http = 'http'; case HttpRequest = 'http.request'; diff --git a/tests/Framework/Attribute/DispatcherScopeTest.php b/tests/Framework/Attribute/DispatcherScopeTest.php index 8d9a5f733..addf705a1 100644 --- a/tests/Framework/Attribute/DispatcherScopeTest.php +++ b/tests/Framework/Attribute/DispatcherScopeTest.php @@ -11,7 +11,7 @@ use Spiral\App\Dispatcher\Scope; use Spiral\Boot\AbstractKernel; use Spiral\Core\Container; -use Spiral\Framework\ScopeName; +use Spiral\Framework\Spiral; use Spiral\Tests\Framework\BaseTestCase; final class DispatcherScopeTest extends BaseTestCase @@ -33,7 +33,7 @@ public function testDispatcherScope(string $dispatcher, string|\BackedEnum $scop public static function dispatchersDataProvider(): \Traversable { - yield [DispatcherWithScopeName::class, ScopeName::Console]; + yield [DispatcherWithScopeName::class, Spiral::Console]; yield [DispatcherWithCustomEnum::class, Scope::Custom]; yield [DispatcherWithStringScope::class, 'test']; } diff --git a/tests/Framework/KernelTest.php b/tests/Framework/KernelTest.php index 669f224d4..efe16d99d 100644 --- a/tests/Framework/KernelTest.php +++ b/tests/Framework/KernelTest.php @@ -16,7 +16,7 @@ use Spiral\Boot\Exception\BootException; use Spiral\App\TestApp; use Spiral\Core\Container; -use Spiral\Framework\ScopeName; +use Spiral\Framework\Spiral; use stdClass; class KernelTest extends BaseTestCase @@ -136,7 +136,7 @@ public function testDispatchersShouldBeBoundInCorrectScope(string $dispatcher, s public static function dispatchersDataProvider(): \Traversable { - yield [DispatcherWithScopeName::class, ScopeName::Console->value]; + yield [DispatcherWithScopeName::class, Spiral::Console->value]; yield [DispatcherWithCustomEnum::class, Scope::Custom->value]; yield [DispatcherWithStringScope::class, 'test']; } diff --git a/tests/app/src/Dispatcher/DispatcherWithScopeName.php b/tests/app/src/Dispatcher/DispatcherWithScopeName.php index 47abf6326..e3cbd30d7 100644 --- a/tests/app/src/Dispatcher/DispatcherWithScopeName.php +++ b/tests/app/src/Dispatcher/DispatcherWithScopeName.php @@ -5,9 +5,9 @@ namespace Spiral\App\Dispatcher; use Spiral\Attribute\DispatcherScope; -use Spiral\Framework\ScopeName; +use Spiral\Framework\Spiral; -#[DispatcherScope(scope: ScopeName::Console)] +#[DispatcherScope(scope: Spiral::Console)] final class DispatcherWithScopeName extends AbstractDispatcher { }