Skip to content

Commit

Permalink
Merge pull request #36 from veewee/php84
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
veewee authored Oct 25, 2024
2 parents 33c96b0 + 1964aa3 commit c3163a1
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 101,294 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/analyzers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.2', '8.3']
php-versions: [ '8.2', '8.3' ]
composer-options: [ '--ignore-platform-req=php+' ]
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/code-style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.2', '8.3']
php-versions: [ '8.2', '8.3', '8.4' ]
composer-options: [ '--ignore-platform-req=php+' ]
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.2', '8.3']
php-versions: [ '8.2', '8.3', '8.4' ]
composer-options: [ '--ignore-platform-req=php+' ]
dependency-preference: ['current', 'lowest', 'stable']
fail-fast: false
name: PHP ${{ matrix.php-versions }} ${{ matrix.dependency-preference }} deps @ ${{ matrix.operating-system }}
Expand All @@ -21,6 +22,7 @@ jobs:
tools: 'composer:v2'
extensions: pcov, mbstring, posix, dom, soap
- name: Install dependencies
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.dependency-preference == 'lowest' && '--prefer-lowest' || '' }} ${{ matrix.dependency-preference == 'stable' && '--prefer-stable' || '' }}
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.dependency-preference == 'lowest' && '--prefer-lowest' || '' }} ${{ matrix.dependency-preference == 'stable' && '--prefer-stable' || '' }} ${{ matrix.composer-options }}
- name: Run the tests
run: ./vendor/bin/phpunit
continue-on-error: ${{ matrix.php-versions == '8.4'}}
3 changes: 1 addition & 2 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="phpunit" version="^9.5.23" installed="9.6.13" location="./tools/phpunit.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.13.0" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.13.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
</phive>
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@
'static_lambda' => true,
'strict_comparison' => true,
'strict_param' => true,
'nullable_type_declaration_for_default_null_value' => true,
])
;
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-dom": "*",
"goetas-webservices/xsd-reader": "^0.4.6",
"php-soap/engine": "^2.10.1",
"php-soap/wsdl": "^1.4",
"php-soap/xml": "^1.6.0",
"php-soap/engine": "^2.13",
"php-soap/wsdl": "^1.10",
"php-soap/xml": "^1.8.0",
"veewee/xml": "^3.0",
"azjezz/psl": "^2.4",
"azjezz/psl": "^3.0",
"symfony/console": "^5.4 || ^6.0 || ^7.0",
"webmozart/assert": "^1.11"
},
Expand All @@ -29,7 +29,7 @@
"php-soap/engine-integration-tests": "^1.5.0",
"psalm/plugin-symfony": "^5.0",
"php-standard-library/psalm-plugin": "^2.2",
"vimeo/psalm": "^5.6",
"vimeo/psalm": "^5.26",
"phpunit/phpunit": "^10.1"
},
"license": "MIT",
Expand Down
39 changes: 21 additions & 18 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" bootstrap="tests/bootstrap.php" executionOrder="random" beStrictAboutOutputDuringTests="false" failOnRisky="true" failOnWarning="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="false" beStrictAboutCoverageMetadata="false">
<testsuites>
<testsuite name="unit">
<directory suffix="Test.php">tests/Unit</directory>
</testsuite>
<testsuite name="compatibility">
<directory suffix=".phpt">tests/PhpCompatibility</directory>
</testsuite>
<testsuite name="integration">
<directory suffix="Test.php">tests/Integration</directory>
</testsuite>
</testsuites>
<coverage/>
<source>
<include>
<directory suffix=".php">src</directory>
</include>
</source>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" bootstrap="tests/bootstrap.php"
executionOrder="random" beStrictAboutOutputDuringTests="false" failOnRisky="true" failOnWarning="true"
cacheDirectory=".phpunit.cache" requireCoverageMetadata="false" beStrictAboutCoverageMetadata="false">
<testsuites>
<testsuite name="unit">
<directory suffix="Test.php">tests/Unit</directory>
</testsuite>
<testsuite name="compatibility">
<directory suffix=".phpt">tests/PhpCompatibility</directory>
</testsuite>
<testsuite name="integration">
<directory suffix="Test.php">tests/Integration</directory>
</testsuite>
</testsuites>
<coverage/>
<source>
<include>
<directory suffix=".php">src</directory>
</include>
</source>
</phpunit>
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ private function flattenContainer(AttributeItem $current): array
$current->getAttributes(),
/**
* @param list<AttributeItem> $carry
* @param AttributeItem $attribute
*
* @return list<AttributeItem>
*/
Expand Down
Binary file modified tools/php-cs-fixer.phar
Binary file not shown.
Loading

0 comments on commit c3163a1

Please sign in to comment.