Merge pull request #36 from veewee/php84

veewee · web-flow · commit c3163a1a22fd · 2024-10-25T09:48:26.000+02:00
Bump dependencies
diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
@@ -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:
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -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:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -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 }}
@@ -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'}}
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -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>
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -53,5 +53,6 @@
         'static_lambda' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
 ;
diff --git a/composer.json b/composer.json
@@ -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"
     },
@@ -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",
diff --git a/phpunit.xml b/phpunit.xml
@@ -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>
diff --git a/src/Metadata/Converter/Types/Detector/NamedAttributesDetector.php b/src/Metadata/Converter/Types/Detector/NamedAttributesDetector.php
@@ -43,7 +43,6 @@ private function flattenContainer(AttributeItem $current): array
             $current->getAttributes(),
             /**
              * @param list<AttributeItem> $carry
-             * @param AttributeItem $attribute
              *
              * @return list<AttributeItem>
              */
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar
diff --git a/tools/phpunit.phar b/tools/phpunit.phar

Original file line number	Diff line number	Diff line change
`@@ -53,5 +53,6 @@`
`53`	`53`	`'static_lambda' => true,`
`54`	`54`	`'strict_comparison' => true,`
`55`	`55`	`'strict_param' => true,`
	`56`	`+ 'nullable_type_declaration_for_default_null_value' => true,`
`56`	`57`	`])`
`57`	`58`	`;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@ private function flattenContainer(AttributeItem $current): array`
`43`	`43`	`$current->getAttributes(),`
`44`	`44`	`/**`
`45`	`45`	`* @param list<AttributeItem> $carry`
`46`		`- * @param AttributeItem $attribute`
`47`	`46`	`*`
`48`	`47`	`* @return list<AttributeItem>`
`49`	`48`	`*/`