diff --git a/composer.json b/composer.json
index 6dd4252b1bf67e6ae27c9d8b24ba88cc5add18f1..101d77035be78397312c2ca53f5b5b8697450b07 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,6 @@
"davefx/phplot": "^6.2",
"jasig/phpcas": "^1.3",
"phpxmlrpc/phpxmlrpc": "^4.4",
- "gossi/docblock": "^1.6",
"phpxmlrpc/extras": "^0.6.2",
"algo26-matthias/idna-convert": "^3.0",
"caxy/php-htmldiff": "^0.1.9",
@@ -59,7 +58,8 @@
"symfony/polyfill-php73": "^1.27",
"symfony/polyfill-php74": "^1.27",
"symfony/polyfill-php80": "^1.27",
- "symfony/polyfill-php81": "^1.27"
+ "symfony/polyfill-php81": "^1.27",
+ "phpowermove/docblock": "^2.0"
},
"replace": {
"symfony/polyfill-php54": "*",
diff --git a/composer.lock b/composer.lock
index 93986c9d9e498c5560f660d034a30626b347009e..2014a8a5e74838ea2418e6eb7c1bf0f6a48c3e9f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "d67f415c948520b9630c33c48bc3c668",
+ "content-hash": "b208b63a6fc53d453c263420fa7350da",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -411,57 +411,6 @@
},
"time": "2020-11-24T22:02:12+00:00"
},
- {
- "name": "gossi/docblock",
- "version": "v1.6",
- "source": {
- "type": "git",
- "url": "https://github.com/phpowermove/docblock.git",
- "reference": "d7e2f299279f5aebbfddeef1c119e26bef4bc7e9"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpowermove/docblock/zipball/d7e2f299279f5aebbfddeef1c119e26bef4bc7e9",
- "reference": "d7e2f299279f5aebbfddeef1c119e26bef4bc7e9",
- "shasum": ""
- },
- "require": {
- "phootwork/collection": "^1.5",
- "php": ">=5.6"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7",
- "sami/sami": "^4|^3"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "gossi\\docblock\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Thomas Gossmann",
- "homepage": "http://gos.si"
- }
- ],
- "description": "PHP Docblock parser and generator. An API to read and write Docblocks.",
- "keywords": [
- "docblock",
- "generator",
- "parser"
- ],
- "support": {
- "issues": "https://github.com/gossi/docblock/issues",
- "source": "https://github.com/phpowermove/docblock/tree/v1.6"
- },
- "abandoned": "phpowermove/docblock",
- "time": "2017-07-01T18:10:54+00:00"
- },
{
"name": "guzzlehttp/psr7",
"version": "2.4.4",
@@ -1745,30 +1694,26 @@
},
{
"name": "phootwork/collection",
- "version": "v1.6.1",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/phootwork/collection.git",
- "reference": "87def4453e84b98ce516d647bf23e4c497d4b95c"
+ "reference": "d58a0d7186074b601b016b9878b6fb65f6c23648"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phootwork/collection/zipball/87def4453e84b98ce516d647bf23e4c497d4b95c",
- "reference": "87def4453e84b98ce516d647bf23e4c497d4b95c",
+ "url": "https://api.github.com/repos/phootwork/collection/zipball/d58a0d7186074b601b016b9878b6fb65f6c23648",
+ "reference": "d58a0d7186074b601b016b9878b6fb65f6c23648",
"shasum": ""
},
"require": {
- "phootwork/lang": "~0",
- "php": ">=5.6"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7",
- "sami/sami": "^4|^3"
+ "phootwork/lang": "^2.0",
+ "php": ">=7.2"
},
"type": "library",
"autoload": {
"psr-4": {
- "phootwork\\collection\\": "src"
+ "phootwork\\collection\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1781,48 +1726,49 @@
"homepage": "http://gos.si"
}
],
- "description": "PHP Collections library (List, Set, Map, Queue & Stack)",
+ "description": "The phootwork library fills gaps in the php language and provides better solutions than the existing ones php offers.",
+ "homepage": "https://phootwork.github.io/collection/",
"keywords": [
+ "Array object",
+ "Text object",
"collection",
"collections",
+ "json",
"list",
"map",
"queue",
"set",
- "stack"
+ "stack",
+ "xml"
],
"support": {
- "issues": "https://github.com/phootwork/collection/issues",
- "source": "https://github.com/phootwork/collection/tree/master"
+ "issues": "https://github.com/phootwork/phootwork/issues",
+ "source": "https://github.com/phootwork/collection/tree/v2.1.3"
},
- "time": "2018-09-15T11:41:17+00:00"
+ "time": "2020-09-17T16:04:53+00:00"
},
{
"name": "phootwork/lang",
- "version": "v0.9",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/phootwork/lang.git",
- "reference": "752482b0c8f60d005414b0cb81646f72bf929724"
+ "reference": "77402690535452da745cf11df33adc51a4ad89a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phootwork/lang/zipball/752482b0c8f60d005414b0cb81646f72bf929724",
- "reference": "752482b0c8f60d005414b0cb81646f72bf929724",
+ "url": "https://api.github.com/repos/phootwork/lang/zipball/77402690535452da745cf11df33adc51a4ad89a1",
+ "reference": "77402690535452da745cf11df33adc51a4ad89a1",
"shasum": ""
},
"require": {
- "php": ">=5.6",
- "symfony/polyfill-mbstring": "~1.8"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7",
- "sami/sami": "^4.1.0"
+ "php": ">=7.2",
+ "symfony/polyfill-mbstring": "^1.12"
},
"type": "library",
"autoload": {
"psr-4": {
- "phootwork\\lang\\": "src"
+ "phootwork\\lang\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1836,6 +1782,7 @@
}
],
"description": "Missing PHP language constructs",
+ "homepage": "https://phootwork.github.io/lang/",
"keywords": [
"array",
"comparator",
@@ -1843,10 +1790,10 @@
"string"
],
"support": {
- "issues": "https://github.com/phootwork/lang/issues",
- "source": "https://github.com/phootwork/lang/tree/master"
+ "issues": "https://github.com/phootwork/phootwork/issues",
+ "source": "https://github.com/phootwork/lang/tree/v2.1.3"
},
- "time": "2018-08-04T14:22:05+00:00"
+ "time": "2021-02-15T17:24:43+00:00"
},
{
"name": "php-di/invoker",
@@ -2013,6 +1960,58 @@
},
"time": "2020-10-12T12:39:22+00:00"
},
+ {
+ "name": "phpowermove/docblock",
+ "version": "v2.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/phpowermove/docblock.git",
+ "reference": "b96e2c9a14a6014fd8d932643c95b4d20638756a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/phpowermove/docblock/zipball/b96e2c9a14a6014fd8d932643c95b4d20638756a",
+ "reference": "b96e2c9a14a6014fd8d932643c95b4d20638756a",
+ "shasum": ""
+ },
+ "require": {
+ "phootwork/collection": "^2.0",
+ "phootwork/lang": "^2.0",
+ "php": ">=7.2"
+ },
+ "require-dev": {
+ "phootwork/php-cs-fixer-config": "^0.2.2",
+ "phpunit/phpunit": "^8.0",
+ "psalm/phar": "^4.3"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "gossi\\docblock\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Thomas Gossmann",
+ "homepage": "http://gos.si"
+ }
+ ],
+ "description": "PHP Docblock parser and generator. An API to read and write Docblocks.",
+ "keywords": [
+ "docblock",
+ "generator",
+ "parser"
+ ],
+ "support": {
+ "issues": "https://github.com/gossi/docblock/issues",
+ "source": "https://github.com/phpowermove/docblock/tree/v2.0.1"
+ },
+ "time": "2021-02-17T11:36:51+00:00"
+ },
{
"name": "phpseclib/phpseclib",
"version": "3.0.19",
diff --git a/lib/classes/restapi/RouteMap.php b/lib/classes/restapi/RouteMap.php
index de5ebd725eded4c0be098a6894989698356a0124..0670f56e6eb183aab5df0ffbcab274639e46b678 100644
--- a/lib/classes/restapi/RouteMap.php
+++ b/lib/classes/restapi/RouteMap.php
@@ -977,9 +977,9 @@ abstract class RouteMap
}
// Iterate through all methods of the routemap
- foreach ($ref->getMethods() as $ref_method) {
- // Not public? Not an api route!
- if (!$ref_method->isPublic()) {
+ foreach ($ref->getMethods( \ReflectionMethod::IS_PUBLIC) as $ref_method) {
+ // No docblock? Not an api route!
+ if (!$ref_method->getDocComment()) {
continue;
}