Task/remove typiphy dependency (#24)

* Remove need for cspray/typiphy * update testing framework * Improve AnnotatedTargetParserOptions into a value object * Run check so we can make it required status * Use newer version of composer install action
cspray · Aug 8, 2024 · f89cce7 · f89cce7
1 parent ec7204a
commit f89cce7
Show file tree

Hide file tree

Showing 55 changed files with 290 additions and 479 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -1,10 +1,6 @@
 name: 'Unit Tests'
 
-on:
-  push:
-    branches: [ release-1.x, release-2.x ]
-  pull_request:
-    branches: [ release-1.x, release-2.x ]
+on: push
 
 jobs:
   build-test:
@@ -24,7 +20,7 @@ jobs:
           tools: none
           coverage: none
       - name: Composer Install
-        uses: ramsey/composer-install@v2
+        uses: ramsey/composer-install@v3
         with:
           dependency-versions: ${{ matrix.composer }}
       - name: Unit Tests

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 vendor/
 composer.lock
+.phpunit.cache
 .phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -12,11 +12,10 @@
   ],
   "require": {
     "php": "^8.1",
-    "nikic/php-parser": "^v4.18 || ^5.0",
-    "cspray/typiphy": "^0.4"
+    "nikic/php-parser": "^v4.18 || ^5.0"
   },
   "require-dev": {
-    "pestphp/pest": "^v1.21"
+    "pestphp/pest": "^v2"
   },
   "autoload": {
     "psr-4": {

diff --git a/fixture_src/AliasedAttributeFixture.php b/fixture_src/AliasedAttributeFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class AliasedAttributeFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/AliasedAttribute';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(AliasedAttribute\FooClass::class);
+    public function fooClass() : string {
+        return AliasedAttribute\FooClass::class;
     }
 }
diff --git a/fixture_src/ClassOnlyAttributeGroupSingleClassFixture.php b/fixture_src/ClassOnlyAttributeGroupSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class ClassOnlyAttributeGroupSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/ClassOnlyAttributeGroupSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(ClassOnlyAttributeGroupSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return ClassOnlyAttributeGroupSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/ClassOnlyAttributeSingleClassFixture.php b/fixture_src/ClassOnlyAttributeSingleClassFixture.php
@@ -11,7 +11,7 @@ public function getPath() : string {
         return __DIR__ . '/ClassOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(ClassOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return ClassOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/ClassOnlyAttributeSingleInterfaceFixture.php b/fixture_src/ClassOnlyAttributeSingleInterfaceFixture.php
@@ -11,7 +11,7 @@ public function getPath() : string {
         return __DIR__ .'/ClassOnlyAttributeSingleInterface';
     }
 
-    public function fooInterface() : ObjectType {
-        return objectType(ClassOnlyAttributeSingleInterface\FooInterface::class);
+    public function fooInterface() : string {
+        return ClassOnlyAttributeSingleInterface\FooInterface::class;
     }
 }
diff --git a/fixture_src/ConstantOnlyAttributeGroupSingleClassFixture.php b/fixture_src/ConstantOnlyAttributeGroupSingleClassFixture.php
@@ -11,8 +11,8 @@ public function getPath() : string {
         return __DIR__ . '/ConstantOnlyAttributeGroupSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(ConstantOnlyAttributeGroupSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return ConstantOnlyAttributeGroupSingleClass\FooClass::class;
     }
 
 }
diff --git a/fixture_src/MethodOnlyAttributeSingleClassFixture.php b/fixture_src/MethodOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class MethodOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/MethodOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(MethodOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return MethodOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/MultipleDifferentClassOnlyAttributeSingleClassFixture.php b/fixture_src/MultipleDifferentClassOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class MultipleDifferentClassOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/MultipleDifferentClassOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(MultipleDifferentClassOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return MultipleDifferentClassOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/NonPhpFileFixture.php b/fixture_src/NonPhpFileFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class NonPhpFileFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/NonPhpFile';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(NonPhpFile\FooClass::class);
+    public function fooClass() : string {
+        return NonPhpFile\FooClass::class;
     }
-}
+}
diff --git a/fixture_src/ParameterOnlyAttributeSingleClassFixture.php b/fixture_src/ParameterOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class ParameterOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/ParameterOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(ParameterOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return ParameterOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/PropertyOnlyAttributeSingleClassFixture.php b/fixture_src/PropertyOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class PropertyOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/PropertyOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(PropertyOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return PropertyOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/RepeatableClassOnlyAttributeSingleFixture.php b/fixture_src/RepeatableClassOnlyAttributeSingleFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class RepeatableClassOnlyAttributeSingleFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/RepeatableClassOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(RepeatableClassOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return RepeatableClassOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/RepeatableConstantOnlyAttributeSingleClassFixture.php b/fixture_src/RepeatableConstantOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class RepeatableConstantOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/RepeatableConstantOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(RepeatableConstantOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return RepeatableConstantOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/RepeatableMethodOnlyAttributeSingleClassFixture.php b/fixture_src/RepeatableMethodOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class RepeatableMethodOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ .'/RepeatableMethodOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(RepeatableMethodOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return RepeatableMethodOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/RepeatableParameterOnlyAttributeSingleClassFixture.php b/fixture_src/RepeatableParameterOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class RepeatableParameterOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/RepeatableParameterOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(RepeatableParameterOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return RepeatableParameterOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/RepeatablePropertyOnlyAttributeSingleClassFixture.php b/fixture_src/RepeatablePropertyOnlyAttributeSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class RepeatablePropertyOnlyAttributeSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/RepeatablePropertyOnlyAttributeSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(RepeatablePropertyOnlyAttributeSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return RepeatablePropertyOnlyAttributeSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/SingleAttributeMultipleConstantsSingleClassFixture.php b/fixture_src/SingleAttributeMultipleConstantsSingleClassFixture.php
@@ -2,16 +2,13 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 class SingleAttributeMultipleConstantsSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/SingleAttributeMultipleConstantsSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(SingleAttributeMultipleConstantsSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return SingleAttributeMultipleConstantsSingleClass\FooClass::class;
     }
 }
diff --git a/fixture_src/SingleAttributeMultiplePropertiesSingleClassFixture.php b/fixture_src/SingleAttributeMultiplePropertiesSingleClassFixture.php
@@ -2,17 +2,14 @@
 
 namespace Cspray\AnnotatedTargetFixture;
 
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
-
 final class SingleAttributeMultiplePropertiesSingleClassFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/SingleAttributeMultiplePropertiesSingleClass';
     }
 
-    public function fooClass() : ObjectType {
-        return objectType(SingleAttributeMultiplePropertiesSingleClass\FooClass::class);
+    public function fooClass() : string {
+        return SingleAttributeMultiplePropertiesSingleClass\FooClass::class;
     }
 
 }
diff --git a/fixture_src/TargetAttributeInterfaceFixture.php b/fixture_src/TargetAttributeInterfaceFixture.php
@@ -3,16 +3,14 @@
 namespace Cspray\AnnotatedTargetFixture;
 
 use Cspray\AnnotatedTargetFixture\TargetAttributeInterface\TargetClass;
-use Cspray\Typiphy\ObjectType;
-use function Cspray\Typiphy\objectType;
 
 final class TargetAttributeInterfaceFixture implements Fixture {
 
     public function getPath() : string {
         return __DIR__ . '/TargetAttributeInterface';
     }
 
-    public function targetClass() : ObjectType {
-        return objectType(TargetClass::class);
+    public function targetClass() : string {
+        return TargetClass::class;
     }
 }