Skip to content

Commit

Permalink
Merge pull request #75 from Slamdunk/php_80_support
Browse files Browse the repository at this point in the history
Add PHP 8.0 support
  • Loading branch information
Slamdunk committed Mar 18, 2021
2 parents 6e91012 + 9c372c6 commit 43e0839
Show file tree
Hide file tree
Showing 94 changed files with 1,862 additions and 2,170 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
/docs/html/
/laminas-mkdoc-theme.tgz
/laminas-mkdoc-theme/
/.phpunit.result.cache
/phpunit.xml
/vendor/
18 changes: 0 additions & 18 deletions autoload/formElementManagerPolyfill.php

This file was deleted.

62 changes: 30 additions & 32 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,46 +25,44 @@
}
},
"require": {
"php": "^5.6 || ^7.0",
"laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
"laminas/laminas-inputfilter": "^2.8",
"laminas/laminas-stdlib": "^3.2.1",
"laminas/laminas-zendframework-bridge": "^1.0"
"php": "^7.3 || ~8.0.0",
"laminas/laminas-hydrator": "^3.2 || ^4.0",
"laminas/laminas-inputfilter": "^2.10",
"laminas/laminas-stdlib": "^3.3",
"laminas/laminas-zendframework-bridge": "^1.1"
},
"require-dev": {
"doctrine/annotations": "~1.0",
"laminas/laminas-cache": "^2.6.1",
"laminas/laminas-captcha": "^2.7.1",
"laminas/laminas-code": "^2.6 || ^3.0",
"laminas/laminas-coding-standard": "~1.0.0",
"laminas/laminas-escaper": "^2.5",
"laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
"laminas/laminas-filter": "^2.6",
"laminas/laminas-i18n": "^2.6",
"laminas/laminas-recaptcha": "^3.0.0",
"laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
"laminas/laminas-session": "^2.8.1",
"laminas/laminas-text": "^2.6",
"laminas/laminas-validator": "^2.6",
"laminas/laminas-view": "^2.6.2",
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
"doctrine/annotations": "^1.10.4",
"laminas/laminas-cache": "^2.9.0",
"laminas/laminas-captcha": "^2.9.0",
"laminas/laminas-code": "^3.5.0",
"laminas/laminas-coding-standard": "^1.0.0",
"laminas/laminas-escaper": "^2.6.1",
"laminas/laminas-eventmanager": "^3.3.0",
"laminas/laminas-filter": "^2.9.4",
"laminas/laminas-i18n": "^2.10.3",
"laminas/laminas-recaptcha": "^3.2.0",
"laminas/laminas-servicemanager": "^3.4.1",
"laminas/laminas-session": "^2.9.3",
"laminas/laminas-text": "^2.7.1",
"laminas/laminas-validator": "^2.13.4",
"laminas/laminas-view": "^2.11.4",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.4.2"
},
"suggest": {
"laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements",
"laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support",
"laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support",
"laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers",
"laminas/laminas-recaptcha": "in order to use the ReCaptcha form element",
"laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
"laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers"
"laminas/laminas-captcha": "^2.9, required for using CAPTCHA form elements",
"laminas/laminas-code": "^3.5, required to use laminas-form annotations support",
"laminas/laminas-eventmanager": "^3.3, reuired for laminas-form annotations support",
"laminas/laminas-i18n": "^2.10, required when using laminas-form view helpers",
"laminas/laminas-recaptcha": "^3.2, in order to use the ReCaptcha form element",
"laminas/laminas-servicemanager": "^3.4.1, required to use the form factories or provide services",
"laminas/laminas-view": "^2.11.4, required for using the laminas-form view helpers"
},
"autoload": {
"psr-4": {
"Laminas\\Form\\": "src/"
},
"files": [
"autoload/formElementManagerPolyfill.php"
]
}
},
"autoload-dev": {
"files": [
Expand Down
65 changes: 29 additions & 36 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,44 +1,37 @@
<?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"
colors="true">
<testsuites>
<testsuite name="laminas-form Test Suite">
<directory>./test/</directory>
</testsuite>
</testsuites>

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

<filter>
<whitelist addUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>

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

<!-- OB_ENABLED should be enabled for some tests to check if all
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="./vendor/autoload.php"
colors="true">
<coverage includeUncoveredFiles="true">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="laminas-form Test Suite">
<directory>./test/</directory>
</testsuite>
</testsuites>
<groups>
<exclude>
<group>disable</group>
</exclude>
</groups>
<php>
<ini name="date.timezone" value="UTC"/>
<!-- OB_ENABLED should be enabled for some tests to check if all
functionality works as expected. Such tests include those for
Laminas\Soap and Laminas\Session, which require that headers not be sent
in order to work. -->
<env name="TESTS_LAMINAS_OB_ENABLED" value="false" />

<!-- Enable this if you have installed Doctrine\Common on the
<env name="TESTS_LAMINAS_OB_ENABLED" value="false"/>
<!-- Enable this if you have installed Doctrine\Common on the
include_path or via composer. -->
<env name="TESTS_LAMINAS_FORM_ANNOTATION_SUPPORT" value="false" />

<!-- Enable this if you have installed Laminas\ReCaptcha on the
<env name="TESTS_LAMINAS_FORM_ANNOTATION_SUPPORT" value="false"/>
<!-- Enable this if you have installed Laminas\ReCaptcha on the
include_path or via Composer. -->
<env name="TESTS_LAMINAS_FORM_RECAPTCHA_SUPPORT" value="false" />
<env name="TESTS_LAMINAS_FORM_RECAPTCHA_PUBLIC_KEY" value="public key" />
<env name="TESTS_LAMINAS_FORM_RECAPTCHA_PRIVATE_KEY" value="private key" />

</php>
<env name="TESTS_LAMINAS_FORM_RECAPTCHA_SUPPORT" value="false"/>
<env name="TESTS_LAMINAS_FORM_RECAPTCHA_PUBLIC_KEY" value="public key"/>
<env name="TESTS_LAMINAS_FORM_RECAPTCHA_PRIVATE_KEY" value="private key"/>
</php>
</phpunit>
Loading

0 comments on commit 43e0839

Please sign in to comment.