aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2024-05-15 19:05:34 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2024-05-15 19:05:34 +0000
commiteb4f3bba75580ee1bd04e2b6677028ff28e6a1af (patch)
tree07e38dae707fc93beab86a778b9827b649143f56
parentc1d113ce8d0b091bae552ee068e42b85569fc995 (diff)
update php-di/php-di to 7.0.6, fixes #4153
Closes #4153 Merge request studip/studip!2993
-rw-r--r--composer.json2
-rw-r--r--composer.lock252
-rw-r--r--lib/classes/DIContainer.php1
3 files changed, 127 insertions, 128 deletions
diff --git a/composer.json b/composer.json
index 7e37ca3..361149d 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
"opis/json-schema": "^1.0",
"slim/psr7": "1.6.1",
"slim/slim": "4.13.0",
- "php-di/php-di": "^6.3.4",
+ "php-di/php-di": "7.0.0",
"symfony/console": "^5.3.16",
"symfony/process": "^5.4",
"jumbojett/openid-connect-php": "^0.9.2",
diff --git a/composer.lock b/composer.lock
index 932b852..bc0d599 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": "f4d658d79c623c432e65c2f2d1adac5b",
+ "content-hash": "f50f62060597f2d86eb61fc8af9cf333",
"packages": [
{
"name": "algo26-matthias/idna-convert",
@@ -741,6 +741,116 @@
"time": "2022-11-12T10:09:40+00:00"
},
{
+ "name": "kub-at/php-simple-html-dom-parser",
+ "version": "1.9.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Kub-AT/php-simple-html-dom-parser.git",
+ "reference": "ff22f98bfd9235115c128059076f3eb740d66913"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Kub-AT/php-simple-html-dom-parser/zipball/ff22f98bfd9235115c128059076f3eb740d66913",
+ "reference": "ff22f98bfd9235115c128059076f3eb740d66913",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.2"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-0": {
+ "KubAT\\PhpSimple\\HtmlDomParser": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "S.C. Chen",
+ "email": "me578022@gmail.com"
+ },
+ {
+ "name": "Jakub Stawowy",
+ "email": "Kub-AT@users.noreply.github.com"
+ }
+ ],
+ "description": "PHP Simple HTML DOM Parser with namespace and PHP 7.3 compatible",
+ "homepage": "http://simplehtmldom.sourceforge.net/",
+ "keywords": [
+ "Simple",
+ "dom",
+ "html"
+ ],
+ "support": {
+ "issues": "https://github.com/Kub-AT/php-simple-html-dom-parser/issues",
+ "source": "https://github.com/Kub-AT/php-simple-html-dom-parser/tree/master"
+ },
+ "time": "2019-10-25T12:34:43+00:00"
+ },
+ {
+ "name": "laravel/serializable-closure",
+ "version": "v1.3.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laravel/serializable-closure.git",
+ "reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
+ "reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.3|^8.0"
+ },
+ "require-dev": {
+ "nesbot/carbon": "^2.61",
+ "pestphp/pest": "^1.21.3",
+ "phpstan/phpstan": "^1.8.2",
+ "symfony/var-dumper": "^5.4.11"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\SerializableClosure\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ },
+ {
+ "name": "Nuno Maduro",
+ "email": "nuno@laravel.com"
+ }
+ ],
+ "description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.",
+ "keywords": [
+ "closure",
+ "laravel",
+ "serializable"
+ ],
+ "support": {
+ "issues": "https://github.com/laravel/serializable-closure/issues",
+ "source": "https://github.com/laravel/serializable-closure"
+ },
+ "time": "2023-11-08T14:08:06+00:00"
+ },
+ {
"name": "lcobucci/jwt",
"version": "5.2.0",
"source": {
@@ -1763,71 +1873,6 @@
"time": "2023-09-26T11:13:49+00:00"
},
{
- "name": "opis/closure",
- "version": "3.6.3",
- "source": {
- "type": "git",
- "url": "https://github.com/opis/closure.git",
- "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad",
- "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad",
- "shasum": ""
- },
- "require": {
- "php": "^5.4 || ^7.0 || ^8.0"
- },
- "require-dev": {
- "jeremeamia/superclosure": "^2.0",
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.6.x-dev"
- }
- },
- "autoload": {
- "files": [
- "functions.php"
- ],
- "psr-4": {
- "Opis\\Closure\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marius Sarca",
- "email": "marius.sarca@gmail.com"
- },
- {
- "name": "Sorin Sarca",
- "email": "sarca_sorin@hotmail.com"
- }
- ],
- "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.",
- "homepage": "https://opis.io/closure",
- "keywords": [
- "anonymous functions",
- "closure",
- "function",
- "serializable",
- "serialization",
- "serialize"
- ],
- "support": {
- "issues": "https://github.com/opis/closure/issues",
- "source": "https://github.com/opis/closure/tree/3.6.3"
- },
- "time": "2022-01-27T09:35:39+00:00"
- },
- {
"name": "opis/json-schema",
"version": "1.1.0",
"source": {
@@ -2163,39 +2208,36 @@
},
{
"name": "php-di/php-di",
- "version": "6.3.5",
+ "version": "7.0.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-DI/PHP-DI.git",
- "reference": "b8126d066ce144765300ee0ab040c1ed6c9ef588"
+ "reference": "f0ca9a0e0fb800974fcaf7b2f896ca1e840fd15b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/b8126d066ce144765300ee0ab040c1ed6c9ef588",
- "reference": "b8126d066ce144765300ee0ab040c1ed6c9ef588",
+ "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/f0ca9a0e0fb800974fcaf7b2f896ca1e840fd15b",
+ "reference": "f0ca9a0e0fb800974fcaf7b2f896ca1e840fd15b",
"shasum": ""
},
"require": {
- "opis/closure": "^3.5.5",
- "php": ">=7.2.0",
+ "laravel/serializable-closure": "^1.0",
+ "php": ">=8.0",
"php-di/invoker": "^2.0",
- "php-di/phpdoc-reader": "^2.0.1",
- "psr/container": "^1.0"
+ "psr/container": "^1.1 || ^2.0"
},
"provide": {
"psr/container-implementation": "^1.0"
},
"require-dev": {
- "doctrine/annotations": "~1.2",
- "friendsofphp/php-cs-fixer": "^2.4",
- "mnapoli/phpunit-easymock": "^1.2",
- "ocramius/proxy-manager": "^2.0.2",
- "phpstan/phpstan": "^0.12",
- "phpunit/phpunit": "^8.5|^9.0"
+ "friendsofphp/php-cs-fixer": "^3",
+ "mnapoli/phpunit-easymock": "^1.3",
+ "ocramius/proxy-manager": "^2.11.2",
+ "phpunit/phpunit": "^9.5",
+ "vimeo/psalm": "^4.6"
},
"suggest": {
- "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)",
- "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)"
+ "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ^2.3)"
},
"type": "library",
"autoload": {
@@ -2223,7 +2265,7 @@
],
"support": {
"issues": "https://github.com/PHP-DI/PHP-DI/issues",
- "source": "https://github.com/PHP-DI/PHP-DI/tree/6.3.5"
+ "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.0"
},
"funding": [
{
@@ -2235,49 +2277,7 @@
"type": "tidelift"
}
],
- "time": "2021-09-02T09:49:58+00:00"
- },
- {
- "name": "php-di/phpdoc-reader",
- "version": "2.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/PHP-DI/PhpDocReader.git",
- "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c",
- "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c",
- "shasum": ""
- },
- "require": {
- "php": ">=7.2.0"
- },
- "require-dev": {
- "mnapoli/hard-mode": "~0.3.0",
- "phpunit/phpunit": "^8.5|^9.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "PhpDocReader\\": "src/PhpDocReader"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
- "keywords": [
- "phpdoc",
- "reflection"
- ],
- "support": {
- "issues": "https://github.com/PHP-DI/PhpDocReader/issues",
- "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1"
- },
- "time": "2020-10-12T12:39:22+00:00"
+ "time": "2023-01-12T14:08:11+00:00"
},
{
"name": "phpoffice/phpspreadsheet",
diff --git a/lib/classes/DIContainer.php b/lib/classes/DIContainer.php
index 307ed4a..c3d9b82 100644
--- a/lib/classes/DIContainer.php
+++ b/lib/classes/DIContainer.php
@@ -52,7 +52,6 @@ class DIContainer
self::getCompilationClass()
);
}
- $builder->ignorePhpDocErrors(true);
$builder->addDefinitions('lib/bootstrap-definitions.php');
$jsonapiSettings = require 'lib/classes/JsonApi/settings.php';