From ab57306eaa25e0945f26d4f6c8b68fbd1c57bbe2 Mon Sep 17 00:00:00 2001 From: Melech Mizrachi Date: Sun, 28 Jun 2026 09:17:38 -0700 Subject: [PATCH 1/2] [Tests] Change Classes namespace to Fixtures. --- .../{Classes => Fixtures}/Contract/FixtureContract.php | 2 +- .../Tests/{Classes => Fixtures}/FixtureChildClass.php | 2 +- .../{Classes => Fixtures}/FixtureCountableClass.php | 2 +- .../Tests/{Classes => Fixtures}/FixtureParentClass.php | 6 +++--- .../Provider/ServiceProvidedClass.php | 2 +- .../Provider/ServiceProvidedInterface.php | 2 +- .../Provider/ServiceProviderClass.php | 2 +- .../Tests/{Classes => Fixtures}/Trait/FixtureTrait.php | 2 +- .../Unit/Abstract/ServiceProviderTestCaseTest.php | 6 +++--- tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php | 10 +++++----- 10 files changed, 18 insertions(+), 18 deletions(-) rename tests/Tests/{Classes => Fixtures}/Contract/FixtureContract.php (85%) rename tests/Tests/{Classes => Fixtures}/FixtureChildClass.php (88%) rename tests/Tests/{Classes => Fixtures}/FixtureCountableClass.php (92%) rename tests/Tests/{Classes => Fixtures}/FixtureParentClass.php (71%) rename tests/Tests/{Classes => Fixtures}/Provider/ServiceProvidedClass.php (87%) rename tests/Tests/{Classes => Fixtures}/Provider/ServiceProvidedInterface.php (87%) rename tests/Tests/{Classes => Fixtures}/Provider/ServiceProviderClass.php (95%) rename tests/Tests/{Classes => Fixtures}/Trait/FixtureTrait.php (86%) diff --git a/tests/Tests/Classes/Contract/FixtureContract.php b/tests/Tests/Fixtures/Contract/FixtureContract.php similarity index 85% rename from tests/Tests/Classes/Contract/FixtureContract.php rename to tests/Tests/Fixtures/Contract/FixtureContract.php index ce0f72a..6491df2 100644 --- a/tests/Tests/Classes/Contract/FixtureContract.php +++ b/tests/Tests/Fixtures/Contract/FixtureContract.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes\Contract; +namespace Valkyrja\PhpUnit\Tests\Fixtures\Contract; interface FixtureContract { diff --git a/tests/Tests/Classes/FixtureChildClass.php b/tests/Tests/Fixtures/FixtureChildClass.php similarity index 88% rename from tests/Tests/Classes/FixtureChildClass.php rename to tests/Tests/Fixtures/FixtureChildClass.php index c64da92..bddd656 100644 --- a/tests/Tests/Classes/FixtureChildClass.php +++ b/tests/Tests/Fixtures/FixtureChildClass.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes; +namespace Valkyrja\PhpUnit\Tests\Fixtures; final class FixtureChildClass extends FixtureParentClass { diff --git a/tests/Tests/Classes/FixtureCountableClass.php b/tests/Tests/Fixtures/FixtureCountableClass.php similarity index 92% rename from tests/Tests/Classes/FixtureCountableClass.php rename to tests/Tests/Fixtures/FixtureCountableClass.php index 7a8781e..d60baae 100644 --- a/tests/Tests/Classes/FixtureCountableClass.php +++ b/tests/Tests/Fixtures/FixtureCountableClass.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes; +namespace Valkyrja\PhpUnit\Tests\Fixtures; use Countable; diff --git a/tests/Tests/Classes/FixtureParentClass.php b/tests/Tests/Fixtures/FixtureParentClass.php similarity index 71% rename from tests/Tests/Classes/FixtureParentClass.php rename to tests/Tests/Fixtures/FixtureParentClass.php index 319743e..1eae098 100644 --- a/tests/Tests/Classes/FixtureParentClass.php +++ b/tests/Tests/Fixtures/FixtureParentClass.php @@ -11,10 +11,10 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes; +namespace Valkyrja\PhpUnit\Tests\Fixtures; -use Valkyrja\PhpUnit\Tests\Classes\Contract\FixtureContract; -use Valkyrja\PhpUnit\Tests\Classes\Trait\FixtureTrait; +use Valkyrja\PhpUnit\Tests\Fixtures\Contract\FixtureContract; +use Valkyrja\PhpUnit\Tests\Fixtures\Trait\FixtureTrait; class FixtureParentClass implements FixtureContract { diff --git a/tests/Tests/Classes/Provider/ServiceProvidedClass.php b/tests/Tests/Fixtures/Provider/ServiceProvidedClass.php similarity index 87% rename from tests/Tests/Classes/Provider/ServiceProvidedClass.php rename to tests/Tests/Fixtures/Provider/ServiceProvidedClass.php index c89964d..5620d51 100644 --- a/tests/Tests/Classes/Provider/ServiceProvidedClass.php +++ b/tests/Tests/Fixtures/Provider/ServiceProvidedClass.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes\Provider; +namespace Valkyrja\PhpUnit\Tests\Fixtures\Provider; /** * Class ServiceProvidedClass. diff --git a/tests/Tests/Classes/Provider/ServiceProvidedInterface.php b/tests/Tests/Fixtures/Provider/ServiceProvidedInterface.php similarity index 87% rename from tests/Tests/Classes/Provider/ServiceProvidedInterface.php rename to tests/Tests/Fixtures/Provider/ServiceProvidedInterface.php index d660e10..168d936 100644 --- a/tests/Tests/Classes/Provider/ServiceProvidedInterface.php +++ b/tests/Tests/Fixtures/Provider/ServiceProvidedInterface.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes\Provider; +namespace Valkyrja\PhpUnit\Tests\Fixtures\Provider; /** * Interface ServiceProvidedInterface. diff --git a/tests/Tests/Classes/Provider/ServiceProviderClass.php b/tests/Tests/Fixtures/Provider/ServiceProviderClass.php similarity index 95% rename from tests/Tests/Classes/Provider/ServiceProviderClass.php rename to tests/Tests/Fixtures/Provider/ServiceProviderClass.php index 00516ff..bd32fa4 100644 --- a/tests/Tests/Classes/Provider/ServiceProviderClass.php +++ b/tests/Tests/Fixtures/Provider/ServiceProviderClass.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes\Provider; +namespace Valkyrja\PhpUnit\Tests\Fixtures\Provider; use Override; use Valkyrja\Container\Provider\Contract\ServiceProviderContract; diff --git a/tests/Tests/Classes/Trait/FixtureTrait.php b/tests/Tests/Fixtures/Trait/FixtureTrait.php similarity index 86% rename from tests/Tests/Classes/Trait/FixtureTrait.php rename to tests/Tests/Fixtures/Trait/FixtureTrait.php index 7de5274..34750ab 100644 --- a/tests/Tests/Classes/Trait/FixtureTrait.php +++ b/tests/Tests/Fixtures/Trait/FixtureTrait.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Valkyrja\PhpUnit\Tests\Classes\Trait; +namespace Valkyrja\PhpUnit\Tests\Fixtures\Trait; trait FixtureTrait { diff --git a/tests/Tests/Unit/Abstract/ServiceProviderTestCaseTest.php b/tests/Tests/Unit/Abstract/ServiceProviderTestCaseTest.php index cdb5963..567d2ae 100644 --- a/tests/Tests/Unit/Abstract/ServiceProviderTestCaseTest.php +++ b/tests/Tests/Unit/Abstract/ServiceProviderTestCaseTest.php @@ -14,9 +14,9 @@ namespace Valkyrja\PhpUnit\Tests\Unit\Abstract; use Valkyrja\PhpUnit\Abstract\ServiceProviderTestCase; -use Valkyrja\PhpUnit\Tests\Classes\Provider\ServiceProvidedClass; -use Valkyrja\PhpUnit\Tests\Classes\Provider\ServiceProvidedInterface; -use Valkyrja\PhpUnit\Tests\Classes\Provider\ServiceProviderClass; +use Valkyrja\PhpUnit\Tests\Fixtures\Provider\ServiceProvidedClass; +use Valkyrja\PhpUnit\Tests\Fixtures\Provider\ServiceProvidedInterface; +use Valkyrja\PhpUnit\Tests\Fixtures\Provider\ServiceProviderClass; /** * Tests for ServiceProviderTestCase. diff --git a/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php b/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php index 68b2fa8..873820b 100644 --- a/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php +++ b/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php @@ -16,11 +16,11 @@ use Countable; use PHPUnit\Framework\AssertionFailedError; use Valkyrja\PhpUnit\Tests\Abstract\PhpUnitTestCase; -use Valkyrja\PhpUnit\Tests\Classes\Contract\FixtureContract; -use Valkyrja\PhpUnit\Tests\Classes\FixtureChildClass; -use Valkyrja\PhpUnit\Tests\Classes\FixtureCountableClass; -use Valkyrja\PhpUnit\Tests\Classes\FixtureParentClass; -use Valkyrja\PhpUnit\Tests\Classes\Trait\FixtureTrait; +use Valkyrja\PhpUnit\Tests\Fixtures\Contract\FixtureContract; +use Valkyrja\PhpUnit\Tests\Fixtures\FixtureChildClass; +use Valkyrja\PhpUnit\Tests\Fixtures\FixtureCountableClass; +use Valkyrja\PhpUnit\Tests\Fixtures\FixtureParentClass; +use Valkyrja\PhpUnit\Tests\Fixtures\Trait\FixtureTrait; /** * Tests for ValkyrjaTestCase. From 6ebd2356423eba48a3ef1aca85394f875bf7e25f Mon Sep 17 00:00:00 2001 From: Melech Mizrachi Date: Sun, 28 Jun 2026 09:40:16 -0700 Subject: [PATCH 2/2] [Tests] Fix Classes namespace to Fixtures. --- tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php b/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php index 873820b..c4aac1f 100644 --- a/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php +++ b/tests/Tests/Unit/Abstract/ValkyrjaTestCaseTest.php @@ -83,7 +83,7 @@ public function testAssertClassExistsFails(): void { $this->expectException(AssertionFailedError::class); /** @var class-string $nonExistentClass */ - $nonExistentClass = 'Valkyrja\PhpUnit\Tests\Classes\NonExistentClass'; + $nonExistentClass = 'Valkyrja\PhpUnit\Tests\Fixtures\NonExistentClass'; self::assertClassExists($nonExistentClass); } @@ -104,7 +104,7 @@ public function testAssertInterfaceExistsWithBuiltIn(): void public function testAssertInterfaceExistsFails(): void { $this->expectException(AssertionFailedError::class); - self::assertInterfaceExists('Valkyrja\PhpUnit\Tests\Classes\NonExistentInterface'); + self::assertInterfaceExists('Valkyrja\PhpUnit\Tests\Fixtures\NonExistentInterface'); } // endregion @@ -119,7 +119,7 @@ public function testAssertTraitExists(): void public function testAssertTraitExistsFails(): void { $this->expectException(AssertionFailedError::class); - self::assertTraitExists('Valkyrja\PhpUnit\Tests\Classes\NonExistentTrait'); + self::assertTraitExists('Valkyrja\PhpUnit\Tests\Fixtures\NonExistentTrait'); } // endregion