Skip to content

Commit

Permalink
Support PHP 8.3 (#48)
Browse files Browse the repository at this point in the history
* Support PHP 8.3

* Fixed constructor phpdoc

* Update CommandException.php
  • Loading branch information
GrahamCampbell authored Dec 3, 2023
1 parent c0b54a9 commit 0eebc65
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Composer normalize
uses: docker://ergebnis/composer-normalize-action
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
extensions: mbstring

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install dependencies
run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress
Expand All @@ -37,7 +37,7 @@ jobs:
strategy:
max-parallel: 10
matrix:
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']

steps:
- name: Set up PHP
Expand All @@ -49,7 +49,7 @@ jobs:
extensions: mbstring

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install dependencies
run: composer update --no-interaction --no-progress
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
3 changes: 3 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
'@Symfony' => true,
'declare_strict_types' => false,
'global_namespace_import' => false,
'no_superfluous_phpdoc_tags' => [
'allow_mixed' => true,
],
'phpdoc_annotation_without_dot' => false,
'phpdoc_summary' => false,
'phpdoc_to_comment' => false,
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
],
"require": {
"php": "^7.2.5 || ^8.0",
"guzzlehttp/guzzle": "^7.5.1",
"guzzlehttp/promises": "^1.5.3 || ^2.0",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5"
"guzzlehttp/guzzle": "^7.8",
"guzzlehttp/promises": "^1.5.3 || ^2.0.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.5.1"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.1",
"bamarni/composer-bin-plugin": "^1.8.2",
"phpunit/phpunit": "^8.5.19 || ^9.5.8"
},
"autoload": {
Expand Down
6 changes: 2 additions & 4 deletions src/Exception/CommandException.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ public static function fromPrevious(CommandInterface $command, \Exception $prev)
}

/**
* @param string $message Exception message
* @param \Exception $previous Previous exception (if any)
* @param RequestInterface $request
* @param ResponseInterface $response
* @param string $message Exception message
* @param \Exception|null $previous Previous exception (if any)
*/
public function __construct(
$message,
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/php-cs-fixer/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "^7.4 || ^8.0",
"friendsofphp/php-cs-fixer": "3.16.0"
"friendsofphp/php-cs-fixer": "3.40.2"
},
"config": {
"preferred-install": "dist"
Expand Down

0 comments on commit 0eebc65

Please sign in to comment.