Skip to content

Commit

Permalink
[105] Set pimple to use 3.3
Browse files Browse the repository at this point in the history
PHP 7.3 support with pimple in consideration
  • Loading branch information
Ankit Gade committed Jun 21, 2022
1 parent 26d1b7e commit b223ad4
Show file tree
Hide file tree
Showing 20 changed files with 73 additions and 149 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prefer-stable": true,
"require": {
"php": ">=7.1",
"pimple/pimple": "3.*"
"pimple/pimple": "3.3.*"
},
"require-dev": {
"squizlabs/php_codesniffer": "^3.7.1",
Expand Down
33 changes: 14 additions & 19 deletions composer.lock

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

2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit06059ca6a452e4ebbbb3bb459266ef74::getLoader();
return ComposerAutoloaderInit414112f68a04b4d078687d18b2bb675e::getLoader();
8 changes: 4 additions & 4 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit06059ca6a452e4ebbbb3bb459266ef74
class ComposerAutoloaderInit414112f68a04b4d078687d18b2bb675e
{
private static $loader;

Expand All @@ -22,15 +22,15 @@ public static function getLoader()
return self::$loader;
}

spl_autoload_register(array('ComposerAutoloaderInit06059ca6a452e4ebbbb3bb459266ef74', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit414112f68a04b4d078687d18b2bb675e', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit06059ca6a452e4ebbbb3bb459266ef74', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit414112f68a04b4d078687d18b2bb675e', 'loadClassLoader'));

$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';

call_user_func(\Composer\Autoload\ComposerStaticInit06059ca6a452e4ebbbb3bb459266ef74::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit414112f68a04b4d078687d18b2bb675e::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

class ComposerStaticInit06059ca6a452e4ebbbb3bb459266ef74
class ComposerStaticInit414112f68a04b4d078687d18b2bb675e
{
public static $prefixLengthsPsr4 = array (
'R' =>
Expand Down Expand Up @@ -41,9 +41,9 @@ class ComposerStaticInit06059ca6a452e4ebbbb3bb459266ef74
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit06059ca6a452e4ebbbb3bb459266ef74::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit06059ca6a452e4ebbbb3bb459266ef74::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit06059ca6a452e4ebbbb3bb459266ef74::$prefixesPsr0;
$loader->prefixLengthsPsr4 = ComposerStaticInit414112f68a04b4d078687d18b2bb675e::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit414112f68a04b4d078687d18b2bb675e::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit414112f68a04b4d078687d18b2bb675e::$prefixesPsr0;

}, null, ClassLoader::class);
}
Expand Down
35 changes: 15 additions & 20 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
[
{
"name": "pimple/pimple",
"version": "v3.5.0",
"version_normalized": "3.5.0.0",
"version": "v3.3.1",
"version_normalized": "3.3.1.0",
"source": {
"type": "git",
"url": "https://github.com/silexphp/Pimple.git",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed"
"reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed",
"url": "https://api.github.com/repos/silexphp/Pimple/zipball/21e45061c3429b1e06233475cc0e1f6fc774d5b0",
"reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1 || ^2.0"
"psr/container": "^1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^5.4@dev"
"symfony/phpunit-bridge": "^5.0"
},
"time": "2021-10-28T11:13:42+00:00",
"time": "2020-11-24T20:35:42+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev"
"dev-master": "3.3.x-dev"
}
},
"installation-source": "dist",
Expand Down Expand Up @@ -53,29 +53,24 @@
},
{
"name": "psr/container",
"version": "2.0.2",
"version_normalized": "2.0.2.0",
"version": "1.1.2",
"version_normalized": "1.1.2.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
"reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
"shasum": ""
},
"require": {
"php": ">=7.4.0"
},
"time": "2021-11-05T16:47:00+00:00",
"time": "2021-11-05T16:50:12+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
Expand Down
47 changes: 0 additions & 47 deletions vendor/pimple/pimple/.github/workflows/tests.yml

This file was deleted.

1 change: 0 additions & 1 deletion vendor/pimple/pimple/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
phpunit.xml
.phpunit.result.cache
composer.lock
/vendor/
18 changes: 18 additions & 0 deletions vendor/pimple/pimple/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: php

env:
global:
- REPORT_EXIT_STATUS=1

php:
- 7.2
- 7.3
- 7.4
- nightly

before_script:
- composer self-update
- COMPOSER_ROOT_VERSION=dev-master composer install

script:
- ./vendor/bin/simple-phpunit
8 changes: 0 additions & 8 deletions vendor/pimple/pimple/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
* 3.4.0 (2021-03-06)

* Implement version 1.1 of PSR-11

* 3.3.1 (2020-11-24)

* Add support for PHP 8

* 3.3.0 (2020-03-03)

* Drop PHP extension
Expand Down
4 changes: 2 additions & 2 deletions vendor/pimple/pimple/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Pimple

Pimple is now closed for changes. No new features will be added and no
cosmetic changes will be accepted either. The only accepted changes are
compatibility with newer PHP versions and security issue fixes.
compatiblity with newer PHP versions and security issue fixes.

.. caution::

Expand Down Expand Up @@ -308,7 +308,7 @@ when iterated over:
public function canAccess($resource)
{
foreach ($this->voters as $voter) {
if (true === $voter->canAccess($resource)) {
if (true === $voter->canAccess($resource) {
return true;
}
}
Expand Down
6 changes: 3 additions & 3 deletions vendor/pimple/pimple/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
],
"require": {
"php": ">=7.2.5",
"psr/container": "^1.1 || ^2.0"
"psr/container": "^1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^5.4@dev"
"symfony/phpunit-bridge": "^5.0"
},
"autoload": {
"psr-0": { "Pimple": "src/" }
},
"extra": {
"branch-alias": {
"dev-master": "3.4.x-dev"
"dev-master": "3.3.x-dev"
}
}
}
Loading

0 comments on commit b223ad4

Please sign in to comment.