Skip to content

Commit

Permalink
Merge pull request #96 from fezfez/php-8.4
Browse files Browse the repository at this point in the history 
Allow php 8.4
  • Loading branch information
@gsteel
gsteel authored Nov 17, 2024
2 parents 90a2646 + 6e394b5 commit 97639e1
Show file tree
Hide file tree
Showing 24 changed files with 808 additions and 558 deletions.
2 changes: 1 addition & 1 deletion .laminas-ci.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"xdebug"
],
"ignore_php_platform_requirements": {
"8.3": false
"8.4": true
},
"backwardCompatibilityCheck": true
}
15 changes: 8 additions & 7 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"laminas/laminas-eventmanager": "^3.12",
"laminas/laminas-servicemanager": "^3.22",
"laminas/laminas-stdlib": "^3.18"
Expand All @@ -41,14 +41,14 @@
"ext-xdebug": "*",
"laminas/laminas-cache": "^3.12.2",
"laminas/laminas-cache-storage-adapter-memory": "^2.3",
"laminas/laminas-coding-standard": "~2.5.0",
"laminas/laminas-coding-standard": "~3.0.1",
"laminas/laminas-db": "^2.20.0",
"laminas/laminas-http": "^2.19",
"laminas/laminas-validator": "^2.57.0",
"laminas/laminas-http": "^2.20",
"laminas/laminas-validator": "^2.64.1",
"mongodb/mongodb": "~1.20.0",
"phpunit/phpunit": "^9.6.19",
"phpunit/phpunit": "^10.5.38",
"psalm/plugin-phpunit": "^0.19.0",
"vimeo/psalm": "^5.24.0"
"vimeo/psalm": "^5.26.1"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component",
Expand Down Expand Up @@ -83,6 +83,7 @@
"static-analysis": "psalm --shepherd --stats"
},
"conflict": {
"zendframework/zend-session": "*"
"zendframework/zend-session": "*",
"amphp/amp":"<2.6.4"
}
}
787 changes: 367 additions & 420 deletions composer.lock
View file

Large diffs are not rendered by default.

91 changes: 47 additions & 44 deletions phpunit.xml.dist
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="./vendor/autoload.php"
convertDeprecationsToExceptions="true"
colors="true">
<testsuites>
<testsuite name="laminas-session Test Suite">
<directory>./test/</directory>
</testsuite>
</testsuites>

<groups>
<exclude>
<group>disable</group>
</exclude>
</groups>

<coverage>
<include>
<directory suffix=".php">./src</directory>
</include>
<exclude>
<file>src/compatibility/autoload.php</file>
</exclude>
</coverage>

<php>
<ini name="date.timezone" value="UTC" />

<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL" value="false" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="localhost" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_USERNAME" value="travis" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_PASSWORD" value="" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_DATABASE" value="laminas_session_test" />

<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL" value="false" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="localhost" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_USERNAME" value="travis" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_PASSWORD" value="" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_DATABASE" value="laminas_session_test" />

<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB" value="false" />
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB_CONNECTION_STRING" value="mongodb://localhost/" />
</php>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="./vendor/autoload.php"
colors="true"
cacheDirectory=".phpunit.cache"
failOnDeprecation="true"
failOnNotice="true"
failOnWarning="true"
failOnPhpunitDeprecation="true"
displayDetailsOnPhpunitDeprecations="true"
displayDetailsOnTestsThatTriggerDeprecations="true"
displayDetailsOnTestsThatTriggerNotices="true"
displayDetailsOnTestsThatTriggerWarnings="true">
<testsuites>
<testsuite name="laminas-session Test Suite">
<directory>./test/</directory>
</testsuite>
</testsuites>
<groups>
<exclude>
<group>disable</group>
</exclude>
</groups>
<php>
<ini name="date.timezone" value="UTC"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL" value="false"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_HOSTNAME" value="localhost"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_USERNAME" value="travis"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_PASSWORD" value=""/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MYSQL_DATABASE" value="laminas_session_test"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL" value="false"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_HOSTNAME" value="localhost"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_USERNAME" value="travis"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_PASSWORD" value=""/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_PGSQL_DATABASE" value="laminas_session_test"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB" value="false"/>
<env name="TESTS_LAMINAS_SESSION_ADAPTER_DRIVER_MONGODB_CONNECTION_STRING" value="mongodb://localhost/"/>
</php>
<source>
<include>
<directory suffix=".php">./src</directory>
</include>
<exclude>
<file>src/compatibility/autoload.php</file>
</exclude>
</source>
</phpunit>
Loading

0 comments on commit 97639e1

Please sign in to comment.