Skip to content

Commit f89cce7

Browse files
authored
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
1 parent ec7204a commit f89cce7

File tree

55 files changed

+290
-479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+290
-479
lines changed

.github/workflows/php.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: 'Unit Tests'
22

3-
on:
4-
push:
5-
branches: [ release-1.x, release-2.x ]
6-
pull_request:
7-
branches: [ release-1.x, release-2.x ]
3+
on: push
84

95
jobs:
106
build-test:
@@ -24,7 +20,7 @@ jobs:
2420
tools: none
2521
coverage: none
2622
- name: Composer Install
27-
uses: ramsey/composer-install@v2
23+
uses: ramsey/composer-install@v3
2824
with:
2925
dependency-versions: ${{ matrix.composer }}
3026
- name: Unit Tests

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
vendor/
22
composer.lock
3+
.phpunit.cache
34
.phpunit.result.cache

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
],
1313
"require": {
1414
"php": "^8.1",
15-
"nikic/php-parser": "^v4.18 || ^5.0",
16-
"cspray/typiphy": "^0.4"
15+
"nikic/php-parser": "^v4.18 || ^5.0"
1716
},
1817
"require-dev": {
19-
"pestphp/pest": "^v1.21"
18+
"pestphp/pest": "^v2"
2019
},
2120
"autoload": {
2221
"psr-4": {

fixture_src/AliasedAttributeFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class AliasedAttributeFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/AliasedAttribute';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(AliasedAttribute\FooClass::class);
11+
public function fooClass() : string {
12+
return AliasedAttribute\FooClass::class;
1613
}
1714
}

fixture_src/ClassOnlyAttributeGroupSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class ClassOnlyAttributeGroupSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/ClassOnlyAttributeGroupSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(ClassOnlyAttributeGroupSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return ClassOnlyAttributeGroupSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/ClassOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function getPath() : string {
1111
return __DIR__ . '/ClassOnlyAttributeSingleClass';
1212
}
1313

14-
public function fooClass() : ObjectType {
15-
return objectType(ClassOnlyAttributeSingleClass\FooClass::class);
14+
public function fooClass() : string {
15+
return ClassOnlyAttributeSingleClass\FooClass::class;
1616
}
1717
}

fixture_src/ClassOnlyAttributeSingleInterfaceFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function getPath() : string {
1111
return __DIR__ .'/ClassOnlyAttributeSingleInterface';
1212
}
1313

14-
public function fooInterface() : ObjectType {
15-
return objectType(ClassOnlyAttributeSingleInterface\FooInterface::class);
14+
public function fooInterface() : string {
15+
return ClassOnlyAttributeSingleInterface\FooInterface::class;
1616
}
1717
}

fixture_src/ConstantOnlyAttributeGroupSingleClassFixture.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public function getPath() : string {
1111
return __DIR__ . '/ConstantOnlyAttributeGroupSingleClass';
1212
}
1313

14-
public function fooClass() : ObjectType {
15-
return objectType(ConstantOnlyAttributeGroupSingleClass\FooClass::class);
14+
public function fooClass() : string {
15+
return ConstantOnlyAttributeGroupSingleClass\FooClass::class;
1616
}
1717

1818
}

fixture_src/MethodOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class MethodOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/MethodOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(MethodOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return MethodOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/MultipleDifferentClassOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class MultipleDifferentClassOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/MultipleDifferentClassOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(MultipleDifferentClassOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return MultipleDifferentClassOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/NonPhpFileFixture.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class NonPhpFileFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/NonPhpFile';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(NonPhpFile\FooClass::class);
11+
public function fooClass() : string {
12+
return NonPhpFile\FooClass::class;
1613
}
17-
}
14+
}

fixture_src/ParameterOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class ParameterOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/ParameterOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(ParameterOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return ParameterOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/PropertyOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class PropertyOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/PropertyOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(PropertyOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return PropertyOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/RepeatableClassOnlyAttributeSingleFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class RepeatableClassOnlyAttributeSingleFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/RepeatableClassOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(RepeatableClassOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return RepeatableClassOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/RepeatableConstantOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class RepeatableConstantOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/RepeatableConstantOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(RepeatableConstantOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return RepeatableConstantOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/RepeatableMethodOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class RepeatableMethodOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ .'/RepeatableMethodOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(RepeatableMethodOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return RepeatableMethodOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/RepeatableParameterOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class RepeatableParameterOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/RepeatableParameterOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(RepeatableParameterOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return RepeatableParameterOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/RepeatablePropertyOnlyAttributeSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class RepeatablePropertyOnlyAttributeSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/RepeatablePropertyOnlyAttributeSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(RepeatablePropertyOnlyAttributeSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return RepeatablePropertyOnlyAttributeSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/SingleAttributeMultipleConstantsSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
class SingleAttributeMultipleConstantsSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/SingleAttributeMultipleConstantsSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(SingleAttributeMultipleConstantsSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return SingleAttributeMultipleConstantsSingleClass\FooClass::class;
1613
}
1714
}

fixture_src/SingleAttributeMultiplePropertiesSingleClassFixture.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22

33
namespace Cspray\AnnotatedTargetFixture;
44

5-
use Cspray\Typiphy\ObjectType;
6-
use function Cspray\Typiphy\objectType;
7-
85
final class SingleAttributeMultiplePropertiesSingleClassFixture implements Fixture {
96

107
public function getPath() : string {
118
return __DIR__ . '/SingleAttributeMultiplePropertiesSingleClass';
129
}
1310

14-
public function fooClass() : ObjectType {
15-
return objectType(SingleAttributeMultiplePropertiesSingleClass\FooClass::class);
11+
public function fooClass() : string {
12+
return SingleAttributeMultiplePropertiesSingleClass\FooClass::class;
1613
}
1714

1815
}

fixture_src/TargetAttributeInterfaceFixture.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,14 @@
33
namespace Cspray\AnnotatedTargetFixture;
44

55
use Cspray\AnnotatedTargetFixture\TargetAttributeInterface\TargetClass;
6-
use Cspray\Typiphy\ObjectType;
7-
use function Cspray\Typiphy\objectType;
86

97
final class TargetAttributeInterfaceFixture implements Fixture {
108

119
public function getPath() : string {
1210
return __DIR__ . '/TargetAttributeInterface';
1311
}
1412

15-
public function targetClass() : ObjectType {
16-
return objectType(TargetClass::class);
13+
public function targetClass() : string {
14+
return TargetClass::class;
1715
}
1816
}

0 commit comments

Comments
 (0)