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

Provide support for PHP 8.1 #29

Merged
merged 4 commits into from
Jan 17, 2022
Merged

Provide support for PHP 8.1 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d28a81c
feat: Bump PHP and library dependencies to support PHP 8.1
weierophinney Jan 17, 2022
995656c
qa: convert deprecations to exceptions when testin
weierophinney Jan 17, 2022
4cab209
qa: update to laminas-coding-standard 2.3
weierophinney Jan 17, 2022
8caf97e
fix: add `#[ReturnTypeWillChange]` attributes where needed
weierophinney Jan 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,28 @@
}
},
"require": {
"php": "^7.3 || ~8.0.0",
"laminas-api-tools/api-tools-configuration": "^1.2",
"laminas-api-tools/api-tools-content-negotiation": "^1.2.1",
"laminas-api-tools/api-tools-provider": "^1.2",
"laminas/laminas-inputfilter": "^2.7.2",
"laminas/laminas-modulemanager": "^2.7.2",
"laminas/laminas-mvc": "^2.7.15 || ^3.0.4",
"laminas/laminas-servicemanager": "^2.7.6 || ^3.1",
"laminas/laminas-view": "^2.11.3",
"laminas/laminas-zendframework-bridge": "^1.1",
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"laminas-api-tools/api-tools-configuration": "^1.5",
"laminas-api-tools/api-tools-content-negotiation": "^1.7",
"laminas-api-tools/api-tools-provider": "^1.5",
"laminas/laminas-inputfilter": "^2.13",
"laminas/laminas-modulemanager": "^2.11",
"laminas/laminas-mvc": "^3.3",
"laminas/laminas-servicemanager": "^3.8",
"laminas/laminas-view": "^2.13",
"michelf/php-markdown": "^1.5"
},
"replace": {
"zfcampus/zf-apigility-documentation": "^1.3.0"
"conflict": {
"zfcampus/zf-apigility-documentation": "*"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.2.0",
"laminas/laminas-stdlib": "^2.7.8 || ^3.0.1",
"phpunit/phpunit": "^9.3",
"laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-stdlib": "^3.6.4",
"phpunit/phpunit": "^9.5.10",
"vimeo/psalm": "^4.7",
"psalm/plugin-phpunit": "^0.16.0",
"webmozart/assert": "^1.10",
"laminas/laminas-db": "^2.13"
"laminas/laminas-db": "^2.13.4"
},
"autoload": {
"psr-4": {
Expand Down
225 changes: 107 additions & 118 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,7 @@
<file>view</file>

<!-- Include all rules from Laminas Coding Standard -->
<rule ref="LaminasCodingStandard"/>
<rule ref="LaminasCodingStandard">
<exclude name="SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing"/>
</rule>
</ruleset>
1 change: 1 addition & 0 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
convertDeprecationsToExceptions="true"
colors="true">
<coverage processUncoveredFiles="true">
<include>
Expand Down
2 changes: 2 additions & 0 deletions src/Api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use ArrayIterator;
use IteratorAggregate;
use ReturnTypeWillChange;

//use Laminas\ApiTools\ContentNegotiation\ViewModel;

Expand Down Expand Up @@ -110,6 +111,7 @@ public function toArray()
*
* @return ArrayIterator
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->toArray());
Expand Down
2 changes: 2 additions & 0 deletions src/Field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use ArrayIterator;
use IteratorAggregate;
use ReturnTypeWillChange;

class Field implements IteratorAggregate
{
Expand Down Expand Up @@ -146,6 +147,7 @@ public function toArray()
*
* @return ArrayIterator
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->toArray());
Expand Down
2 changes: 2 additions & 0 deletions src/Operation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use ArrayIterator;
use IteratorAggregate;
use ReturnTypeWillChange;

class Operation implements IteratorAggregate
{
Expand Down Expand Up @@ -158,6 +159,7 @@ public function toArray()
*
* @return ArrayIterator
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->toArray());
Expand Down
2 changes: 2 additions & 0 deletions src/Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use ArrayIterator;
use IteratorAggregate;
use Laminas\ApiTools\Documentation\Api;
use ReturnTypeWillChange;

class Service implements IteratorAggregate
{
Expand Down Expand Up @@ -287,6 +288,7 @@ public function toArray()
*
* @return ArrayIterator
*/
#[ReturnTypeWillChange]
public function getIterator()
{
return new ArrayIterator($this->toArray());
Expand Down