Skip to content

Commit

Permalink
Merge pull request #8 from veewee/php82
Browse files Browse the repository at this point in the history
Allow php82
  • Loading branch information
veewee committed Nov 4, 2022
2 parents 4da6da5 + fec4c97 commit e6908df
Show file tree
Hide file tree
Showing 14 changed files with 76,844 additions and 73,296 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analyzers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/functional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest, windows-latest, macos-latest]
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['7.4', '8.0', '8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
8 changes: 4 additions & 4 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpunit" version="^9.5.10" installed="9.5.10" location="./tools/phpunit.phar" copy="true"/>
<phar name="psalm" version="^4.12.0" installed="4.12.0" location="./tools/psalm.phar" copy="true"/>
<phar name="infection" version="^0.25" installed="0.25.3" location="./tools/infection.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.3.2" installed="3.3.2" location="./tools/php-cs-fixer.phar" copy="true"/>
<phar name="phpunit" version="^9.5.26" installed="9.5.26" location="./tools/phpunit.phar" copy="true"/>
<phar name="psalm" version="^4.29.0" installed="4.29.0" location="./tools/psalm.phar" copy="true"/>
<phar name="infection" version="^0.26" installed="0.26.1" location="./tools/infection.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.13.0" installed="3.13.0" location="./tools/php-cs-fixer.phar" copy="true"/>
</phive>
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 ",
"composer-plugin-api": "~2.0"
},
"require-dev": {
Expand Down
2 changes: 0 additions & 2 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
<psalm
totallyTyped="true"
forbidEcho="true"
strictBinaryOperands="true"
phpVersion="7.4"
allowStringToStandInForClass="true"
Expand Down
4 changes: 1 addition & 3 deletions src/Exception/ParallelException.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@

namespace ComposerRunParallel\Exception;

use RuntimeException;

final class ParallelException extends RuntimeException
final class ParallelException extends \RuntimeException
{
public static function atLeastOneTask(): self
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Executor/AsyncTaskExecutorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ final class AsyncTaskExecutorTest extends TestCase
{
private AsyncTaskExecutor $asyncTaskExecutor;

/** @var MockObject & Loop */
/** @var Loop&MockObject */
private MockObject $loop;

/** @var MockObject & ProcessExecutor */
/** @var MockObject&ProcessExecutor */
private MockObject $processExecutor;

protected function setUp(): void
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Scripts/ParallelScriptTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ParallelScriptTest extends TestCase
private Composer $composer;
private ParallelScript $script;

/** @var MockObject & ProcessExecutor */
/** @var MockObject&ProcessExecutor */
private MockObject $processExecutor;

protected function setUp(): void
Expand Down
Binary file modified tools/infection.phar
Binary file not shown.
Binary file modified tools/php-cs-fixer.phar
Binary file not shown.
150,110 changes: 76,831 additions & 73,279 deletions tools/phpunit.phar

Large diffs are not rendered by default.

Binary file modified tools/psalm.phar
Binary file not shown.

0 comments on commit e6908df

Please sign in to comment.