From 0efaab124bad7c5bbb2f0c4ad248e7e5459e847e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 2 Jan 2021 02:17:37 +0000 Subject: [PATCH] Bump pimple/pimple from 3.2.3 to 3.3.1 Bumps [pimple/pimple](https://github.com/silexphp/Pimple) from 3.2.3 to 3.3.1. - [Release notes](https://github.com/silexphp/Pimple/releases) - [Changelog](https://github.com/silexphp/Pimple/blob/master/CHANGELOG) - [Commits](https://github.com/silexphp/Pimple/compare/v3.2.3...v3.3.1) Signed-off-by: dependabot-preview[bot] Signed-off-by: Christoph Wurst --- composer.json | 2 +- composer.lock | 23 +++++++++++-------- composer/InstalledVersions.php | 10 ++++---- composer/installed.json | 23 +++++++++++-------- composer/installed.php | 10 ++++---- pimple/pimple/src/Pimple/Container.php | 18 +++++++-------- .../src/Pimple/Psr11/ServiceLocator.php | 2 +- 7 files changed, 47 insertions(+), 41 deletions(-) diff --git a/composer.json b/composer.json index 907743905..d3a7b61e1 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "pear/pear-core-minimal": "^v1.10", "phpseclib/phpseclib": "2.0.25", "php-opencloud/openstack": "3.0.7", - "pimple/pimple": "3.2.3", + "pimple/pimple": "3.3.1", "psr/container": "^1.0", "punic/punic": "^1.6", "sabre/dav": "^4.1.3", diff --git a/composer.lock b/composer.lock index d70b17a85..7892a1c2d 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": "debf706a7e288e46deee2d1645ffaffd", + "content-hash": "ba74a13f27a4395c5743da67c506f62a", "packages": [ { "name": "aws/aws-sdk-php", @@ -2694,29 +2694,29 @@ }, { "name": "pimple/pimple", - "version": "v3.2.3", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/21e45061c3429b1e06233475cc0e1f6fc774d5b0", + "reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=7.2.5", "psr/container": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.3.x-dev" } }, "autoload": { @@ -2735,12 +2735,15 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], - "time": "2018-01-21T07:42:36+00:00" + "support": { + "source": "https://github.com/silexphp/Pimple/tree/v3.3.1" + }, + "time": "2020-11-24T20:35:42+00:00" }, { "name": "psr/container", diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php index b10f0865d..ab0918cb5 100644 --- a/composer/InstalledVersions.php +++ b/composer/InstalledVersions.php @@ -29,7 +29,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60', + 'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3', 'name' => 'nextcloud/3rdparty', ), 'versions' => @@ -284,7 +284,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60', + 'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3', ), 'nextcloud/lognormalizer' => array ( @@ -446,12 +446,12 @@ class InstalledVersions ), 'pimple/pimple' => array ( - 'pretty_version' => 'v3.2.3', - 'version' => '3.2.3.0', + 'pretty_version' => 'v3.3.1', + 'version' => '3.3.1.0', 'aliases' => array ( ), - 'reference' => '9e403941ef9d65d20cba7d54e29fe906db42cf32', + 'reference' => '21e45061c3429b1e06233475cc0e1f6fc774d5b0', ), 'psr/container' => array ( diff --git a/composer/installed.json b/composer/installed.json index 901178f3b..e363a0cbb 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -2800,31 +2800,31 @@ }, { "name": "pimple/pimple", - "version": "v3.2.3", - "version_normalized": "3.2.3.0", + "version": "v3.3.1", + "version_normalized": "3.3.1.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/21e45061c3429b1e06233475cc0e1f6fc774d5b0", + "reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=7.2.5", "psr/container": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^5.0" }, - "time": "2018-01-21T07:42:36+00:00", + "time": "2020-11-24T20:35:42+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.3.x-dev" } }, "installation-source": "dist", @@ -2844,11 +2844,14 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], + "support": { + "source": "https://github.com/silexphp/Pimple/tree/v3.3.1" + }, "install-path": "../pimple/pimple" }, { diff --git a/composer/installed.php b/composer/installed.php index 6946820a2..0d727c705 100644 --- a/composer/installed.php +++ b/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60', + 'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3', 'name' => 'nextcloud/3rdparty', ), 'versions' => @@ -261,7 +261,7 @@ 'aliases' => array ( ), - 'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60', + 'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3', ), 'nextcloud/lognormalizer' => array ( @@ -423,12 +423,12 @@ ), 'pimple/pimple' => array ( - 'pretty_version' => 'v3.2.3', - 'version' => '3.2.3.0', + 'pretty_version' => 'v3.3.1', + 'version' => '3.3.1.0', 'aliases' => array ( ), - 'reference' => '9e403941ef9d65d20cba7d54e29fe906db42cf32', + 'reference' => '21e45061c3429b1e06233475cc0e1f6fc774d5b0', ), 'psr/container' => array ( diff --git a/pimple/pimple/src/Pimple/Container.php b/pimple/pimple/src/Pimple/Container.php index 707b92b82..715de10e3 100644 --- a/pimple/pimple/src/Pimple/Container.php +++ b/pimple/pimple/src/Pimple/Container.php @@ -38,12 +38,12 @@ */ class Container implements \ArrayAccess { - private $values = array(); + private $values = []; private $factories; private $protected; - private $frozen = array(); - private $raw = array(); - private $keys = array(); + private $frozen = []; + private $raw = []; + private $keys = []; /** * Instantiates the container. @@ -52,7 +52,7 @@ class Container implements \ArrayAccess * * @param array $values The parameters or objects */ - public function __construct(array $values = array()) + public function __construct(array $values = []) { $this->factories = new \SplObjectStorage(); $this->protected = new \SplObjectStorage(); @@ -162,7 +162,7 @@ public function offsetUnset($id) */ public function factory($callable) { - if (!\method_exists($callable, '__invoke')) { + if (!\is_object($callable) || !\method_exists($callable, '__invoke')) { throw new ExpectedInvokableException('Service definition is not a Closure or invokable object.'); } @@ -184,7 +184,7 @@ public function factory($callable) */ public function protect($callable) { - if (!\method_exists($callable, '__invoke')) { + if (!\is_object($callable) || !\method_exists($callable, '__invoke')) { throw new ExpectedInvokableException('Callable is not a Closure or invokable object.'); } @@ -246,7 +246,7 @@ public function extend($id, $callable) } if (isset($this->protected[$this->values[$id]])) { - @\trigger_error(\sprintf('How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "%s" should be protected?', $id), \E_USER_DEPRECATED); + @\trigger_error(\sprintf('How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "%s" should be protected?', $id), E_USER_DEPRECATED); } if (!\is_object($callable) || !\method_exists($callable, '__invoke')) { @@ -285,7 +285,7 @@ public function keys() * * @return static */ - public function register(ServiceProviderInterface $provider, array $values = array()) + public function register(ServiceProviderInterface $provider, array $values = []) { $provider->register($this); diff --git a/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php b/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php index 3361c6f19..f10727cca 100644 --- a/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php +++ b/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php @@ -38,7 +38,7 @@ class ServiceLocator implements ContainerInterface { private $container; - private $aliases = array(); + private $aliases = []; /** * @param PimpleContainer $container The Container instance used to locate services