Skip to content

Commit

Permalink
Merge pull request #16 from Saeven/feature/php83-support
Browse files Browse the repository at this point in the history
Also support PHP 8.3
  • Loading branch information
Saeven committed Mar 20, 2024
2 parents 824094a + cfd36c7 commit 5c8f76a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/phpspec-task.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
operating-system: [ ubuntu-18.04 ]
php-versions: ['8.0.12', '8.1', '8.2' ]
operating-system: [ ubuntu-20.04 ]
php-versions: ['8.0.12', '8.1', '8.2', '8.3' ]
name: Evaluate Behavior, ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
steps:
# Get the source code
Expand All @@ -34,11 +34,6 @@ jobs:
# Execute PHPSpec
- name: Execute PHPSpec
run: XDEBUG_MODE=coverage vendor/bin/phpspec --config=phpspec.yml run
# Push Coverage
# - name: Push Coverage
# env:
# CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
# run: vendor/bin/codacycoverage clover build/coverage.xml



6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"minimum-stability": "dev",
"require": {
"php": "~8.0.12 || ~8.1.0 || ~8.2.0 ",
"php": "~8.0.12 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"laminas/laminas-mvc": "^3.3",
"laminas/laminas-servicemanager": "^3.11",
"laminas/laminas-eventmanager": "^3.4",
Expand All @@ -34,15 +34,15 @@
"laminas/laminas-config": "^3.7",
"laminas/laminas-cli": "^1.4.0",
"doctrine/annotations": "^1.13.0",
"roave/better-reflection": "^4.12 | ^5.4",
"roave/better-reflection": "^4.12 | ^5.4 | ^6.24",
"psr/container": "*"

},
"require-dev": {
"phpspec/phpspec": "6.1.* | ^7.0.1 | ^7.2.0",
"friends-of-phpspec/phpspec-code-coverage": "@stable",
"codacy/coverage": "dev-master",
"phpstan/phpstan": "1.1.2",
"phpstan/phpstan": "^1.10",
"laminas/laminas-coding-standard": "^2.3.0"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/CirclicalAutoWire/Service/RouterService.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function getAnnotations(): array
public function parseController(string $controllerClass)
{
$class = new ReflectionClass($controllerClass);
/** @var Route $classAnnotation */
/** @var ?Route $classAnnotation */
$classAnnotation = $this->reader->getClassAnnotation($class, Route::class);

// First, get all annotations for this controller
Expand Down

0 comments on commit 5c8f76a

Please sign in to comment.