From 73c81316f8d9b8434bff7685b6a4963e706ab522 Mon Sep 17 00:00:00 2001 From: Diaa Fares Date: Fri, 6 Sep 2024 17:21:00 +0300 Subject: [PATCH 1/2] Fix build failures due to enum collide --- tests/Auth/AuthAccessGateTest.php | 8 ++------ tests/Auth/AuthorizeMiddlewareTest.php | 7 ++----- tests/Auth/Enums.php | 8 ++++++++ 3 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 tests/Auth/Enums.php diff --git a/tests/Auth/AuthAccessGateTest.php b/tests/Auth/AuthAccessGateTest.php index bb50a9462fff..128ac8daca8e 100644 --- a/tests/Auth/AuthAccessGateTest.php +++ b/tests/Auth/AuthAccessGateTest.php @@ -12,6 +12,8 @@ use PHPUnit\Framework\TestCase; use stdClass; +include_once 'Enums.php'; + class AuthAccessGateTest extends TestCase { public function testBasicClosuresCanBeDefined() @@ -1541,9 +1543,3 @@ public function create() throw new AuthorizationException('Not allowed.', 'some_code'); } } - -enum AbilitiesEnum: string -{ - case VIEW_DASHBOARD = 'view-dashboard'; - case UPDATE = 'update'; -} diff --git a/tests/Auth/AuthorizeMiddlewareTest.php b/tests/Auth/AuthorizeMiddlewareTest.php index a9c6059f43df..d9ca83e78b5d 100644 --- a/tests/Auth/AuthorizeMiddlewareTest.php +++ b/tests/Auth/AuthorizeMiddlewareTest.php @@ -19,6 +19,8 @@ use PHPUnit\Framework\TestCase; use stdClass; +include_once 'Enums.php'; + class AuthorizeMiddlewareTest extends TestCase { protected $container; @@ -351,8 +353,3 @@ protected function gate() return $this->container->make(GateContract::class); } } - -enum AbilitiesEnum: string -{ - case VIEW_DASHBOARD = 'view-dashboard'; -} diff --git a/tests/Auth/Enums.php b/tests/Auth/Enums.php new file mode 100644 index 000000000000..79520dd95f66 --- /dev/null +++ b/tests/Auth/Enums.php @@ -0,0 +1,8 @@ + Date: Fri, 6 Sep 2024 17:34:22 +0300 Subject: [PATCH 2/2] Fix lint --- tests/Auth/Enums.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Auth/Enums.php b/tests/Auth/Enums.php index 79520dd95f66..0e93ee25575e 100644 --- a/tests/Auth/Enums.php +++ b/tests/Auth/Enums.php @@ -2,7 +2,8 @@ namespace Illuminate\Tests\Auth; -enum AbilitiesEnum: string { +enum AbilitiesEnum: string +{ case VIEW_DASHBOARD = 'view-dashboard'; case UPDATE = 'update'; }