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

WIP: Add support for PHP 8 #23

Merged
merged 1 commit into from
Jun 10, 2021
Merged

WIP: Add support for PHP 8 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 11 additions & 19 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
{
"name": "laminas-api-tools/api-tools-documentation",
"description": "Laminas API Tools API documentation module",
"license": "BSD-3-Clause",
"keywords": [
"laminas",
"api-tools",
"module",
"documentation"
],
"homepage": "https://api-tools.getlaminas.org",
"support": {
"docs": "https://api-tools.getlaminas.org/documentation",
"issues": "https://github.com/laminas-api-tools/api-tools-documentation/issues",
"source": "https://github.com/laminas-api-tools/api-tools-documentation",
"rss": "https://github.com/laminas-api-tools/api-tools-documentation/releases.atom",
"chat": "https://laminas.dev/chat",
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
},
"extra": {
"laminas": {
"module": "Laminas\\ApiTools\\Documentation"
}
},
"license": "BSD-3-Clause",
"require": {
"php": "^7.3",
"laminas-api-tools/api-tools-configuration": "^1.2",
Expand All @@ -38,6 +22,9 @@
"laminas/laminas-zendframework-bridge": "^1.1",
"michelf/php-markdown": "^1.5"
},
"replace": {
"zfcampus/zf-apigility-documentation": "^1.3.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.2.0",
"laminas/laminas-stdlib": "^2.7.8 || ^3.0.1",
Expand All @@ -63,7 +50,12 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zfcampus/zf-apigility-documentation": "^1.3.0"
"support": {
"issues": "https://github.com/laminas-api-tools/api-tools-documentation/issues",
"forum": "https://discourse.laminas.dev",
"chat": "https://laminas.dev/chat",
"source": "https://github.com/laminas-api-tools/api-tools-documentation",
"docs": "https://api-tools.getlaminas.org/documentation",
"rss": "https://github.com/laminas-api-tools/api-tools-documentation/releases.atom"
}
}
2 changes: 1 addition & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/ApiFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ protected function marshalActionFromRouteConfig($serviceName, $serviceClassName,

protected function hasOptionalSegments(string $route): bool
{
return preg_match('#\[.*?:.+\]#', $route);
return (bool) preg_match('#\[.*?:.+\]#', $route);
}

/** @psalm-return array{code:string, message:string} */
Expand Down
2 changes: 1 addition & 1 deletion src/Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class Module
{
/** @return array */
/** @return array<string, mixed> */
public function getConfig()
{
return include __DIR__ . '/../config/module.config.php';
Expand Down