From ad30b123b004d60584bcf9d2ec4d18592d38a814 Mon Sep 17 00:00:00 2001
From: Brian Weaver <weaver.299@osu.edu>
Date: Thu, 4 Mar 2021 11:12:32 -0500
Subject: [PATCH] Update league/container
---
composer.lock | 34 +++++++---
vendor/composer/InstalledVersions.php | 14 ++---
vendor/composer/installed.json | 28 ++++++---
vendor/composer/installed.php | 14 ++---
vendor/league/container/.github/FUNDING.yml | 3 +
.../.github/workflows/test-php7plus.yml | 47 ++++++++++++++
.../container/.github/workflows/test.yml | 63 +++++++++++++++++++
vendor/league/container/CHANGELOG.md | 16 ++++-
vendor/league/container/README.md | 21 ++++---
vendor/league/container/composer.json | 6 +-
vendor/league/container/phpcs.xml | 16 +++++
vendor/league/container/phpstan.neon | 4 ++
vendor/league/container/phpunit.xml | 29 +++++++++
vendor/league/container/src/Container.php | 7 +--
.../AbstractSignatureServiceProvider.php | 4 +-
15 files changed, 256 insertions(+), 50 deletions(-)
create mode 100644 vendor/league/container/.github/FUNDING.yml
create mode 100644 vendor/league/container/.github/workflows/test-php7plus.yml
create mode 100644 vendor/league/container/.github/workflows/test.yml
create mode 100644 vendor/league/container/phpcs.xml
create mode 100644 vendor/league/container/phpstan.neon
create mode 100644 vendor/league/container/phpunit.xml
diff --git a/composer.lock b/composer.lock
index dba30665d7..a6b3c531f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1296,6 +1296,10 @@
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
+ "support": {
+ "issues": "https://github.com/container-interop/container-interop/issues",
+ "source": "https://github.com/container-interop/container-interop/tree/master"
+ },
"abandoned": "psr/container",
"time": "2017-02-14T19:40:03+00:00"
},
@@ -10149,21 +10153,21 @@
},
{
"name": "league/container",
- "version": "2.4.1",
+ "version": "2.5.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/container.git",
- "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
+ "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
- "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
+ "url": "https://api.github.com/repos/thephpleague/container/zipball/8438dc47a0674e3378bcce893a0a04d79a2c22b3",
+ "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3",
"shasum": ""
},
"require": {
"container-interop/container-interop": "^1.2",
- "php": "^5.4.0 || ^7.0"
+ "php": "^5.4 || ^7.0 || ^8.0"
},
"provide": {
"container-interop/container-interop-implementation": "^1.2",
@@ -10173,7 +10177,9 @@
"orno/di": "~2.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^4.8.36",
+ "scrutinizer/ocular": "^1.3",
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
@@ -10210,7 +10216,17 @@
"provider",
"service"
],
- "time": "2017-05-10T09:20:27+00:00"
+ "support": {
+ "issues": "https://github.com/thephpleague/container/issues",
+ "source": "https://github.com/thephpleague/container/tree/2.5.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/philipobenito",
+ "type": "github"
+ }
+ ],
+ "time": "2021-02-22T09:20:06+00:00"
},
{
"name": "masterminds/html5",
@@ -10949,6 +10965,10 @@
"container-interop",
"psr"
],
+ "support": {
+ "issues": "https://github.com/php-fig/container/issues",
+ "source": "https://github.com/php-fig/container/tree/master"
+ },
"time": "2017-02-14T16:28:37+00:00"
},
{
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index aca48685d0..f4e0b6a7b6 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -19,7 +19,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => 'dfa4a11b4b67a18669c3ff0592a82f0e228ca102',
+ 'reference' => '7786675dcbfe9236d04500de03aef3647a1d9c64',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -2318,12 +2318,12 @@ class InstalledVersions
),
'league/container' =>
array (
- 'pretty_version' => '2.4.1',
- 'version' => '2.4.1.0',
+ 'pretty_version' => '2.5.0',
+ 'version' => '2.5.0.0',
'aliases' =>
array (
),
- 'reference' => '43f35abd03a12977a60ffd7095efd6a7808488c0',
+ 'reference' => '8438dc47a0674e3378bcce893a0a04d79a2c22b3',
),
'masterminds/html5' =>
array (
@@ -2384,7 +2384,7 @@ class InstalledVersions
'aliases' =>
array (
),
- 'reference' => 'dfa4a11b4b67a18669c3ff0592a82f0e228ca102',
+ 'reference' => '7786675dcbfe9236d04500de03aef3647a1d9c64',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2471,8 +2471,8 @@ class InstalledVersions
array (
'provided' =>
array (
- 0 => '^1.0',
- 1 => '1.0',
+ 0 => '1.0',
+ 1 => '^1.0',
),
),
'psr/http-message' =>
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 642a0ff25c..fd560a4712 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -10637,22 +10637,22 @@
},
{
"name": "league/container",
- "version": "2.4.1",
- "version_normalized": "2.4.1.0",
+ "version": "2.5.0",
+ "version_normalized": "2.5.0.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/container.git",
- "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0"
+ "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0",
- "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0",
+ "url": "https://api.github.com/repos/thephpleague/container/zipball/8438dc47a0674e3378bcce893a0a04d79a2c22b3",
+ "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3",
"shasum": ""
},
"require": {
"container-interop/container-interop": "^1.2",
- "php": "^5.4.0 || ^7.0"
+ "php": "^5.4 || ^7.0 || ^8.0"
},
"provide": {
"container-interop/container-interop-implementation": "^1.2",
@@ -10662,9 +10662,11 @@
"orno/di": "~2.0"
},
"require-dev": {
- "phpunit/phpunit": "4.*"
+ "phpunit/phpunit": "^4.8.36",
+ "scrutinizer/ocular": "^1.3",
+ "squizlabs/php_codesniffer": "^3.5"
},
- "time": "2017-05-10T09:20:27+00:00",
+ "time": "2021-02-22T09:20:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -10701,6 +10703,16 @@
"provider",
"service"
],
+ "support": {
+ "issues": "https://github.com/thephpleague/container/issues",
+ "source": "https://github.com/thephpleague/container/tree/2.5.0"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/philipobenito",
+ "type": "github"
+ }
+ ],
"install-path": "../league/container"
},
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 278ad0a9c7..c8d609b26b 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => 'dfa4a11b4b67a18669c3ff0592a82f0e228ca102',
+ 'reference' => '7786675dcbfe9236d04500de03aef3647a1d9c64',
'name' => 'osu-asc-webservices/d8-upstream',
),
'versions' =>
@@ -2305,12 +2305,12 @@
),
'league/container' =>
array (
- 'pretty_version' => '2.4.1',
- 'version' => '2.4.1.0',
+ 'pretty_version' => '2.5.0',
+ 'version' => '2.5.0.0',
'aliases' =>
array (
),
- 'reference' => '43f35abd03a12977a60ffd7095efd6a7808488c0',
+ 'reference' => '8438dc47a0674e3378bcce893a0a04d79a2c22b3',
),
'masterminds/html5' =>
array (
@@ -2371,7 +2371,7 @@
'aliases' =>
array (
),
- 'reference' => 'dfa4a11b4b67a18669c3ff0592a82f0e228ca102',
+ 'reference' => '7786675dcbfe9236d04500de03aef3647a1d9c64',
),
'pantheon-systems/quicksilver-pushback' =>
array (
@@ -2458,8 +2458,8 @@
array (
'provided' =>
array (
- 0 => '^1.0',
- 1 => '1.0',
+ 0 => '1.0',
+ 1 => '^1.0',
),
),
'psr/http-message' =>
diff --git a/vendor/league/container/.github/FUNDING.yml b/vendor/league/container/.github/FUNDING.yml
new file mode 100644
index 0000000000..9b34632076
--- /dev/null
+++ b/vendor/league/container/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [philipobenito]
diff --git a/vendor/league/container/.github/workflows/test-php7plus.yml b/vendor/league/container/.github/workflows/test-php7plus.yml
new file mode 100644
index 0000000000..34571a9d7a
--- /dev/null
+++ b/vendor/league/container/.github/workflows/test-php7plus.yml
@@ -0,0 +1,47 @@
+name: Tests (PHP7+)
+
+on:
+ push: ~
+ pull_request: ~
+
+jobs:
+ phpcs:
+ name: PHPCS
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: shivammathur/setup-php@v2
+ with:
+ php-version: 7.0
+ extensions: curl, mbstring
+ coverage: none
+ tools: composer:v2, cs2pr
+
+ - run: composer update --no-progress
+ - run: vendor/bin/phpcs -q --report=checkstyle | cs2pr
+
+ phpunit:
+ name: PHPUnit on ${{ matrix.php }} ${{ matrix.composer-flags }}
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ php: ['7.0', '7.1', '7.2', '7.3', '7.4']
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php }}
+ extensions: curl, mbstring
+ coverage: pcov
+ tools: composer:v2
+
+ - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+ - run: composer update --no-progress ${{ matrix.composer-flags }}
+
+ - run: vendor/bin/phpunit --no-coverage
+ if: ${{ !matrix.coverage }}
diff --git a/vendor/league/container/.github/workflows/test.yml b/vendor/league/container/.github/workflows/test.yml
new file mode 100644
index 0000000000..07a24d0542
--- /dev/null
+++ b/vendor/league/container/.github/workflows/test.yml
@@ -0,0 +1,63 @@
+name: Tests
+
+on:
+ push: ~
+ pull_request: ~
+
+jobs:
+ phpcs:
+ name: PHPCS
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: shivammathur/setup-php@v2
+ with:
+ php-version: 5.4
+ extensions: curl, mbstring
+ coverage: none
+ tools: composer:v2, cs2pr
+
+ - run: composer update --no-progress
+ - run: vendor/bin/phpcs -q --report=checkstyle | cs2pr
+
+ phpunit:
+ name: PHPUnit on ${{ matrix.php }} ${{ matrix.composer-flags }}
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ php: ['5.4', '5.5', '5.6']
+ coverage: [true]
+ composer-flags: ['']
+ include:
+ - php: '5.4'
+ coverage: false
+ composer-flags: '--prefer-lowest'
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php }}
+ extensions: curl, mbstring
+ coverage: pcov
+ tools: composer:v2
+
+ - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+ - name: "Use PHPUnit 5.0+ on PHP 5.6"
+ run: composer require --no-update --dev phpunit/phpunit:^5.0
+ if: "matrix.php == '5.6'"
+
+ - run: composer update --no-progress ${{ matrix.composer-flags }}
+
+ - run: vendor/bin/phpunit --no-coverage
+ if: ${{ !matrix.coverage }}
+
+ - run: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+ if: ${{ matrix.coverage }}
+
+ - run: php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
+ if: ${{ matrix.coverage }}
diff --git a/vendor/league/container/CHANGELOG.md b/vendor/league/container/CHANGELOG.md
index 6e99c73822..06bb9776f7 100644
--- a/vendor/league/container/CHANGELOG.md
+++ b/vendor/league/container/CHANGELOG.md
@@ -2,10 +2,17 @@
All Notable changes to `League\Container` will be documented in this file
-## 2.3.0
+## 2.5.0
### Added
-- Now implementation of the PSR-11.
+- Support for PHP 7.1+ and 8.0
+
+## 2.4.1
+
+### Fixed
+- Ensures `ReflectionContainer` converts class name in array callable to object.
+
+## 2.4.0
### Changed
- Can now wrap shared objects as `RawArgument`.
@@ -17,6 +24,11 @@ All Notable changes to `League\Container` will be documented in this file
- Unused imports removed.
- Unreachable arguments no longer passed.
+## 2.3.0
+
+### Added
+- Now implementation of the PSR-11.
+
## 2.2.0
### Changed
diff --git a/vendor/league/container/README.md b/vendor/league/container/README.md
index 3a2e895984..92177c79fb 100644
--- a/vendor/league/container/README.md
+++ b/vendor/league/container/README.md
@@ -1,14 +1,12 @@
# Container (Dependency Injection)
-[](https://twitter.com/philipobenito)
-[](https://github.com/thephpleague/container/releases)
-[](LICENSE.md)
-[](https://travis-ci.org/thephpleague/container)
-[](https://scrutinizer-ci.com/g/thephpleague/container/code-structure)
-[](https://scrutinizer-ci.com/g/thephpleague/container)
-[](https://packagist.org/packages/league/container)
-
-[](https://insight.sensiolabs.com/projects/ad6b4c3e-8f93-4968-8dd3-391d39a4c3c2)
+[](https://twitter.com/philipobenito)
+[](https://github.com/thephpleague/container/releases)
+[](LICENSE.md)
+[](https://github.com/thephpleague/container/actions)
+[](https://scrutinizer-ci.com/g/thephpleague/container/code-structure)
+[](https://scrutinizer-ci.com/g/thephpleague/container)
+[](https://packagist.org/packages/league/container)
This package is compliant with [PSR-1], [PSR-2] and [PSR-4]. If you notice compliance oversights,
please send a patch via pull request.
@@ -35,7 +33,10 @@ The following versions of PHP are supported by this version.
* PHP 5.6
* PHP 7.0
* PHP 7.1
-* HHVM
+* PHP 7.2
+* PHP 7.3
+* PHP 7.4
+* PHP 8.0 (Note: not included in build process, but can be installed, just be sure to test your application thoroughly)
## Documentation
diff --git a/vendor/league/container/composer.json b/vendor/league/container/composer.json
index 8ce66c3401..b5aef0bea1 100644
--- a/vendor/league/container/composer.json
+++ b/vendor/league/container/composer.json
@@ -21,11 +21,13 @@
}
],
"require": {
- "php": "^5.4.0 || ^7.0",
+ "php": "^5.4 || ^7.0 || ^8.0",
"container-interop/container-interop": "^1.2"
},
"require-dev": {
- "phpunit/phpunit" : "4.*"
+ "phpunit/phpunit" : "^4.8.36",
+ "scrutinizer/ocular": "^1.3",
+ "squizlabs/php_codesniffer": "^3.5"
},
"provide": {
"container-interop/container-interop-implementation": "^1.2",
diff --git a/vendor/league/container/phpcs.xml b/vendor/league/container/phpcs.xml
new file mode 100644
index 0000000000..fbc7212fc7
--- /dev/null
+++ b/vendor/league/container/phpcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset>
+ <arg name="basepath" value="."/>
+ <arg name="extensions" value="php"/>
+ <arg name="parallel" value="80"/>
+ <arg name="cache" value=".phpcs-cache"/>
+ <arg name="colors"/>
+
+ <!-- Ignore warnings, show progress of the run and show sniff names -->
+ <arg value="nps"/>
+
+ <!-- Directories to be checked -->
+ <file>src</file>
+
+ <rule ref="PSR2"/>
+</ruleset>
diff --git a/vendor/league/container/phpstan.neon b/vendor/league/container/phpstan.neon
new file mode 100644
index 0000000000..a8efac9879
--- /dev/null
+++ b/vendor/league/container/phpstan.neon
@@ -0,0 +1,4 @@
+parameters:
+ level: 4
+ paths:
+ - src
diff --git a/vendor/league/container/phpunit.xml b/vendor/league/container/phpunit.xml
new file mode 100644
index 0000000000..ef10f744dc
--- /dev/null
+++ b/vendor/league/container/phpunit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+ backupGlobals="false"
+ backupStaticAttributes="false"
+ colors="true"
+ verbose="true"
+ convertErrorsToExceptions="true"
+ convertNoticesToExceptions="true"
+ convertWarningsToExceptions="true"
+ processIsolation="false"
+ stopOnFailure="false">
+ <testsuites>
+ <testsuite name="League Test Suite">
+ <directory>tests</directory>
+ </testsuite>
+ </testsuites>
+ <filter>
+ <whitelist>
+ <directory suffix=".php">src/</directory>
+ </whitelist>
+ </filter>
+ <logging>
+ <log type="tap" target="build/report.tap"/>
+ <log type="junit" target="build/report.junit.xml"/>
+ <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+ <log type="coverage-text" target="build/coverage.txt"/>
+ <log type="coverage-clover" target="build/logs/clover.xml"/>
+ </logging>
+</phpunit>
diff --git a/vendor/league/container/src/Container.php b/vendor/league/container/src/Container.php
index 80a0537dc7..7111d3de15 100644
--- a/vendor/league/container/src/Container.php
+++ b/vendor/league/container/src/Container.php
@@ -58,9 +58,9 @@ class Container implements ContainerInterface
* @param \League\Container\Definition\DefinitionFactoryInterface|null $definitionFactory
*/
public function __construct(
- ServiceProviderAggregateInterface $providers = null,
- InflectorAggregateInterface $inflectors = null,
- DefinitionFactoryInterface $definitionFactory = null
+ ServiceProviderAggregateInterface $providers = null,
+ InflectorAggregateInterface $inflectors = null,
+ DefinitionFactoryInterface $definitionFactory = null
) {
// set required dependencies
$this->providers = (is_null($providers))
@@ -266,7 +266,6 @@ protected function getFromDelegate($alias, array $args = [])
throw new NotFoundException(
sprintf('Alias (%s) is not being managed by the container', $alias)
);
-
}
/**
diff --git a/vendor/league/container/src/ServiceProvider/AbstractSignatureServiceProvider.php b/vendor/league/container/src/ServiceProvider/AbstractSignatureServiceProvider.php
index 9e36b55332..04dcbe181e 100644
--- a/vendor/league/container/src/ServiceProvider/AbstractSignatureServiceProvider.php
+++ b/vendor/league/container/src/ServiceProvider/AbstractSignatureServiceProvider.php
@@ -2,9 +2,7 @@
namespace League\Container\ServiceProvider;
-abstract class AbstractSignatureServiceProvider
- extends AbstractServiceProvider
- implements SignatureServiceProviderInterface
+abstract class AbstractSignatureServiceProvider extends AbstractServiceProvider implements SignatureServiceProviderInterface // @codingStandardsIgnoreLine
{
/**
* @var string
--
GitLab