Merge pull request #1095: New interceptors

spiral · Apr 29, 2024 · c053d0d · c053d0d
1 parent 8e88e24
commit c053d0d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/src/Declaration/BootloaderDeclaration.php b/src/Declaration/BootloaderDeclaration.php
@@ -9,7 +9,7 @@
 use Spiral\Boot\BootloadManager\Methods;
 use Spiral\Boot\KernelInterface;
 use Spiral\Bootloader\DomainBootloader;
-use Spiral\Core\CoreInterface;
+use Spiral\Interceptors\HandlerInterface;
 use Spiral\Scaffolder\Config\ScaffolderConfig;
 
 class BootloaderDeclaration extends AbstractDeclaration implements HasInstructions
@@ -45,9 +45,9 @@ public function declare(): void
 
         if ($this->isDomain) {
             $this->class->addConstant('INTERCEPTORS', [])->setProtected();
-            $this->namespace->addUse(CoreInterface::class);
+            $this->namespace->addUse(HandlerInterface::class);
             $this->class->getConstant('SINGLETONS')->setValue([
-                new Literal('CoreInterface::class => [self::class, \'domainCore\']'),
+                new Literal('HandlerInterface::class => [self::class, \'domainCore\']'),
             ]);
         }
 

diff --git a/tests/Command/BootloaderTest.php b/tests/Command/BootloaderTest.php
@@ -7,6 +7,7 @@
 use ReflectionClass;
 use ReflectionException;
 use Spiral\Core\CoreInterface;
+use Spiral\Interceptors\HandlerInterface;
 use Throwable;
 
 final class BootloaderTest extends AbstractCommandTestCase
@@ -97,7 +98,7 @@ public function testScaffoldForDomainBootloader(): void
         $this->assertTrue($reflection->hasConstant('SINGLETONS'));
 
         $this->assertEquals([
-            CoreInterface::class => ['Spiral\Tests\Scaffolder\App\Bootloader\SampleDomainBootloader', 'domainCore'],
+            HandlerInterface::class => ['Spiral\Tests\Scaffolder\App\Bootloader\SampleDomainBootloader', 'domainCore'],
         ], $reflection->getConstant('SINGLETONS'));
     }
 
@@ -112,7 +113,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'SampleBootloader' has been successfully written into 'Bootloader/SampleBootloader.php'.
 

diff --git a/tests/Command/CommandTest.php b/tests/Command/CommandTest.php
@@ -128,7 +128,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'ArgumentCommand' has been successfully written into 'Command/ArgumentCommand.php'.
 

diff --git a/tests/Command/ConfigTest.php b/tests/Command/ConfigTest.php
@@ -242,7 +242,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'InstructionConfig' has been successfully written into 'Config/InstructionConfig.php'.
 

diff --git a/tests/Command/ControllerTest.php b/tests/Command/ControllerTest.php
@@ -100,7 +100,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'SampleController' has been successfully written into 'Custom/Controller/SampleController.php'.
 

diff --git a/tests/Command/FilterCommandTest.php b/tests/Command/FilterCommandTest.php
@@ -116,7 +116,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'SampleFilter' has been successfully written into 'Filter/SampleFilter.php'.
 

diff --git a/tests/Command/JobHandlerTest.php b/tests/Command/JobHandlerTest.php
@@ -74,7 +74,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'SampleJob' has been successfully written into 'Job/SampleJob.php'.
 

diff --git a/tests/Command/MiddlewareTest.php b/tests/Command/MiddlewareTest.php
@@ -72,7 +72,7 @@ public function testShowInstructionAfterInstallation(): void
 
         $output = $result->getOutput()->fetch();
 
-        $this->assertSame(
+        $this->assertStringEqualsStringIgnoringLineEndings(
             <<<OUTPUT
             Declaration of 'SampleMiddleware' has been successfully written into 'Middleware/SampleMiddleware.php'.