Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add PHP 8.0 support #75

Merged
merged 11 commits into from
Mar 18, 2021
+1,862 −2,170
Merged

Add PHP 8.0 support #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b7bb09
Tests ok on PHP 7.4
Slamdunk Oct 21, 2020
138d79b
Tests ok on PHP 8.0
Slamdunk Oct 21, 2020
9d5200a
CS Fix
Slamdunk Oct 21, 2020
0491d96
--ignore-platform-reqs on PHP 8.0
Slamdunk Oct 21, 2020
88ccfa4
Tests pass on 8.0
Slamdunk Oct 22, 2020
1052af4
Use bare ZIP to allow Travis download it
Slamdunk Oct 22, 2020
61c9b32
Rename test groups to generic issue
Slamdunk Nov 2, 2020
08d0057
Drop support to laminas-servicemanager < 3.4
Slamdunk Nov 12, 2020
b8e9b20
Keep BC, while getting rid of legacy
Slamdunk Dec 10, 2020
8c2c934
Ensure FormElementManagerFactory BC
Slamdunk Jan 1, 2021
9c372c6
Mark SMv2 method/attribute as @deprecated
Slamdunk Jan 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

62 changes: 30 additions & 32 deletions composer.json
View file
Open in desktop
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
View file
Open in desktop
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>