Skip to content

Commit 120ef68

Browse files
Merge pull request #23 from internalsystemerror/feature/php8
WIP: Add support for PHP 8
2 parents 27bde83 + 3b47a77 commit 120ef68

File tree

4 files changed

+14
-22
lines changed

4 files changed

+14
-22
lines changed

composer.json

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
11
{
22
"name": "laminas-api-tools/api-tools-documentation",
33
"description": "Laminas API Tools API documentation module",
4-
"license": "BSD-3-Clause",
54
"keywords": [
65
"laminas",
76
"api-tools",
87
"module",
98
"documentation"
109
],
1110
"homepage": "https://api-tools.getlaminas.org",
12-
"support": {
13-
"docs": "https://api-tools.getlaminas.org/documentation",
14-
"issues": "https://github.com/laminas-api-tools/api-tools-documentation/issues",
15-
"source": "https://github.com/laminas-api-tools/api-tools-documentation",
16-
"rss": "https://github.com/laminas-api-tools/api-tools-documentation/releases.atom",
17-
"chat": "https://laminas.dev/chat",
18-
"forum": "https://discourse.laminas.dev"
19-
},
20-
"config": {
21-
"sort-packages": true
22-
},
23-
"extra": {
24-
"laminas": {
25-
"module": "Laminas\\ApiTools\\Documentation"
26-
}
27-
},
11+
"license": "BSD-3-Clause",
2812
"require": {
2913
"php": "^7.3",
3014
"laminas-api-tools/api-tools-configuration": "^1.2",
@@ -38,6 +22,9 @@
3822
"laminas/laminas-zendframework-bridge": "^1.1",
3923
"michelf/php-markdown": "^1.5"
4024
},
25+
"replace": {
26+
"zfcampus/zf-apigility-documentation": "^1.3.0"
27+
},
4128
"require-dev": {
4229
"laminas/laminas-coding-standard": "~2.2.0",
4330
"laminas/laminas-stdlib": "^2.7.8 || ^3.0.1",
@@ -63,7 +50,12 @@
6350
"test": "phpunit --colors=always",
6451
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
6552
},
66-
"replace": {
67-
"zfcampus/zf-apigility-documentation": "^1.3.0"
53+
"support": {
54+
"issues": "https://github.com/laminas-api-tools/api-tools-documentation/issues",
55+
"forum": "https://discourse.laminas.dev",
56+
"chat": "https://laminas.dev/chat",
57+
"source": "https://github.com/laminas-api-tools/api-tools-documentation",
58+
"docs": "https://api-tools.getlaminas.org/documentation",
59+
"rss": "https://github.com/laminas-api-tools/api-tools-documentation/releases.atom"
6860
}
6961
}

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ApiFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ protected function marshalActionFromRouteConfig($serviceName, $serviceClassName,
461461

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

467467
/** @psalm-return array{code:string, message:string} */

src/Module.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class Module
66
{
7-
/** @return array */
7+
/** @return array<string, mixed> */
88
public function getConfig()
99
{
1010
return include __DIR__ . '/../config/module.config.php';

0 commit comments

Comments
 (0)