From 7706577f9fa00ec76d3f3ee7a8808d2ec4678eee Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 29 Jan 2025 11:55:58 +0800 Subject: [PATCH] MDL-83401 core: Upgrade PHP-DI/Invoker to 2.3.6 --- lib/php-di/invoker/CONTRIBUTING.md | 15 --------------- lib/php-di/invoker/README.md | 1 + lib/php-di/invoker/composer.json | 5 +++++ lib/php-di/invoker/readme_moodle.txt | 4 +--- lib/thirdpartylibs.xml | 2 +- 5 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 lib/php-di/invoker/CONTRIBUTING.md diff --git a/lib/php-di/invoker/CONTRIBUTING.md b/lib/php-di/invoker/CONTRIBUTING.md deleted file mode 100644 index 852fd1aa3a1..00000000000 --- a/lib/php-di/invoker/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -# Contributing - -First of all, **thank you** for contributing! - -Here are a few rules to follow in order to ease code reviews and merging: - -- follow [PSR-1](http://www.php-fig.org/psr/1/) and [PSR-2](http://www.php-fig.org/psr/2/) -- run the test suite -- write (or update) unit tests when applicable -- write documentation for new features -- use [commit messages that make sense](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) - -One may ask you to [squash your commits](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html) too. This is used to "clean" your pull request before merging it (we don't want commits such as `fix tests`, `fix 2`, `fix 3`, etc.). - -When creating your pull request on GitHub, please write a description which gives the context and/or explains why you are creating it. diff --git a/lib/php-di/invoker/README.md b/lib/php-di/invoker/README.md index adf153cbaa5..88ef215aad0 100644 --- a/lib/php-di/invoker/README.md +++ b/lib/php-di/invoker/README.md @@ -231,3 +231,4 @@ $invoker->call('WelcomeController::home'); That feature can be used as the base building block for a framework's dispatcher. Again, any [PSR-11](https://www.php-fig.org/psr/psr-11/) compliant container can be provided. + diff --git a/lib/php-di/invoker/composer.json b/lib/php-di/invoker/composer.json index e78e406ca3f..55e6bcf3344 100644 --- a/lib/php-di/invoker/composer.json +++ b/lib/php-di/invoker/composer.json @@ -23,5 +23,10 @@ "phpunit/phpunit": "^9.0", "athletic/athletic": "~0.1.8", "mnapoli/hard-mode": "~0.3.0" + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/lib/php-di/invoker/readme_moodle.txt b/lib/php-di/invoker/readme_moodle.txt index b2d95cb0a70..61b7fed7650 100644 --- a/lib/php-di/invoker/readme_moodle.txt +++ b/lib/php-di/invoker/readme_moodle.txt @@ -1,3 +1 @@ -Please note that this library is required for use of PHP-DI. - -Please update it in accordance with PHP-DI and see lib/php-di/readme_moodle.md for more information. +See instructions in lib/php-di/readme_moodle.md diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml index 05c2a14197e..e6120f7f139 100644 --- a/lib/thirdpartylibs.xml +++ b/lib/thirdpartylibs.xml @@ -789,7 +789,7 @@ All rights reserved. php-di/invoker PHP DI Invoker - 2.3.4 + 2.3.6 MIT https://github.com/php-di/invoker