Skip to content
Snippets Groups Projects
Commit eb453097 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

replace gossi/docblock v1.6 with phpowermove/docblock v2.0.1, fixes #2494 

Closes #2494

Merge request studip/studip!1679
parent 80961d80
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
composer.json
+ 2
− 2
View file @ eb453097
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
"davefx/phplot": "^6.2", "davefx/phplot": "^6.2",
"jasig/phpcas": "^1.3", "jasig/phpcas": "^1.3",
"phpxmlrpc/phpxmlrpc": "^4.4", "phpxmlrpc/phpxmlrpc": "^4.4",
"gossi/docblock": "^1.6",
"phpxmlrpc/extras": "^0.6.2", "phpxmlrpc/extras": "^0.6.2",
"algo26-matthias/idna-convert": "^3.0", "algo26-matthias/idna-convert": "^3.0",
"caxy/php-htmldiff": "^0.1.9", "caxy/php-htmldiff": "^0.1.9",
...@@ -59,7 +58,8 @@ ...@@ -59,7 +58,8 @@
"symfony/polyfill-php73": "^1.27", "symfony/polyfill-php73": "^1.27",
"symfony/polyfill-php74": "^1.27", "symfony/polyfill-php74": "^1.27",
"symfony/polyfill-php80": "^1.27", "symfony/polyfill-php80": "^1.27",
"symfony/polyfill-php81": "^1.27" "symfony/polyfill-php81": "^1.27",
"phpowermove/docblock": "^2.0"
}, },
"replace": { "replace": {
"symfony/polyfill-php54": "*", "symfony/polyfill-php54": "*",
......
composer.lock
+ 81
− 82
View file @ eb453097
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "d67f415c948520b9630c33c48bc3c668", "content-hash": "b208b63a6fc53d453c263420fa7350da",
"packages": [ "packages": [
{ {
"name": "algo26-matthias/idna-convert", "name": "algo26-matthias/idna-convert",
...@@ -411,57 +411,6 @@ ...@@ -411,57 +411,6 @@
}, },
"time": "2020-11-24T22:02:12+00:00" "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", "name": "guzzlehttp/psr7",
"version": "2.4.4", "version": "2.4.4",
...@@ -1745,30 +1694,26 @@ ...@@ -1745,30 +1694,26 @@
}, },
{ {
"name": "phootwork/collection", "name": "phootwork/collection",
"version": "v1.6.1", "version": "v2.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phootwork/collection.git", "url": "https://github.com/phootwork/collection.git",
"reference": "87def4453e84b98ce516d647bf23e4c497d4b95c" "reference": "d58a0d7186074b601b016b9878b6fb65f6c23648"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phootwork/collection/zipball/87def4453e84b98ce516d647bf23e4c497d4b95c", "url": "https://api.github.com/repos/phootwork/collection/zipball/d58a0d7186074b601b016b9878b6fb65f6c23648",
"reference": "87def4453e84b98ce516d647bf23e4c497d4b95c", "reference": "d58a0d7186074b601b016b9878b6fb65f6c23648",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"phootwork/lang": "~0", "phootwork/lang": "^2.0",
"php": ">=5.6" "php": ">=7.2"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"sami/sami": "^4|^3"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"phootwork\\collection\\": "src" "phootwork\\collection\\": ""
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -1781,48 +1726,49 @@ ...@@ -1781,48 +1726,49 @@
"homepage": "http://gos.si" "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": [ "keywords": [
"Array object",
"Text object",
"collection", "collection",
"collections", "collections",
"json",
"list", "list",
"map", "map",
"queue", "queue",
"set", "set",
"stack" "stack",
"xml"
], ],
"support": { "support": {
"issues": "https://github.com/phootwork/collection/issues", "issues": "https://github.com/phootwork/phootwork/issues",
"source": "https://github.com/phootwork/collection/tree/master" "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", "name": "phootwork/lang",
"version": "v0.9", "version": "v2.1.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phootwork/lang.git", "url": "https://github.com/phootwork/lang.git",
"reference": "752482b0c8f60d005414b0cb81646f72bf929724" "reference": "77402690535452da745cf11df33adc51a4ad89a1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phootwork/lang/zipball/752482b0c8f60d005414b0cb81646f72bf929724", "url": "https://api.github.com/repos/phootwork/lang/zipball/77402690535452da745cf11df33adc51a4ad89a1",
"reference": "752482b0c8f60d005414b0cb81646f72bf929724", "reference": "77402690535452da745cf11df33adc51a4ad89a1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.6", "php": ">=7.2",
"symfony/polyfill-mbstring": "~1.8" "symfony/polyfill-mbstring": "^1.12"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"sami/sami": "^4.1.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"phootwork\\lang\\": "src" "phootwork\\lang\\": ""
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -1836,6 +1782,7 @@ ...@@ -1836,6 +1782,7 @@
} }
], ],
"description": "Missing PHP language constructs", "description": "Missing PHP language constructs",
"homepage": "https://phootwork.github.io/lang/",
"keywords": [ "keywords": [
"array", "array",
"comparator", "comparator",
...@@ -1843,10 +1790,10 @@ ...@@ -1843,10 +1790,10 @@
"string" "string"
], ],
"support": { "support": {
"issues": "https://github.com/phootwork/lang/issues", "issues": "https://github.com/phootwork/phootwork/issues",
"source": "https://github.com/phootwork/lang/tree/master" "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", "name": "php-di/invoker",
...@@ -2013,6 +1960,58 @@ ...@@ -2013,6 +1960,58 @@
}, },
"time": "2020-10-12T12:39:22+00:00" "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", "name": "phpseclib/phpseclib",
"version": "3.0.19", "version": "3.0.19",
......
lib/classes/restapi/RouteMap.php
+ 3
− 3
View file @ eb453097
...@@ -977,9 +977,9 @@ abstract class RouteMap ...@@ -977,9 +977,9 @@ abstract class RouteMap
} }
// Iterate through all methods of the routemap // Iterate through all methods of the routemap
foreach ($ref->getMethods() as $ref_method) { foreach ($ref->getMethods( \ReflectionMethod::IS_PUBLIC) as $ref_method) {
// Not public? Not an api route! // No docblock? Not an api route!
if (!$ref_method->isPublic()) { if (!$ref_method->getDocComment()) {
continue; continue;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment