Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump pimple/pimple from 3.2.3 to 3.3.1 #584

Merged
merged 1 commit into from
Jan 3, 2021
Merged

Bump pimple/pimple from 3.2.3 to 3.3.1 #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
23 changes: 13 additions & 10 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions composer/InstalledVersions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60',
'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -284,7 +284,7 @@ class InstalledVersions
'aliases' =>
array (
),
'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60',
'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3',
),
'nextcloud/lognormalizer' =>
array (
Expand Down Expand Up @@ -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 (
Expand Down
23 changes: 13 additions & 10 deletions composer/installed.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
},
{
Expand Down
10 changes: 5 additions & 5 deletions composer/installed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'aliases' =>
array (
),
'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60',
'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3',
'name' => 'nextcloud/3rdparty',
),
'versions' =>
Expand Down Expand Up @@ -261,7 +261,7 @@
'aliases' =>
array (
),
'reference' => '3ef1e39eacdf85047a98074a26bea1373366dd60',
'reference' => '67f8231b05ee94be64e6449fbde4ab36a00c57b3',
),
'nextcloud/lognormalizer' =>
array (
Expand Down Expand Up @@ -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 (
Expand Down
18 changes: 9 additions & 9 deletions pimple/pimple/src/Pimple/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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();
Expand Down Expand Up @@ -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.');
}

Expand All @@ -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.');
}

Expand Down Expand Up @@ -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')) {
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down