Merge pull request #2 from donatj/fix/test-stub-namespacing

Namespace stubs
donatj · May 11, 2023 · 9e69a1d · 9e69a1d
2 parents 097cbd5 + 5f19f98
commit 9e69a1d
Show file tree

Hide file tree

Showing 26 changed files with 63 additions and 63 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"": "stubs/",
+			"Stubs\\": "stubs/",
 			"Tests\\": "test/",
 			"Tests82\\": "test82/"
 		}

diff --git a/stubs/Interfaces/BazAwareInterface.php b/stubs/Interfaces/BazAwareInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Interfaces;
+namespace Stubs\Interfaces;
 
 interface BazAwareInterface {
 

diff --git a/stubs/Interfaces/FooAwareInterface.php b/stubs/Interfaces/FooAwareInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Interfaces;
+namespace Stubs\Interfaces;
 
 interface FooAwareInterface {
 

diff --git a/stubs/Interfaces/GarplyIdAwareInterface.php b/stubs/Interfaces/GarplyIdAwareInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Interfaces;
+namespace Stubs\Interfaces;
 
 interface GarplyIdAwareInterface {
 

diff --git a/stubs/Interfaces/GarplyMemberInterface.php b/stubs/Interfaces/GarplyMemberInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Interfaces;
+namespace Stubs\Interfaces;
 
 interface GarplyMemberInterface extends
 	GarplyIdAwareInterface,

diff --git a/stubs/Interfaces/NullableIdAwareInterface.php b/stubs/Interfaces/NullableIdAwareInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Interfaces;
+namespace Stubs\Interfaces;
 
 interface NullableIdAwareInterface {
 

diff --git a/stubs/Interfaces/QuxIdAwareInterface.php b/stubs/Interfaces/QuxIdAwareInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Interfaces;
+namespace Stubs\Interfaces;
 
 interface QuxIdAwareInterface {
 

diff --git a/stubs/Objects/Person/BarPerson.php b/stubs/Objects/Person/BarPerson.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Person;
+namespace Stubs\Objects\Person;
 
-use Traits\BazAwareTrait;
-use Traits\FooAwareTrait;
+use Stubs\Traits\BazAwareTrait;
+use Stubs\Traits\FooAwareTrait;
 
 class BarPerson extends Decorator implements BarPersonInterface {
 

diff --git a/stubs/Objects/Person/BarPersonInterface.php b/stubs/Objects/Person/BarPersonInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Person;
+namespace Stubs\Objects\Person;
 
-use Objects\Person\PersonAwarenessInterfaces\BazAwarePersonInterface;
-use Objects\Person\PersonAwarenessInterfaces\FooAwarePersonInterface;
+use Stubs\Objects\Person\PersonAwarenessInterfaces\BazAwarePersonInterface;
+use Stubs\Objects\Person\PersonAwarenessInterfaces\FooAwarePersonInterface;
 
 interface BarPersonInterface extends BazAwarePersonInterface, FooAwarePersonInterface {
 

diff --git a/stubs/Objects/Person/Decorator.php b/stubs/Objects/Person/Decorator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\Person;
+namespace Stubs\Objects\Person;
 
 abstract class Decorator implements PersonInterface {
 

diff --git a/stubs/Objects/Person/InvokablePersonFactory.php b/stubs/Objects/Person/InvokablePersonFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Objects\Person;
+namespace Stubs\Objects\Person;
 
 class InvokablePersonFactory {
 

diff --git a/stubs/Objects/Person/Person.php b/stubs/Objects/Person/Person.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Objects\Person;
+namespace Stubs\Objects\Person;
 
-use Traits\GarplyIdAwareTrait;
-use Traits\NullableIdAwareTrait;
-use Traits\QuxIdAwareTrait;
+use Stubs\Traits\GarplyIdAwareTrait;
+use Stubs\Traits\NullableIdAwareTrait;
+use Stubs\Traits\QuxIdAwareTrait;
 
 class Person implements PersonInterface {
 

diff --git a/stubs/Objects/Person/PersonAwarenessInterfaces/BazAwarePersonInterface.php b/stubs/Objects/Person/PersonAwarenessInterfaces/BazAwarePersonInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Person\PersonAwarenessInterfaces;
+namespace Stubs\Objects\Person\PersonAwarenessInterfaces;
 
-use Interfaces\BazAwareInterface;
-use Objects\Person\PersonInterface;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Objects\Person\PersonInterface;
 
 interface BazAwarePersonInterface extends PersonInterface, BazAwareInterface {
 

diff --git a/stubs/Objects/Person/PersonAwarenessInterfaces/FooAwarePersonInterface.php b/stubs/Objects/Person/PersonAwarenessInterfaces/FooAwarePersonInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Person\PersonAwarenessInterfaces;
+namespace Stubs\Objects\Person\PersonAwarenessInterfaces;
 
-use Interfaces\FooAwareInterface;
-use Objects\Person\PersonInterface;
+use Stubs\Interfaces\FooAwareInterface;
+use Stubs\Objects\Person\PersonInterface;
 
 interface FooAwarePersonInterface extends FooAwareInterface, PersonInterface {
 

diff --git a/stubs/Objects/Person/PersonInterface.php b/stubs/Objects/Person/PersonInterface.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Objects\Person;
+namespace Stubs\Objects\Person;
 
-use Interfaces\GarplyMemberInterface;
 use JsonSerializable;
+use Stubs\Interfaces\GarplyMemberInterface;
 
 interface PersonInterface extends GarplyMemberInterface, JsonSerializable {
 

diff --git a/stubs/Traits/BazAwareTrait.php b/stubs/Traits/BazAwareTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Traits;
+namespace Stubs\Traits;
 
 trait BazAwareTrait {
 

diff --git a/stubs/Traits/FooAwareTrait.php b/stubs/Traits/FooAwareTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Traits;
+namespace Stubs\Traits;
 
 trait FooAwareTrait {
 

diff --git a/stubs/Traits/GarplyIdAwareTrait.php b/stubs/Traits/GarplyIdAwareTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Traits;
+namespace Stubs\Traits;
 
 trait GarplyIdAwareTrait {
 

diff --git a/stubs/Traits/NullableIdAwareTrait.php b/stubs/Traits/NullableIdAwareTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Traits;
+namespace Stubs\Traits;
 
 trait NullableIdAwareTrait {
 

diff --git a/stubs/Traits/QuxIdAwareTrait.php b/stubs/Traits/QuxIdAwareTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Traits;
+namespace Stubs\Traits;
 
 trait QuxIdAwareTrait {
 

diff --git a/test/DNFTest.php b/test/DNFTest.php
@@ -7,13 +7,13 @@
 use donatj\PhpDnfSolver\Types\BuiltInType;
 use donatj\PhpDnfSolver\Types\OrClause;
 use donatj\PhpDnfSolver\Types\UserDefinedType;
-use Interfaces\BazAwareInterface;
-use Interfaces\FooAwareInterface;
-use Objects\Person\BarPerson;
-use Objects\Person\BarPersonInterface;
-use Objects\Person\InvokablePersonFactory;
-use Objects\Person\PersonInterface;
 use PHPUnit\Framework\TestCase;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Interfaces\FooAwareInterface;
+use Stubs\Objects\Person\BarPerson;
+use Stubs\Objects\Person\BarPersonInterface;
+use Stubs\Objects\Person\InvokablePersonFactory;
+use Stubs\Objects\Person\PersonInterface;
 
 class DNFTest extends TestCase {
 
@@ -54,7 +54,7 @@ public function test_getFromReflectionType() : void {
 				return $this->getMockBuilder(BazAwareInterface::class)->getMock();
 			}))->getReturnType()
 		);
-		$this->assertSame('Interfaces\BazAwareInterface|null', $dnf->dnf());
+		$this->assertSame('Stubs\Interfaces\BazAwareInterface|null', $dnf->dnf());
 		$this->assertInstanceOf(OrClause::class, $dnf);
 		$dnfTypes = $dnf->getTypes();
 		$this->assertInstanceOf(UserDefinedType::class, $dnfTypes[0]->getTypes()[0]); // Gets jammed into an AND
@@ -68,15 +68,15 @@ public function test_getFromReflectionType() : void {
 			}))->getReturnType()
 		);
 		$this->assertInstanceOf(OrClause::class, $dnf);
-		$this->assertSame('Interfaces\FooAwareInterface|Interfaces\BazAwareInterface', $dnf->dnf());
+		$this->assertSame('Stubs\Interfaces\FooAwareInterface|Stubs\Interfaces\BazAwareInterface', $dnf->dnf());
 
 		$dnf = DNF::getFromReflectionType(
 			(new \ReflectionFunction(function () : FooAwareInterface&BazAwareInterface {
 				return $this->getMockBuilder(BarPersonInterface::class)->getMock();
 			}))->getReturnType()
 		);
 		$this->assertInstanceOf(AndClause::class, $dnf);
-		$this->assertSame('Interfaces\FooAwareInterface&Interfaces\BazAwareInterface', $dnf->dnf());
+		$this->assertSame('Stubs\Interfaces\FooAwareInterface&Stubs\Interfaces\BazAwareInterface', $dnf->dnf());
 	}
 
 	public function test_getFromReflectionType_exception() : void {
@@ -223,12 +223,12 @@ public function test_getFromReturnType() : void {
 		$foo = fn () : FooAwareInterface|BazAwareInterface => $this->getMockBuilder(FooAwareInterface::class)->getMock();
 		$rf  = new \ReflectionFunction($foo);
 		$dnf = DNF::getFromReturnType($rf);
-		$this->assertSame('Interfaces\FooAwareInterface|Interfaces\BazAwareInterface', $dnf->dnf());
+		$this->assertSame('Stubs\Interfaces\FooAwareInterface|Stubs\Interfaces\BazAwareInterface', $dnf->dnf());
 
 		$foo = fn () : FooAwareInterface&BazAwareInterface => $this->getMockBuilder(FooAwareInterface::class)->getMock();
 		$rf  = new \ReflectionFunction($foo);
 		$dnf = DNF::getFromReturnType($rf);
-		$this->assertSame('Interfaces\FooAwareInterface&Interfaces\BazAwareInterface', $dnf->dnf());
+		$this->assertSame('Stubs\Interfaces\FooAwareInterface&Stubs\Interfaces\BazAwareInterface', $dnf->dnf());
 	}
 
 }
diff --git a/test/IntegrationTest.php b/test/IntegrationTest.php
@@ -8,12 +8,12 @@
 use donatj\PhpDnfSolver\Types\CallableType;
 use donatj\PhpDnfSolver\Types\OrClause;
 use donatj\PhpDnfSolver\Types\UserDefinedType;
-use Interfaces\BazAwareInterface;
-use Interfaces\FooAwareInterface;
-use Objects\Person\BarPersonInterface;
-use Objects\Person\InvokablePersonFactory;
-use Objects\Person\PersonInterface;
 use PHPUnit\Framework\TestCase;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Interfaces\FooAwareInterface;
+use Stubs\Objects\Person\BarPersonInterface;
+use Stubs\Objects\Person\InvokablePersonFactory;
+use Stubs\Objects\Person\PersonInterface;
 
 class IntegrationTest extends TestCase {
 

diff --git a/test/Types/AndClauseTest.php b/test/Types/AndClauseTest.php
@@ -5,9 +5,9 @@
 use donatj\PhpDnfSolver\Types\AndClause;
 use donatj\PhpDnfSolver\Types\BuiltInType;
 use donatj\PhpDnfSolver\Types\UserDefinedType;
-use Interfaces\BazAwareInterface;
-use Interfaces\FooAwareInterface;
 use PHPUnit\Framework\TestCase;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Interfaces\FooAwareInterface;
 
 class AndClauseTest extends TestCase {
 
@@ -34,7 +34,7 @@ public function test_dnf() : void {
 			new UserDefinedType(FooAwareInterface::class),
 		);
 
-		$this->assertSame('Interfaces\BazAwareInterface&Interfaces\FooAwareInterface', $clause->dnf());
+		$this->assertSame('Stubs\Interfaces\BazAwareInterface&Stubs\Interfaces\FooAwareInterface', $clause->dnf());
 	}
 
 }
diff --git a/test/Types/OrClauseTest.php b/test/Types/OrClauseTest.php
@@ -6,10 +6,10 @@
 use donatj\PhpDnfSolver\Types\BuiltInType;
 use donatj\PhpDnfSolver\Types\OrClause;
 use donatj\PhpDnfSolver\Types\UserDefinedType;
-use Interfaces\BazAwareInterface;
-use Interfaces\FooAwareInterface;
-use Objects\Person\BarPersonInterface;
 use PHPUnit\Framework\TestCase;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Interfaces\FooAwareInterface;
+use Stubs\Objects\Person\BarPersonInterface;
 
 class OrClauseTest extends TestCase {
 
@@ -66,7 +66,7 @@ public function test_dnf() : void {
 			new UserDefinedType(FooAwareInterface::class),
 		);
 
-		$this->assertSame('Interfaces\BazAwareInterface|Interfaces\FooAwareInterface', $clause->dnf());
+		$this->assertSame('Stubs\Interfaces\BazAwareInterface|Stubs\Interfaces\FooAwareInterface', $clause->dnf());
 	}
 
 }
diff --git a/test/Types/UserDefinedTypeTest.php b/test/Types/UserDefinedTypeTest.php
@@ -4,9 +4,9 @@
 
 use donatj\PhpDnfSolver\Exceptions\InvalidArgumentException;
 use donatj\PhpDnfSolver\Types\UserDefinedType;
-use Interfaces\BazAwareInterface;
 use PHPUnit\Framework\TestCase;
-use Traits\BazAwareTrait;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Traits\BazAwareTrait;
 
 class UserDefinedTypeTest extends TestCase {
 

diff --git a/test82/DNFTest.php b/test82/DNFTest.php
@@ -4,11 +4,11 @@
 
 use donatj\PhpDnfSolver\DNF;
 use donatj\PhpDnfSolver\Types\OrClause;
-use Interfaces\BazAwareInterface;
-use Interfaces\FooAwareInterface;
-use Objects\Person\BarPerson;
-use Objects\Person\InvokablePersonFactory;
 use PHPUnit\Framework\TestCase;
+use Stubs\Interfaces\BazAwareInterface;
+use Stubs\Interfaces\FooAwareInterface;
+use Stubs\Objects\Person\BarPerson;
+use Stubs\Objects\Person\InvokablePersonFactory;
 use Tests\TypeHelperTrait;
 
 class DNFTest extends TestCase {
@@ -23,10 +23,10 @@ public function test_getFromReflectionType() : void {
 		);
 		$this->assertInstanceOf(OrClause::class, $dnf);
 		$this->assertCount(3, $dnf);
-		$this->assertSame('(Interfaces\FooAwareInterface&Interfaces\BazAwareInterface)|int|null', $dnf->dnf());
+		$this->assertSame('(Stubs\Interfaces\FooAwareInterface&Stubs\Interfaces\BazAwareInterface)|int|null', $dnf->dnf());
 
 		$types = $dnf->getTypes();
-		$this->assertSame('Interfaces\FooAwareInterface&Interfaces\BazAwareInterface', $types[0]->dnf());
+		$this->assertSame('Stubs\Interfaces\FooAwareInterface&Stubs\Interfaces\BazAwareInterface', $types[0]->dnf());
 		$this->assertSame('int', $types[1]->dnf());
 		$this->assertSame('null', $types[2]->dnf());
 	}