From eb204573214bb2a06d28f824d9b12dd94489d1ce Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Mon, 17 Aug 2020 22:28:30 +0200
Subject: [PATCH] Raise PHP minimum to 7.4
---
.travis.yml | 33 +-
composer.json | 2 +-
composer.lock | 1624 +++++++++++------
lib/SimpleSAML/SessionHandlerPHP.php | 79 +-
lib/SimpleSAML/Utils/HTTP.php | 83 +-
modules/admin/lib/Controller/Config.php | 4 +-
modules/core/hooks/hook_sanitycheck.php | 2 +-
.../SimpleSAML/Metadata/SAMLBuilderTest.php | 4 +-
tests/lib/SimpleSAML/Utils/EMailTest.php | 8 +-
tests/lib/SimpleSAML/Utils/TimeTest.php | 2 +-
10 files changed, 1138 insertions(+), 703 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 02e1296c5..162c20ec1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,8 @@ stages:
################
php:
- - 7.2
- - 7.3
- 7.4
+ - nightly
env:
- COMMAND="composer install"
@@ -32,13 +31,13 @@ script:
jobs:
fast_finish: true
allow_failures:
- - php: 7.3
+ - php: 7.4
env: Psalm
- - php: 7.3
+ - php: 7.4
env: Security check (composer install)
- - php: 7.3
+ - php: 7.4
env: Security check (composer update)
- - php: 7.3
+ - php: 7.4
env: PHP Codesniffer
include:
@@ -48,15 +47,7 @@ jobs:
##########################
- stage: pre-conditions
- php: 7.2
- env: Syntax check PHP
- before_script:
- - composer install
- script:
- - vendor/bin/check-syntax-php.sh
-
- - stage: pre-conditions
- php: 7.3
+ php: 7.4
env: Syntax check PHP
before_script:
- composer install
@@ -64,7 +55,7 @@ jobs:
- vendor/bin/check-syntax-php.sh
- stage: pre-conditions
- php: 7.4
+ php: nightly
env: Syntax check PHP
before_script:
- composer install
@@ -86,7 +77,7 @@ jobs:
###################
- stage: quality
- php: 7.3
+ php: 7.4
env: Security check (composer install)
before_script:
- composer install
@@ -94,7 +85,7 @@ jobs:
- vendor/bin/security-checker security:check
- stage: quality
- php: 7.3
+ php: 7.4
env: Security check (composer update)
before_script:
- composer update
@@ -102,7 +93,7 @@ jobs:
- vendor/bin/security-checker security:check
- stage: quality
- php: 7.3
+ php: 7.4
env: Codecov
before_script:
- composer update
@@ -111,7 +102,7 @@ jobs:
- bash <(curl -s https://codecov.io/bash)
- stage: quality
- php: 7.3
+ php: 7.4
env: Psalm
before_script:
- composer update
@@ -120,7 +111,7 @@ jobs:
- vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
- stage: quality
- php: 7.3
+ php: 7.4
env: PHP Codesniffer
before_script:
- composer update
diff --git a/composer.json b/composer.json
index a9c31eff5..1d9b4206b 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"files": ["tests/_autoload_modules.php"]
},
"require": {
- "php": ">=7.2",
+ "php": ">=7.4 || ^8.0 ",
"ext-SPL": "*",
"ext-zlib": "*",
"ext-pcre": "*",
diff --git a/composer.lock b/composer.lock
index 29c71f428..053224f65 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": "8e0a88ac04beefe71fb19f5717f3df56",
+ "content-hash": "ca1ebe5e7725a433f94f8e02453c44c1",
"packages": [
{
"name": "gettext/gettext",
@@ -131,16 +131,16 @@
},
{
"name": "phpmailer/phpmailer",
- "version": "v6.1.6",
+ "version": "v6.1.7",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
- "reference": "c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3"
+ "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3",
- "reference": "c2796cb1cb99d7717290b48c4e6f32cb6c60b7b3",
+ "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
+ "reference": "2c2370ba3df7034f9eb7b8f387c97b52b2ba5ad0",
"shasum": ""
},
"require": {
@@ -195,7 +195,7 @@
"type": "github"
}
],
- "time": "2020-05-27T12:24:03+00:00"
+ "time": "2020-07-14T18:50:27+00:00"
},
{
"name": "psr/cache",
@@ -475,30 +475,30 @@
},
{
"name": "simplesamlphp/saml2",
- "version": "v4.1.7",
+ "version": "v4.1.8",
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/saml2.git",
- "reference": "62c7ab036c2db4c25bcab210d30343add0ae2c28"
+ "reference": "ab746b923c7637d2c81f8e54c94ebd62146c25a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/62c7ab036c2db4c25bcab210d30343add0ae2c28",
- "reference": "62c7ab036c2db4c25bcab210d30343add0ae2c28",
+ "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/ab746b923c7637d2c81f8e54c94ebd62146c25a3",
+ "reference": "ab746b923c7637d2c81f8e54c94ebd62146c25a3",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-openssl": "*",
"ext-zlib": "*",
- "php": ">=7.2",
+ "php": ">=7.1",
"psr/log": "~1.1",
- "robrichards/xmlseclibs": "^3.0.4",
+ "robrichards/xmlseclibs": "^3.1.0",
"webmozart/assert": "^1.5"
},
"require-dev": {
"mockery/mockery": "~1.2",
- "phpunit/phpunit": "^8.3",
+ "phpunit/phpunit": "^7.5",
"sebastian/phpcpd": "~4.1",
"sensiolabs/security-checker": "~6.0",
"simplesamlphp/simplesamlphp-test-framework": "~0.1.0",
@@ -526,7 +526,7 @@
}
],
"description": "SAML2 PHP library from SimpleSAMLphp",
- "time": "2020-03-21T19:43:09+00:00"
+ "time": "2020-07-31T12:37:57+00:00"
},
{
"name": "simplesamlphp/twig-configurable-i18n",
@@ -578,16 +578,16 @@
},
{
"name": "symfony/cache",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "787eb05e137ad74fa5e51857b9884719760c7b2f"
+ "reference": "a9ac09a5e9786b734a4baa98158c2cd3251f1e4c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/787eb05e137ad74fa5e51857b9884719760c7b2f",
- "reference": "787eb05e137ad74fa5e51857b9884719760c7b2f",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/a9ac09a5e9786b734a4baa98158c2cd3251f1e4c",
+ "reference": "a9ac09a5e9786b734a4baa98158c2cd3251f1e4c",
"shasum": ""
},
"require": {
@@ -668,20 +668,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-09T14:15:34+00:00"
+ "time": "2020-07-23T17:22:30+00:00"
},
{
"name": "symfony/cache-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache-contracts.git",
- "reference": "87c92f62c494626598e9148208aaa6d1716b8e3c"
+ "reference": "9771a09d2e6b84ecb8c9f0a7dbc72ee92aeba009"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/87c92f62c494626598e9148208aaa6d1716b8e3c",
- "reference": "87c92f62c494626598e9148208aaa6d1716b8e3c",
+ "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/9771a09d2e6b84ecb8c9f0a7dbc72ee92aeba009",
+ "reference": "9771a09d2e6b84ecb8c9f0a7dbc72ee92aeba009",
"shasum": ""
},
"require": {
@@ -695,6 +695,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -740,20 +744,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/config",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
+ "reference": "cf63f0613a6c6918e96db39c07a43b01e19a0773"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
- "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
+ "url": "https://api.github.com/repos/symfony/config/zipball/cf63f0613a6c6918e96db39c07a43b01e19a0773",
+ "reference": "cf63f0613a6c6918e96db39c07a43b01e19a0773",
"shasum": ""
},
"require": {
@@ -820,20 +824,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-23T13:08:13+00:00"
+ "time": "2020-07-15T10:53:22+00:00"
},
{
"name": "symfony/console",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "34ac555a3627e324b660e318daa07572e1140123"
+ "reference": "2226c68009627934b8cfc01260b4d287eab070df"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/34ac555a3627e324b660e318daa07572e1140123",
- "reference": "34ac555a3627e324b660e318daa07572e1140123",
+ "url": "https://api.github.com/repos/symfony/console/zipball/2226c68009627934b8cfc01260b4d287eab070df",
+ "reference": "2226c68009627934b8cfc01260b4d287eab070df",
"shasum": ""
},
"require": {
@@ -913,20 +917,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-15T12:59:21+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
+ "reference": "c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6508423eded583fc07e88a0172803e1a62f0310c",
- "reference": "6508423eded583fc07e88a0172803e1a62f0310c",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb",
+ "reference": "c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb",
"shasum": ""
},
"require": {
@@ -1002,20 +1006,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-12T08:11:32+00:00"
+ "time": "2020-07-23T08:36:24+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+ "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
- "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14",
+ "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14",
"shasum": ""
},
"require": {
@@ -1025,6 +1029,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -1062,20 +1070,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-27T08:34:37+00:00"
+ "time": "2020-06-06T08:49:21+00:00"
},
{
"name": "symfony/error-handler",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
- "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896"
+ "reference": "4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/error-handler/zipball/7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896",
- "reference": "7d0b927b9d3dc41d7d46cda38cbfcd20cdcbb896",
+ "url": "https://api.github.com/repos/symfony/error-handler/zipball/4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b",
+ "reference": "4a0d1673a4731c3cb2dea3580c73a676ecb9ed4b",
"shasum": ""
},
"require": {
@@ -1133,20 +1141,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-30T20:35:19+00:00"
+ "time": "2020-07-23T08:36:24+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7"
+ "reference": "7827d55911f91c070fc293ea51a06eec80797d76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7",
- "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7827d55911f91c070fc293ea51a06eec80797d76",
+ "reference": "7827d55911f91c070fc293ea51a06eec80797d76",
"shasum": ""
},
"require": {
@@ -1219,20 +1227,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-06-18T18:24:02+00:00"
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "405952c4e90941a17e52ef7489a2bd94870bb290"
+ "reference": "f6f613d74cfc5a623fc36294d3451eb7fa5a042b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/405952c4e90941a17e52ef7489a2bd94870bb290",
- "reference": "405952c4e90941a17e52ef7489a2bd94870bb290",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f6f613d74cfc5a623fc36294d3451eb7fa5a042b",
+ "reference": "f6f613d74cfc5a623fc36294d3451eb7fa5a042b",
"shasum": ""
},
"require": {
@@ -1246,6 +1254,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -1291,11 +1303,11 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -1359,7 +1371,7 @@
},
{
"name": "symfony/finder",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -1422,16 +1434,16 @@
},
{
"name": "symfony/framework-bundle",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/framework-bundle.git",
- "reference": "d9a85deaa9c7a10df087d86f6a689eb5d4db0abc"
+ "reference": "f9be9af9092f165b9b809d870289b57330301dc6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/d9a85deaa9c7a10df087d86f6a689eb5d4db0abc",
- "reference": "d9a85deaa9c7a10df087d86f6a689eb5d4db0abc",
+ "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/f9be9af9092f165b9b809d870289b57330301dc6",
+ "reference": "f9be9af9092f165b9b809d870289b57330301dc6",
"shasum": ""
},
"require": {
@@ -1565,20 +1577,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-12T08:11:32+00:00"
+ "time": "2020-07-23T08:36:24+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "f93055171b847915225bd5b0a5792888419d8d75"
+ "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75",
- "reference": "f93055171b847915225bd5b0a5792888419d8d75",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1f0d6627e680591c61e9176f04a0dc887b4e6702",
+ "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702",
"shasum": ""
},
"require": {
@@ -1640,20 +1652,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-15T06:52:54+00:00"
+ "time": "2020-07-23T10:04:31+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a"
+ "reference": "d6dd8f6420e377970ddad0d6317d4ce4186fc6b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a18c27ace1ef344ffcb129a5b089bad7643b387a",
- "reference": "a18c27ace1ef344ffcb129a5b089bad7643b387a",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d6dd8f6420e377970ddad0d6317d4ce4186fc6b3",
+ "reference": "d6dd8f6420e377970ddad0d6317d4ce4186fc6b3",
"shasum": ""
},
"require": {
@@ -1753,20 +1765,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-15T13:51:38+00:00"
+ "time": "2020-07-24T04:22:56+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
- "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+ "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
- "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+ "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+ "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
"shasum": ""
},
"require": {
@@ -1778,7 +1790,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -1825,20 +1841,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:14:59+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "e094b0770f7833fdf257e6ba4775be4e258230b2"
+ "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e094b0770f7833fdf257e6ba4775be4e258230b2",
- "reference": "e094b0770f7833fdf257e6ba4775be4e258230b2",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5",
+ "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5",
"shasum": ""
},
"require": {
@@ -1850,7 +1866,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -1899,20 +1919,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-intl-normalizer",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
- "reference": "1357b1d168eb7f68ad6a134838e46b0b159444a9"
+ "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/1357b1d168eb7f68ad6a134838e46b0b159444a9",
- "reference": "1357b1d168eb7f68ad6a134838e46b0b159444a9",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+ "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
"shasum": ""
},
"require": {
@@ -1924,7 +1944,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -1976,20 +2000,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:14:59+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
- "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+ "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
"shasum": ""
},
"require": {
@@ -2001,7 +2025,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -2049,20 +2077,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
+ "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
- "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+ "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
"shasum": ""
},
"require": {
@@ -2071,7 +2099,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -2121,20 +2153,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
- "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+ "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
"shasum": ""
},
"require": {
@@ -2143,7 +2175,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -2197,20 +2233,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/routing",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "bbd0ba121d623f66d165a55a108008968911f3eb"
+ "reference": "08c9a82f09d12ee048f85e76e0d783f82844eb5d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/bbd0ba121d623f66d165a55a108008968911f3eb",
- "reference": "bbd0ba121d623f66d165a55a108008968911f3eb",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/08c9a82f09d12ee048f85e76e0d783f82844eb5d",
+ "reference": "08c9a82f09d12ee048f85e76e0d783f82844eb5d",
"shasum": ""
},
"require": {
@@ -2289,20 +2325,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-10T11:49:58+00:00"
+ "time": "2020-06-18T18:24:02+00:00"
},
{
"name": "symfony/service-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
+ "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
- "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
+ "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
"shasum": ""
},
"require": {
@@ -2316,6 +2352,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -2361,20 +2401,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-20T17:43:50+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/string",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298"
+ "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/ac70459db781108db7c6d8981dd31ce0e29e3298",
- "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298",
+ "url": "https://api.github.com/repos/symfony/string/zipball/f629ba9b611c76224feb21fe2bcbf0b6f992300b",
+ "reference": "f629ba9b611c76224feb21fe2bcbf0b6f992300b",
"shasum": ""
},
"require": {
@@ -2446,20 +2486,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-11T12:16:36+00:00"
+ "time": "2020-07-08T08:27:49+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "46a942903059b0b05e601f00eb64179e05578c0f"
+ "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46a942903059b0b05e601f00eb64179e05578c0f",
- "reference": "46a942903059b0b05e601f00eb64179e05578c0f",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2ebe1c7bb52052624d6dc1250f4abe525655d75a",
+ "reference": "2ebe1c7bb52052624d6dc1250f4abe525655d75a",
"shasum": ""
},
"require": {
@@ -2536,11 +2576,11 @@
"type": "tidelift"
}
],
- "time": "2020-05-30T20:35:19+00:00"
+ "time": "2020-06-24T13:36:18+00:00"
},
{
"name": "symfony/var-exporter",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
@@ -2615,7 +2655,7 @@
},
{
"name": "symfony/yaml",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
@@ -2747,31 +2787,31 @@
},
{
"name": "twig/twig",
- "version": "v2.12.5",
+ "version": "v2.13.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "18772e0190734944277ee97a02a9a6c6555fcd94"
+ "reference": "57e96259776ddcacf1814885fc3950460c8e18ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/18772e0190734944277ee97a02a9a6c6555fcd94",
- "reference": "18772e0190734944277ee97a02a9a6c6555fcd94",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/57e96259776ddcacf1814885fc3950460c8e18ef",
+ "reference": "57e96259776ddcacf1814885fc3950460c8e18ef",
"shasum": ""
},
"require": {
- "php": "^7.0",
+ "php": ">=7.1.3",
"symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-mbstring": "^1.3"
},
"require-dev": {
"psr/container": "^1.0",
- "symfony/phpunit-bridge": "^4.4|^5.0"
+ "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.12-dev"
+ "dev-master": "2.13-dev"
}
},
"autoload": {
@@ -2808,24 +2848,34 @@
"keywords": [
"templating"
],
- "time": "2020-02-11T15:31:23+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/twig/twig",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-08-05T15:09:04+00:00"
},
{
"name": "webmozart/assert",
- "version": "1.9.0",
+ "version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
+ "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
- "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+ "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0",
+ "php": "^5.3.3 || ^7.0 || ^8.0",
"symfony/polyfill-ctype": "^1.8"
},
"conflict": {
@@ -2857,22 +2907,22 @@
"check",
"validate"
],
- "time": "2020-06-16T10:16:42+00:00"
+ "time": "2020-07-08T17:02:28+00:00"
}
],
"packages-dev": [
{
"name": "amphp/amp",
- "version": "v2.4.4",
+ "version": "v2.5.0",
"source": {
"type": "git",
"url": "https://github.com/amphp/amp.git",
- "reference": "1e58d53e4af390efc7813e36cd215bd82cba4b06"
+ "reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/amphp/amp/zipball/1e58d53e4af390efc7813e36cd215bd82cba4b06",
- "reference": "1e58d53e4af390efc7813e36cd215bd82cba4b06",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/f220a51458bf4dd0dedebb171ac3457813c72bbc",
+ "reference": "f220a51458bf4dd0dedebb171ac3457813c72bbc",
"shasum": ""
},
"require": {
@@ -2884,8 +2934,8 @@
"ext-json": "*",
"jetbrains/phpstorm-stubs": "^2019.3",
"phpunit/phpunit": "^6.0.9 | ^7",
- "react/promise": "^2",
- "vimeo/psalm": "^3.11@dev"
+ "psalm/phar": "^3.11@dev",
+ "react/promise": "^2"
},
"type": "library",
"extra": {
@@ -2937,32 +2987,39 @@
"non-blocking",
"promise"
],
- "time": "2020-04-30T04:54:50+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/amphp",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-14T21:47:18+00:00"
},
{
"name": "amphp/byte-stream",
- "version": "v1.7.3",
+ "version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/amphp/byte-stream.git",
- "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592"
+ "reference": "f0c20cf598a958ba2aa8c6e5a71c697d652c7088"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/amphp/byte-stream/zipball/b867505edb79dda8f253ca3c3a2bbadae4b16592",
- "reference": "b867505edb79dda8f253ca3c3a2bbadae4b16592",
+ "url": "https://api.github.com/repos/amphp/byte-stream/zipball/f0c20cf598a958ba2aa8c6e5a71c697d652c7088",
+ "reference": "f0c20cf598a958ba2aa8c6e5a71c697d652c7088",
"shasum": ""
},
"require": {
- "amphp/amp": "^2"
+ "amphp/amp": "^2",
+ "php": ">=7.1"
},
"require-dev": {
"amphp/php-cs-fixer-config": "dev-master",
- "amphp/phpunit-util": "^1",
+ "amphp/phpunit-util": "^1.4",
"friendsofphp/php-cs-fixer": "^2.3",
"jetbrains/phpstorm-stubs": "^2019.3",
"phpunit/phpunit": "^6 || ^7 || ^8",
- "vimeo/psalm": "^3.9@dev"
+ "psalm/phar": "^3.11.4"
},
"type": "library",
"extra": {
@@ -3002,32 +3059,102 @@
"non-blocking",
"stream"
],
- "time": "2020-04-04T16:56:54+00:00"
+ "time": "2020-06-29T18:35:05+00:00"
+ },
+ {
+ "name": "composer/package-versions-deprecated",
+ "version": "1.10.99.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/package-versions-deprecated.git",
+ "reference": "68c9b502036e820c33445ff4d174327f6bb87486"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/68c9b502036e820c33445ff4d174327f6bb87486",
+ "reference": "68c9b502036e820c33445ff4d174327f6bb87486",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "^1.1.0 || ^2.0",
+ "php": "^7 || ^8"
+ },
+ "replace": {
+ "ocramius/package-versions": "1.10.99"
+ },
+ "require-dev": {
+ "composer/composer": "^1.9.3 || ^2.0@dev",
+ "ext-zip": "^1.13",
+ "phpunit/phpunit": "^6.5 || ^7"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "class": "PackageVersions\\Installer",
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PackageVersions\\": "src/PackageVersions"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Marco Pivetta",
+ "email": "ocramius@gmail.com"
+ },
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be"
+ }
+ ],
+ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
+ "funding": [
+ {
+ "url": "https://packagist.com",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-08-13T12:55:41+00:00"
},
{
"name": "composer/semver",
- "version": "1.5.1",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
+ "reference": "3426bd5efa8a12d230824536c42a8a4ad30b7940"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
- "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+ "url": "https://api.github.com/repos/composer/semver/zipball/3426bd5efa8a12d230824536c42a8a4ad30b7940",
+ "reference": "3426bd5efa8a12d230824536c42a8a4ad30b7940",
"shasum": ""
},
"require": {
- "php": "^5.3.2 || ^7.0"
+ "php": "^5.3.2 || ^7.0 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5 || ^5.0.5"
+ "phpstan/phpstan": "^0.12.19",
+ "symfony/phpunit-bridge": "^4.2 || ^5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-master": "3.x-dev"
}
},
"autoload": {
@@ -3063,7 +3190,21 @@
"validation",
"versioning"
],
- "time": "2020-01-13T12:06:48+00:00"
+ "funding": [
+ {
+ "url": "https://packagist.com",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/composer",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-05-26T18:22:04+00:00"
},
{
"name": "composer/xdebug-handler",
@@ -3329,20 +3470,20 @@
},
{
"name": "myclabs/deep-copy",
- "version": "1.9.5",
+ "version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+ "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
- "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+ "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.1 || ^8.0"
},
"replace": {
"myclabs/deep-copy": "self.version"
@@ -3373,7 +3514,13 @@
"object",
"object graph"
],
- "time": "2020-01-17T21:11:47+00:00"
+ "funding": [
+ {
+ "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-06-29T13:22:24+00:00"
},
{
"name": "netresearch/jsonmapper",
@@ -3423,16 +3570,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.5.0",
+ "version": "v4.8.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463"
+ "reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463",
- "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8c58eb4cd4f3883f82611abeac2efbc3dbed787e",
+ "reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e",
"shasum": ""
},
"require": {
@@ -3440,8 +3587,8 @@
"php": ">=7.0"
},
"require-dev": {
- "ircmaxell/php-yacc": "0.0.5",
- "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+ "ircmaxell/php-yacc": "^0.0.6",
+ "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
},
"bin": [
"bin/php-parse"
@@ -3449,7 +3596,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.8-dev"
}
},
"autoload": {
@@ -3471,57 +3618,7 @@
"parser",
"php"
],
- "time": "2020-06-03T07:24:19+00:00"
- },
- {
- "name": "ocramius/package-versions",
- "version": "1.4.2",
- "source": {
- "type": "git",
- "url": "https://github.com/Ocramius/PackageVersions.git",
- "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
- "reference": "44af6f3a2e2e04f2af46bcb302ad9600cba41c7d",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.0.0",
- "php": "^7.1.0"
- },
- "require-dev": {
- "composer/composer": "^1.6.3",
- "doctrine/coding-standard": "^5.0.1",
- "ext-zip": "*",
- "infection/infection": "^0.7.1",
- "phpunit/phpunit": "^7.5.17"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "PackageVersions\\Installer",
- "branch-alias": {
- "dev-master": "2.0.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "PackageVersions\\": "src/PackageVersions"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com"
- }
- ],
- "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
- "time": "2019-11-15T16:17:10+00:00"
+ "time": "2020-08-09T10:23:20+00:00"
},
{
"name": "openlss/lib-array2xml",
@@ -3572,30 +3669,76 @@
],
"time": "2019-03-29T20:06:56+00:00"
},
+ {
+ "name": "paragonie/random_compat",
+ "version": "v9.99.99",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "type": "library",
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "polyfill",
+ "pseudorandom",
+ "random"
+ ],
+ "time": "2018-07-02T15:55:56+00:00"
+ },
{
"name": "phar-io/manifest",
- "version": "1.0.3",
+ "version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
- "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+ "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
- "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+ "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
+ "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-phar": "*",
- "phar-io/version": "^2.0",
- "php": "^5.6 || ^7.0"
+ "ext-xmlwriter": "*",
+ "phar-io/version": "^3.0.1",
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0.x-dev"
}
},
"autoload": {
@@ -3625,24 +3768,24 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2018-07-08T19:23:20+00:00"
+ "time": "2020-06-27T14:33:11+00:00"
},
{
"name": "phar-io/version",
- "version": "2.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
- "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+ "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
- "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+ "url": "https://api.github.com/repos/phar-io/version/zipball/c6bb6825def89e0a32220f88337f8ceaf1975fa0",
+ "reference": "c6bb6825def89e0a32220f88337f8ceaf1975fa0",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"autoload": {
@@ -3672,29 +3815,29 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2018-07-08T19:19:57+00:00"
+ "time": "2020-06-27T14:39:04+00:00"
},
{
"name": "phpdocumentor/reflection-common",
- "version": "2.1.0",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git",
- "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
- "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+ "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
"shasum": ""
},
"require": {
- "php": ">=7.1"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-2.x": "2.x-dev"
}
},
"autoload": {
@@ -3721,32 +3864,31 @@
"reflection",
"static analysis"
],
- "time": "2020-04-27T09:25:28+00:00"
+ "time": "2020-06-27T09:03:43+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "5.1.0",
+ "version": "5.2.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
+ "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
- "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d870572532cd70bc3fab58f2e23ad423c8404c44",
+ "reference": "d870572532cd70bc3fab58f2e23ad423c8404c44",
"shasum": ""
},
"require": {
- "ext-filter": "^7.1",
- "php": "^7.2",
- "phpdocumentor/reflection-common": "^2.0",
- "phpdocumentor/type-resolver": "^1.0",
- "webmozart/assert": "^1"
+ "ext-filter": "*",
+ "php": "^7.2 || ^8.0",
+ "phpdocumentor/reflection-common": "^2.2",
+ "phpdocumentor/type-resolver": "^1.3",
+ "webmozart/assert": "^1.9.1"
},
"require-dev": {
- "doctrine/instantiator": "^1",
- "mockery/mockery": "^1"
+ "mockery/mockery": "~1.3.2"
},
"type": "library",
"extra": {
@@ -3774,34 +3916,33 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2020-02-22T12:28:44+00:00"
+ "time": "2020-08-15T11:14:08+00:00"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "1.1.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+ "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
- "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
+ "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
"shasum": ""
},
"require": {
- "php": "^7.2",
+ "php": "^7.2 || ^8.0",
"phpdocumentor/reflection-common": "^2.0"
},
"require-dev": {
- "ext-tokenizer": "^7.2",
- "mockery/mockery": "~1"
+ "ext-tokenizer": "*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-1.x": "1.x-dev"
}
},
"autoload": {
@@ -3820,37 +3961,37 @@
}
],
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
- "time": "2020-02-18T18:59:58+00:00"
+ "time": "2020-06-27T10:12:23+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "v1.10.3",
+ "version": "1.11.1",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "451c3cd1418cf640de218914901e51b064abb093"
+ "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
- "reference": "451c3cd1418cf640de218914901e51b064abb093",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
+ "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.0.2",
- "php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
- "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
- "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+ "doctrine/instantiator": "^1.2",
+ "php": "^7.2",
+ "phpdocumentor/reflection-docblock": "^5.0",
+ "sebastian/comparator": "^3.0 || ^4.0",
+ "sebastian/recursion-context": "^3.0 || ^4.0"
},
"require-dev": {
- "phpspec/phpspec": "^2.5 || ^3.2",
- "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+ "phpspec/phpspec": "^6.0",
+ "phpunit/phpunit": "^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.10.x-dev"
+ "dev-master": "1.11.x-dev"
}
},
"autoload": {
@@ -3883,44 +4024,48 @@
"spy",
"stub"
],
- "time": "2020-03-05T15:02:03+00:00"
+ "time": "2020-07-08T12:44:21+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "7.0.10",
+ "version": "9.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf"
+ "reference": "4422fca28c3634e2de8c7c373af97a104dd1a45f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f1884187926fbb755a9aaf0b3836ad3165b478bf",
- "reference": "f1884187926fbb755a9aaf0b3836ad3165b478bf",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4422fca28c3634e2de8c7c373af97a104dd1a45f",
+ "reference": "4422fca28c3634e2de8c7c373af97a104dd1a45f",
"shasum": ""
},
"require": {
"ext-dom": "*",
+ "ext-libxml": "*",
"ext-xmlwriter": "*",
- "php": "^7.2",
- "phpunit/php-file-iterator": "^2.0.2",
- "phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^3.1.1",
- "sebastian/code-unit-reverse-lookup": "^1.0.1",
- "sebastian/environment": "^4.2.2",
- "sebastian/version": "^2.0.1",
- "theseer/tokenizer": "^1.1.3"
+ "nikic/php-parser": "^4.8",
+ "php": "^7.3 || ^8.0",
+ "phpunit/php-file-iterator": "^3.0.3",
+ "phpunit/php-text-template": "^2.0.2",
+ "sebastian/code-unit-reverse-lookup": "^2.0.2",
+ "sebastian/complexity": "^2.0",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/lines-of-code": "^1.0",
+ "sebastian/version": "^3.0.1",
+ "theseer/tokenizer": "^1.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.2.2"
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
- "ext-xdebug": "^2.7.2"
+ "ext-pcov": "*",
+ "ext-xdebug": "*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "7.0-dev"
+ "dev-master": "9.1-dev"
}
},
"autoload": {
@@ -3946,32 +4091,38 @@
"testing",
"xunit"
],
- "time": "2019-11-20T13:55:58+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-08-13T15:04:53+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "2.0.2",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "050bedf145a257b1ff02746c31894800e5122946"
+ "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946",
- "reference": "050bedf145a257b1ff02746c31894800e5122946",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/25fefc5b19835ca653877fe081644a3f8c1d915e",
+ "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.1"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -3996,26 +4147,44 @@
"filesystem",
"iterator"
],
- "time": "2018-09-13T20:33:42+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-11T05:18:21+00:00"
},
{
- "name": "phpunit/php-text-template",
- "version": "1.2.1",
+ "name": "phpunit/php-invoker",
+ "version": "3.1.0",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+ "url": "https://github.com/sebastianbergmann/php-invoker.git",
+ "reference": "7a85b66acc48cacffdf87dadd3694e7123674298"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
- "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7a85b66acc48cacffdf87dadd3694e7123674298",
+ "reference": "7a85b66acc48cacffdf87dadd3694e7123674298",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "ext-pcntl": "*",
+ "phpunit/phpunit": "^9.0"
+ },
+ "suggest": {
+ "ext-pcntl": "*"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.1-dev"
+ }
+ },
"autoload": {
"classmap": [
"src/"
@@ -4032,37 +4201,43 @@
"role": "lead"
}
],
- "description": "Simple template engine.",
- "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+ "description": "Invoke callables with a timeout",
+ "homepage": "https://github.com/sebastianbergmann/php-invoker/",
"keywords": [
- "template"
+ "process"
+ ],
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
],
- "time": "2015-06-21T13:50:34+00:00"
+ "time": "2020-08-06T07:04:15+00:00"
},
{
- "name": "phpunit/php-timer",
- "version": "2.1.2",
+ "name": "phpunit/php-text-template",
+ "version": "2.0.2",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
+ "url": "https://github.com/sebastianbergmann/php-text-template.git",
+ "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
- "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
+ "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -4081,38 +4256,43 @@
"role": "lead"
}
],
- "description": "Utility class for timing",
- "homepage": "https://github.com/sebastianbergmann/php-timer/",
+ "description": "Simple template engine.",
+ "homepage": "https://github.com/sebastianbergmann/php-text-template/",
"keywords": [
- "timer"
+ "template"
+ ],
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
],
- "time": "2019-06-07T04:22:29+00:00"
+ "time": "2020-06-26T11:55:37+00:00"
},
{
- "name": "phpunit/php-token-stream",
- "version": "3.1.1",
+ "name": "phpunit/php-timer",
+ "version": "5.0.1",
"source": {
"type": "git",
- "url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
+ "url": "https://github.com/sebastianbergmann/php-timer.git",
+ "reference": "cc49734779cbb302bf51a44297dab8c4bbf941e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
- "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/cc49734779cbb302bf51a44297dab8c4bbf941e7",
+ "reference": "cc49734779cbb302bf51a44297dab8c4bbf941e7",
"shasum": ""
},
"require": {
- "ext-tokenizer": "*",
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^9.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4127,65 +4307,73 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
}
],
- "description": "Wrapper around PHP's tokenizer extension.",
- "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+ "description": "Utility class for timing",
+ "homepage": "https://github.com/sebastianbergmann/php-timer/",
"keywords": [
- "tokenizer"
+ "timer"
+ ],
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
],
- "abandoned": true,
- "time": "2019-09-17T06:23:10+00:00"
+ "time": "2020-06-26T11:58:13+00:00"
},
{
"name": "phpunit/phpunit",
- "version": "8.5.6",
+ "version": "9.3.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348"
+ "reference": "c638a0cac77347980352485912de48c99b42ad00"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
- "reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c638a0cac77347980352485912de48c99b42ad00",
+ "reference": "c638a0cac77347980352485912de48c99b42ad00",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "^1.2.0",
+ "doctrine/instantiator": "^1.3.1",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "myclabs/deep-copy": "^1.9.1",
- "phar-io/manifest": "^1.0.3",
- "phar-io/version": "^2.0.1",
- "php": "^7.2",
- "phpspec/prophecy": "^1.8.1",
- "phpunit/php-code-coverage": "^7.0.7",
- "phpunit/php-file-iterator": "^2.0.2",
- "phpunit/php-text-template": "^1.2.1",
- "phpunit/php-timer": "^2.1.2",
- "sebastian/comparator": "^3.0.2",
- "sebastian/diff": "^3.0.2",
- "sebastian/environment": "^4.2.2",
- "sebastian/exporter": "^3.1.1",
- "sebastian/global-state": "^3.0.0",
- "sebastian/object-enumerator": "^3.0.3",
- "sebastian/resource-operations": "^2.0.1",
- "sebastian/type": "^1.1.3",
- "sebastian/version": "^2.0.1"
+ "myclabs/deep-copy": "^1.10.1",
+ "phar-io/manifest": "^2.0.1",
+ "phar-io/version": "^3.0.2",
+ "php": "^7.3 || ^8.0",
+ "phpspec/prophecy": "^1.11.1",
+ "phpunit/php-code-coverage": "^9.1.1",
+ "phpunit/php-file-iterator": "^3.0.4",
+ "phpunit/php-invoker": "^3.1",
+ "phpunit/php-text-template": "^2.0.2",
+ "phpunit/php-timer": "^5.0.1",
+ "sebastian/code-unit": "^1.0.5",
+ "sebastian/comparator": "^4.0.3",
+ "sebastian/diff": "^4.0.2",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/exporter": "^4.0.2",
+ "sebastian/global-state": "^5.0",
+ "sebastian/object-enumerator": "^4.0.2",
+ "sebastian/resource-operations": "^3.0.2",
+ "sebastian/type": "^2.2.1",
+ "sebastian/version": "^3.0.1"
},
"require-dev": {
- "ext-pdo": "*"
+ "ext-pdo": "*",
+ "phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
"ext-soap": "*",
- "ext-xdebug": "*",
- "phpunit/php-invoker": "^2.0.0"
+ "ext-xdebug": "*"
},
"bin": [
"phpunit"
@@ -4193,12 +4381,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "8.5-dev"
+ "dev-master": "9.3-dev"
}
},
"autoload": {
"classmap": [
"src/"
+ ],
+ "files": [
+ "src/Framework/Assert/Functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
@@ -4229,32 +4420,84 @@
"type": "github"
}
],
- "time": "2020-06-15T10:45:47+00:00"
+ "time": "2020-08-11T15:36:12+00:00"
+ },
+ {
+ "name": "sebastian/code-unit",
+ "version": "1.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/code-unit.git",
+ "reference": "c1e2df332c905079980b119c4db103117e5e5c90"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/c1e2df332c905079980b119c4db103117e5e5c90",
+ "reference": "c1e2df332c905079980b119c4db103117e5e5c90",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Collection of value objects that represent the PHP code units",
+ "homepage": "https://github.com/sebastianbergmann/code-unit",
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:50:45+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
- "version": "1.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+ "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
- "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+ "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ee51f9bb0c6d8a43337055db3120829fa14da819",
+ "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819",
"shasum": ""
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7 || ^6.0"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -4274,34 +4517,40 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04T06:30:41+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:04:00+00:00"
},
{
"name": "sebastian/comparator",
- "version": "3.0.2",
+ "version": "4.0.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
+ "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
- "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
+ "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
"shasum": ""
},
"require": {
- "php": "^7.1",
- "sebastian/diff": "^3.0",
- "sebastian/exporter": "^3.1"
+ "php": "^7.3 || ^8.0",
+ "sebastian/diff": "^4.0",
+ "sebastian/exporter": "^4.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.1"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4314,6 +4563,10 @@
"BSD-3-Clause"
],
"authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de"
+ },
{
"name": "Jeff Welch",
"email": "whatthejeff@gmail.com"
@@ -4325,10 +4578,6 @@
{
"name": "Bernhard Schussek",
"email": "bschussek@2bepublished.at"
- },
- {
- "name": "Sebastian Bergmann",
- "email": "sebastian@phpunit.de"
}
],
"description": "Provides the functionality to compare PHP values for equality",
@@ -4338,33 +4587,92 @@
"compare",
"equality"
],
- "time": "2018-07-12T15:12:46+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:05:46+00:00"
+ },
+ {
+ "name": "sebastian/complexity",
+ "version": "2.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/complexity.git",
+ "reference": "33fcd6a26656c6546f70871244ecba4b4dced097"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/33fcd6a26656c6546f70871244ecba4b4dced097",
+ "reference": "33fcd6a26656c6546f70871244ecba4b4dced097",
+ "shasum": ""
+ },
+ "require": {
+ "nikic/php-parser": "^4.7",
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Library for calculating the complexity of PHP code units",
+ "homepage": "https://github.com/sebastianbergmann/complexity",
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-25T14:01:34+00:00"
},
{
"name": "sebastian/diff",
- "version": "3.0.2",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29"
+ "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
- "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
+ "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.5 || ^8.0",
- "symfony/process": "^2 || ^3.3 || ^4"
+ "phpunit/phpunit": "^9.0",
+ "symfony/process": "^4.2 || ^5"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4377,13 +4685,13 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Kore Nordmann",
- "email": "mail@kore-nordmann.de"
- },
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
+ },
+ {
+ "name": "Kore Nordmann",
+ "email": "mail@kore-nordmann.de"
}
],
"description": "Diff implementation",
@@ -4394,27 +4702,33 @@
"unidiff",
"unified diff"
],
- "time": "2019-02-04T06:01:07+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-30T04:46:02+00:00"
},
{
"name": "sebastian/environment",
- "version": "4.2.3",
+ "version": "5.1.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368"
+ "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
- "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
+ "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^7.5"
+ "phpunit/phpunit": "^9.0"
},
"suggest": {
"ext-posix": "*"
@@ -4422,7 +4736,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.2-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4447,34 +4761,40 @@
"environment",
"hhvm"
],
- "time": "2019-11-20T08:46:58+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:07:24+00:00"
},
{
"name": "sebastian/exporter",
- "version": "3.1.2",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
+ "reference": "571d721db4aec847a0e59690b954af33ebf9f023"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
- "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/571d721db4aec847a0e59690b954af33ebf9f023",
+ "reference": "571d721db4aec847a0e59690b954af33ebf9f023",
"shasum": ""
},
"require": {
- "php": "^7.0",
- "sebastian/recursion-context": "^3.0"
+ "php": "^7.3 || ^8.0",
+ "sebastian/recursion-context": "^4.0"
},
"require-dev": {
"ext-mbstring": "*",
- "phpunit/phpunit": "^6.0"
+ "phpunit/phpunit": "^9.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4514,30 +4834,36 @@
"export",
"exporter"
],
- "time": "2019-09-14T09:02:43+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:08:55+00:00"
},
{
"name": "sebastian/global-state",
- "version": "3.0.0",
+ "version": "5.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4"
+ "reference": "22ae663c951bdc39da96603edc3239ed3a299097"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
- "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/22ae663c951bdc39da96603edc3239ed3a299097",
+ "reference": "22ae663c951bdc39da96603edc3239ed3a299097",
"shasum": ""
},
"require": {
- "php": "^7.2",
- "sebastian/object-reflector": "^1.1.1",
- "sebastian/recursion-context": "^3.0"
+ "php": "^7.3 || ^8.0",
+ "sebastian/object-reflector": "^2.0",
+ "sebastian/recursion-context": "^4.0"
},
"require-dev": {
"ext-dom": "*",
- "phpunit/phpunit": "^8.0"
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
"ext-uopz": "*"
@@ -4545,7 +4871,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "5.0-dev"
}
},
"autoload": {
@@ -4568,34 +4894,93 @@
"keywords": [
"global state"
],
- "time": "2019-02-01T05:30:01+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-08-07T04:09:03+00:00"
+ },
+ {
+ "name": "sebastian/lines-of-code",
+ "version": "1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+ "reference": "e02bf626f404b5daec382a7b8a6a4456e49017e5"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e02bf626f404b5daec382a7b8a6a4456e49017e5",
+ "reference": "e02bf626f404b5daec382a7b8a6a4456e49017e5",
+ "shasum": ""
+ },
+ "require": {
+ "nikic/php-parser": "^4.6",
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Sebastian Bergmann",
+ "email": "sebastian@phpunit.de",
+ "role": "lead"
+ }
+ ],
+ "description": "Library for counting the lines of code in PHP source code",
+ "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-22T18:33:42+00:00"
},
{
"name": "sebastian/object-enumerator",
- "version": "3.0.3",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-enumerator.git",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
+ "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
- "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
+ "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
"shasum": ""
},
"require": {
- "php": "^7.0",
- "sebastian/object-reflector": "^1.1.1",
- "sebastian/recursion-context": "^3.0"
+ "php": "^7.3 || ^8.0",
+ "sebastian/object-reflector": "^2.0",
+ "sebastian/recursion-context": "^4.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4615,32 +5000,38 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03T12:35:26+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:11:32+00:00"
},
{
"name": "sebastian/object-reflector",
- "version": "1.1.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/object-reflector.git",
- "reference": "773f97c67f28de00d397be301821b06708fca0be"
+ "reference": "127a46f6b057441b201253526f81d5406d6c7840"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
- "reference": "773f97c67f28de00d397be301821b06708fca0be",
+ "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/127a46f6b057441b201253526f81d5406d6c7840",
+ "reference": "127a46f6b057441b201253526f81d5406d6c7840",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.0-dev"
}
},
"autoload": {
@@ -4660,32 +5051,38 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29T09:07:27+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:12:55+00:00"
},
{
"name": "sebastian/recursion-context",
- "version": "3.0.0",
+ "version": "4.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
+ "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
- "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/062231bf61d2b9448c4fa5a7643b5e1829c11d63",
+ "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^6.0"
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -4698,14 +5095,14 @@
"BSD-3-Clause"
],
"authors": [
- {
- "name": "Jeff Welch",
- "email": "whatthejeff@gmail.com"
- },
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
+ {
+ "name": "Jeff Welch",
+ "email": "whatthejeff@gmail.com"
+ },
{
"name": "Adam Harvey",
"email": "aharvey@php.net"
@@ -4713,29 +5110,38 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03T06:23:57+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:14:17+00:00"
},
{
"name": "sebastian/resource-operations",
- "version": "2.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9"
+ "reference": "0653718a5a629b065e91f774595267f8dc32e213"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
- "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0653718a5a629b065e91f774595267f8dc32e213",
+ "reference": "0653718a5a629b065e91f774595267f8dc32e213",
"shasum": ""
},
"require": {
- "php": "^7.1"
+ "php": "^7.3 || ^8.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -4755,32 +5161,38 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2018-10-04T04:07:39+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:16:22+00:00"
},
{
"name": "sebastian/type",
- "version": "1.1.3",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/type.git",
- "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3"
+ "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/3aaaa15fa71d27650d62a948be022fe3b48541a3",
- "reference": "3aaaa15fa71d27650d62a948be022fe3b48541a3",
+ "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/86991e2b33446cd96e648c18bcdb1e95afb2c05a",
+ "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a",
"shasum": ""
},
"require": {
- "php": "^7.2"
+ "php": "^7.3 || ^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.2"
+ "phpunit/phpunit": "^9.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "2.2-dev"
}
},
"autoload": {
@@ -4801,29 +5213,35 @@
],
"description": "Collection of value objects that represent the types of the PHP type system",
"homepage": "https://github.com/sebastianbergmann/type",
- "time": "2019-07-02T08:10:15+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-05T08:31:53+00:00"
},
{
"name": "sebastian/version",
- "version": "2.0.1",
+ "version": "3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+ "reference": "626586115d0ed31cb71483be55beb759b5af5a3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
- "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/626586115d0ed31cb71483be55beb759b5af5a3c",
+ "reference": "626586115d0ed31cb71483be55beb759b5af5a3c",
"shasum": ""
},
"require": {
- "php": ">=5.6"
+ "php": "^7.3 || ^8.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -4844,7 +5262,13 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03T07:35:21+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/sebastianbergmann",
+ "type": "github"
+ }
+ ],
+ "time": "2020-06-26T12:18:43+00:00"
},
{
"name": "sensiolabs/security-checker",
@@ -4931,12 +5355,12 @@
"source": {
"type": "git",
"url": "https://github.com/simplesamlphp/simplesamlphp-module-adfs.git",
- "reference": "a2973512bcbb515141b7a9bfee3b1cffb0e7aead"
+ "reference": "10fd1c9045c7e3e1aeda62b0d081e127a06deb76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-module-adfs/zipball/a2973512bcbb515141b7a9bfee3b1cffb0e7aead",
- "reference": "a2973512bcbb515141b7a9bfee3b1cffb0e7aead",
+ "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-module-adfs/zipball/10fd1c9045c7e3e1aeda62b0d081e127a06deb76",
+ "reference": "10fd1c9045c7e3e1aeda62b0d081e127a06deb76",
"shasum": ""
},
"require": {
@@ -4969,7 +5393,7 @@
"adfs",
"simplesamlphp"
],
- "time": "2020-03-31T14:29:07+00:00"
+ "time": "2020-08-07T19:57:16+00:00"
},
{
"name": "simplesamlphp/simplesamlphp-test-framework",
@@ -5027,16 +5451,16 @@
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.5.5",
+ "version": "3.5.6",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6"
+ "reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
- "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
+ "reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
"shasum": ""
},
"require": {
@@ -5074,20 +5498,20 @@
"phpcs",
"standards"
],
- "time": "2020-04-17T01:09:41+00:00"
+ "time": "2020-08-10T04:50:15+00:00"
},
{
"name": "symfony/http-client",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
- "reference": "aae28b613d7a88e529df46e617f046be0236ab54"
+ "reference": "050dc633a598bdadbd49449500c87e30dabe5c58"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client/zipball/aae28b613d7a88e529df46e617f046be0236ab54",
- "reference": "aae28b613d7a88e529df46e617f046be0236ab54",
+ "url": "https://api.github.com/repos/symfony/http-client/zipball/050dc633a598bdadbd49449500c87e30dabe5c58",
+ "reference": "050dc633a598bdadbd49449500c87e30dabe5c58",
"shasum": ""
},
"require": {
@@ -5160,20 +5584,20 @@
"type": "tidelift"
}
],
- "time": "2020-06-11T21:20:02+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/http-client-contracts",
- "version": "v2.1.2",
+ "version": "v2.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client-contracts.git",
- "reference": "f8bed25edc964d015bcd87f1fec5734963931910"
+ "reference": "cd88921e9add61f2064c9c6b30de4f589db42962"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/f8bed25edc964d015bcd87f1fec5734963931910",
- "reference": "f8bed25edc964d015bcd87f1fec5734963931910",
+ "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/cd88921e9add61f2064c9c6b30de4f589db42962",
+ "reference": "cd88921e9add61f2064c9c6b30de4f589db42962",
"shasum": ""
},
"require": {
@@ -5186,6 +5610,10 @@
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -5231,20 +5659,20 @@
"type": "tidelift"
}
],
- "time": "2020-05-25T17:37:45+00:00"
+ "time": "2020-07-06T13:23:11+00:00"
},
{
"name": "symfony/mime",
- "version": "v5.1.2",
+ "version": "v5.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
- "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
+ "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
- "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
+ "url": "https://api.github.com/repos/symfony/mime/zipball/149fb0ad35aae3c7637b496b38478797fa6a7ea6",
+ "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6",
"shasum": ""
},
"require": {
@@ -5308,25 +5736,26 @@
"type": "tidelift"
}
],
- "time": "2020-06-09T15:07:35+00:00"
+ "time": "2020-07-23T10:04:31+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
- "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+ "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
- "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+ "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
- "symfony/polyfill-mbstring": "^1.3",
+ "symfony/polyfill-intl-normalizer": "^1.10",
+ "symfony/polyfill-php70": "^1.10",
"symfony/polyfill-php72": "^1.10"
},
"suggest": {
@@ -5335,7 +5764,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -5355,6 +5788,10 @@
"name": "Laurent Bassin",
"email": "laurent@bassin.info"
},
+ {
+ "name": "Trevor Rowbotham",
+ "email": "trevor.rowbotham@pm.me"
+ },
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
@@ -5384,20 +5821,97 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-08-04T06:02:08+00:00"
+ },
+ {
+ "name": "symfony/polyfill-php70",
+ "version": "v1.18.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php70.git",
+ "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+ "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+ "shasum": ""
+ },
+ "require": {
+ "paragonie/random_compat": "~1.0|~2.0|~9.99",
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php70\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "funding": [
+ {
+ "url": "https://symfony.com/sponsor",
+ "type": "custom"
+ },
+ {
+ "url": "https://github.com/fabpot",
+ "type": "github"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.17.0",
+ "version": "v1.18.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+ "reference": "639447d008615574653fb3bc60d1986d7172eaae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
- "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+ "reference": "639447d008615574653fb3bc60d1986d7172eaae",
"shasum": ""
},
"require": {
@@ -5406,7 +5920,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.17-dev"
+ "dev-master": "1.18-dev"
+ },
+ "thanks": {
+ "name": "symfony/polyfill",
+ "url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
@@ -5453,27 +5971,27 @@
"type": "tidelift"
}
],
- "time": "2020-05-12T16:47:27+00:00"
+ "time": "2020-07-14T12:35:20+00:00"
},
{
"name": "theseer/tokenizer",
- "version": "1.1.3",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/theseer/tokenizer.git",
- "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+ "reference": "75a63c33a8577608444246075ea0af0d052e452a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
- "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+ "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+ "reference": "75a63c33a8577608444246075ea0af0d052e452a",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
- "php": "^7.0"
+ "php": "^7.2 || ^8.0"
},
"type": "library",
"autoload": {
@@ -5493,26 +6011,33 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2019-06-13T22:48:21+00:00"
+ "funding": [
+ {
+ "url": "https://github.com/theseer",
+ "type": "github"
+ }
+ ],
+ "time": "2020-07-12T23:59:07+00:00"
},
{
"name": "vimeo/psalm",
- "version": "3.11.5",
+ "version": "3.14.1",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "3c60609c218d4d4b3b257728b8089094e5c6c6c2"
+ "reference": "9822043ca46d6682b76097bfa97d7c450eef9e90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/3c60609c218d4d4b3b257728b8089094e5c6c6c2",
- "reference": "3c60609c218d4d4b3b257728b8089094e5c6c6c2",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/9822043ca46d6682b76097bfa97d7c450eef9e90",
+ "reference": "9822043ca46d6682b76097bfa97d7c450eef9e90",
"shasum": ""
},
"require": {
"amphp/amp": "^2.1",
"amphp/byte-stream": "^1.5",
- "composer/semver": "^1.4",
+ "composer/package-versions-deprecated": "^1.8.0",
+ "composer/semver": "^1.4 || ^2.0 || ^3.0",
"composer/xdebug-handler": "^1.1",
"ext-dom": "*",
"ext-json": "*",
@@ -5521,9 +6046,8 @@
"ext-tokenizer": "*",
"felixfbecker/advanced-json-rpc": "^3.0.3",
"felixfbecker/language-server-protocol": "^1.4",
- "netresearch/jsonmapper": "^1.0 || ^2.0",
- "nikic/php-parser": "^4.3",
- "ocramius/package-versions": "^1.2",
+ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0",
+ "nikic/php-parser": "4.3.* || 4.4.* || 4.5.* || 4.6.* || ^4.8",
"openlss/lib-array2xml": "^1.0",
"php": "^7.1.3|^8",
"sebastian/diff": "^3.0 || ^4.0",
@@ -5539,7 +6063,7 @@
"bamarni/composer-bin-plugin": "^1.2",
"brianium/paratest": "^4.0.0",
"ext-curl": "*",
- "php-coveralls/php-coveralls": "^2.2",
+ "phpdocumentor/reflection-docblock": "^4.3.4 || ^5",
"phpmyadmin/sql-parser": "5.1.0",
"phpspec/prophecy": ">=1.9.0",
"phpunit/phpunit": "^7.5.16 || ^8.5 || ^9.0",
@@ -5590,7 +6114,7 @@
"inspection",
"php"
],
- "time": "2020-05-27T15:12:09+00:00"
+ "time": "2020-08-17T19:48:48+00:00"
},
{
"name": "webmozart/glob",
@@ -5694,7 +6218,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=7.2",
+ "php": ">=7.4",
"ext-spl": "*",
"ext-zlib": "*",
"ext-pcre": "*",
diff --git a/lib/SimpleSAML/SessionHandlerPHP.php b/lib/SimpleSAML/SessionHandlerPHP.php
index 634435cb5..cd19d3bde 100644
--- a/lib/SimpleSAML/SessionHandlerPHP.php
+++ b/lib/SimpleSAML/SessionHandlerPHP.php
@@ -70,35 +70,22 @@ class SessionHandlerPHP extends SessionHandler
session_write_close();
}
-
if (empty($this->cookie_name)) {
$this->cookie_name = session_name();
- } elseif (!headers_sent() || version_compare(PHP_VERSION, '7.2', '<')) {
- session_name($this->cookie_name);
}
$params = $this->getCookieParams();
if (!headers_sent()) {
- if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
- /** @psalm-suppress InvalidArgument */
- session_set_cookie_params([
- 'lifetime' => $params['lifetime'],
- 'path' => $params['path'],
- 'domain' => $params['domain'],
- 'secure' => $params['secure'],
- 'httponly' => $params['httponly'],
- 'samesite' => $params['samesite'],
- ]);
- } else {
- session_set_cookie_params(
- $params['lifetime'],
- $params['path'],
- $params['domain'] ?? '',
- $params['secure'],
- $params['httponly']
- );
- }
+ /** @psalm-suppress InvalidArgument */
+ session_set_cookie_params([
+ 'lifetime' => $params['lifetime'],
+ 'path' => $params['path'],
+ 'domain' => $params['domain'],
+ 'secure' => $params['secure'],
+ 'httponly' => $params['httponly'],
+ 'samesite' => $params['samesite'],
+ ]);
}
$savepath = $config->getString('session.phpsession.savepath', null);
@@ -130,17 +117,7 @@ class SessionHandlerPHP extends SessionHandler
session_write_close();
session_name($this->previous_session['name']);
- if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
- session_set_cookie_params($this->previous_session['cookie_params']);
- } else {
- session_set_cookie_params(
- $this->previous_session['cookie_params']['lifetime'],
- $this->previous_session['cookie_params']['path'],
- $this->previous_session['cookie_params']['domain'],
- $this->previous_session['cookie_params']['secure'],
- $this->previous_session['cookie_params']['httponly']
- );
- }
+ session_set_cookie_params($this->previous_session['cookie_params']);
session_id($this->previous_session['id']);
$this->previous_session = [];
@session_start();
@@ -191,7 +168,7 @@ class SessionHandlerPHP extends SessionHandler
return null; // there's no session cookie, can't return ID
}
- if (version_compare(PHP_VERSION, '7.2', 'ge') && headers_sent()) {
+ if (headers_sent()) {
// latest versions of PHP don't allow loading a session when output sent, get the ID from the cookie
return $_COOKIE[$this->cookie_name];
}
@@ -246,18 +223,7 @@ class SessionHandlerPHP extends SessionHandler
public function loadSession(string $sessionId = null): ?Session
{
if ($sessionId !== null) {
- if (session_id() === '' && !(version_compare(PHP_VERSION, '7.2', 'ge') && headers_sent())) {
- // session not initiated with getCookieSessionId(), start session without setting cookie
- $ret = ini_set('session.use_cookies', '0');
- if ($ret === false) {
- throw new Error\Exception('Disabling PHP option session.use_cookies failed.');
- }
-
- session_id($sessionId);
- @session_start();
- } elseif ($sessionId !== session_id()) {
- throw new Error\Exception('Cannot load PHP session with a specific ID.');
- }
+ throw new Error\Exception('Cannot load PHP session with a specific ID.');
} elseif (session_id() === '') {
$this->getCookieSessionId();
}
@@ -318,13 +284,6 @@ class SessionHandlerPHP extends SessionHandler
$ret['httponly'] = $config->getBoolean('session.phpsession.httponly', true);
- if (version_compare(PHP_VERSION, '7.3.0', '<')) {
- // in older versions of PHP we need a nasty hack to set RFC6265bis SameSite attribute
- if ($ret['samesite'] !== null and !preg_match('/;\s+samesite/i', $ret['path'])) {
- $ret['path'] .= '; SameSite=' . $ret['samesite'];
- }
- }
-
return $ret;
}
@@ -364,18 +323,8 @@ class SessionHandlerPHP extends SessionHandler
session_write_close();
}
- if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
- /** @psalm-suppress InvalidArgument */
- session_set_cookie_params($cookieParams);
- } else {
- session_set_cookie_params(
- $cookieParams['lifetime'],
- $cookieParams['path'],
- $cookieParams['domain'] ?? '',
- $cookieParams['secure'],
- $cookieParams['httponly']
- );
- }
+ /** @psalm-suppress InvalidArgument */
+ session_set_cookie_params($cookieParams);
session_id(strval($sessionID));
@session_start();
diff --git a/lib/SimpleSAML/Utils/HTTP.php b/lib/SimpleSAML/Utils/HTTP.php
index 18605b8c5..033693bb8 100644
--- a/lib/SimpleSAML/Utils/HTTP.php
+++ b/lib/SimpleSAML/Utils/HTTP.php
@@ -1150,63 +1150,34 @@ class HTTP
$expire = time() + intval($params['lifetime']);
}
- if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
- /* use the new options array for PHP >= 7.3 */
- if ($params['raw']) {
- /** @psalm-suppress InvalidArgument */
- $success = @setrawcookie(
- $name,
- $value,
- [
- 'expires' => $expire,
- 'path' => $params['path'],
- 'domain' => $params['domain'],
- 'secure' => $params['secure'],
- 'httponly' => $params['httponly'],
- 'samesite' => $params['samesite'],
- ]
- );
- } else {
- /** @psalm-suppress InvalidArgument */
- $success = @setcookie(
- $name,
- $value,
- [
- 'expires' => $expire,
- 'path' => $params['path'],
- 'domain' => $params['domain'],
- 'secure' => $params['secure'],
- 'httponly' => $params['httponly'],
- 'samesite' => $params['samesite'],
- ]
- );
- }
+ if ($params['raw']) {
+ /** @psalm-suppress InvalidArgument */
+ $success = @setrawcookie(
+ $name,
+ $value,
+ [
+ 'expires' => $expire,
+ 'path' => $params['path'],
+ 'domain' => $params['domain'],
+ 'secure' => $params['secure'],
+ 'httponly' => $params['httponly'],
+ 'samesite' => $params['samesite'],
+ ]
+ );
} else {
- /* in older versions of PHP we need a nasty hack to set RFC6265bis SameSite attribute */
- if ($params['samesite'] !== null && !preg_match('/;\s+samesite/i', $params['path'])) {
- $params['path'] .= '; SameSite=' . $params['samesite'];
- }
- if ($params['raw']) {
- $success = @setrawcookie(
- $name,
- $value,
- $expire,
- $params['path'],
- $params['domain'],
- $params['secure'],
- $params['httponly']
- );
- } else {
- $success = @setcookie(
- $name,
- $value,
- $expire,
- $params['path'],
- $params['domain'],
- $params['secure'],
- $params['httponly']
- );
- }
+ /** @psalm-suppress InvalidArgument */
+ $success = @setcookie(
+ $name,
+ $value,
+ [
+ 'expires' => $expire,
+ 'path' => $params['path'],
+ 'domain' => $params['domain'],
+ 'secure' => $params['secure'],
+ 'httponly' => $params['httponly'],
+ 'samesite' => $params['samesite'],
+ ]
+ );
}
if (!$success) {
diff --git a/modules/admin/lib/Controller/Config.php b/modules/admin/lib/Controller/Config.php
index 3c4062e59..463e26623 100644
--- a/modules/admin/lib/Controller/Config.php
+++ b/modules/admin/lib/Controller/Config.php
@@ -177,11 +177,11 @@ class Config
'descr' => [
Translate::noop('PHP %minimum% or newer is needed. You are running: %current%'),
[
- '%minimum%' => '7.2',
+ '%minimum%' => '7.4',
'%current%' => explode('-', phpversion())[0]
]
],
- 'enabled' => version_compare(phpversion(), '7.2', '>=')
+ 'enabled' => version_compare(phpversion(), '7.4', '>=')
]
];
$store = $this->config->getString('store.type', '');
diff --git a/modules/core/hooks/hook_sanitycheck.php b/modules/core/hooks/hook_sanitycheck.php
index d51d4db76..d647c68e7 100644
--- a/modules/core/hooks/hook_sanitycheck.php
+++ b/modules/core/hooks/hook_sanitycheck.php
@@ -31,7 +31,7 @@ function core_hook_sanitycheck(array &$hookinfo): void
$hookinfo['info'][] = '[core] In config.php technicalcontact_email is set properly';
}
- if (version_compare(phpversion(), '7.2', '>=')) {
+ if (version_compare(phpversion(), '7.4', '>=')) {
$hookinfo['info'][] = '[core] You are running a PHP version suitable for SimpleSAMLphp.';
} else {
$hookinfo['errors'][] = '[core] You are running an old PHP installation. ' .
diff --git a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
index bdd1e90d1..105bbb13e 100644
--- a/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
+++ b/tests/lib/SimpleSAML/Metadata/SAMLBuilderTest.php
@@ -222,7 +222,7 @@ class SAMLBuilderTest extends TestCase
$samlBuilder->addMetadata($set, $metadata);
$entityDescriptorXml = $samlBuilder->getEntityDescriptorText();
- $this->assertRegExp(
+ $this->assertMatchesRegularExpression(
'/<md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">/',
$entityDescriptorXml
);
@@ -238,7 +238,7 @@ class SAMLBuilderTest extends TestCase
$entityDescriptorXml = $samlBuilder->getEntityDescriptorText();
$protocols = implode(' ', $metadata['protocols']);
- $this->assertRegExp(
+ $this->assertMatchesRegularExpression(
'/<md:AttributeAuthorityDescriptor protocolSupportEnumeration="' . $protocols . '">/',
$entityDescriptorXml
);
diff --git a/tests/lib/SimpleSAML/Utils/EMailTest.php b/tests/lib/SimpleSAML/Utils/EMailTest.php
index dae13bb18..e775c05d8 100644
--- a/tests/lib/SimpleSAML/Utils/EMailTest.php
+++ b/tests/lib/SimpleSAML/Utils/EMailTest.php
@@ -79,10 +79,10 @@ class EMailTest extends ClearStateTestCase
$mail->setText('text-text-text-text-text-text-text');
$mail->setData(['key-key-key-key-key-key-key' => 'value-value-value-value-value-value-value']);
$result = $mail->generateBody($template);
- $this->assertRegexp('/(subject-){6}/', $result);
- $this->assertRegexp('/(text-){6}/', $result);
- $this->assertRegexp('/(key-){6}/', $result);
- $this->assertRegexp('/(value-){6}/', $result);
+ $this->assertMatchesRegularExpression('/(subject-){6}/', $result);
+ $this->assertMatchesRegularExpression('/(text-){6}/', $result);
+ $this->assertMatchesRegularExpression('/(key-){6}/', $result);
+ $this->assertMatchesRegularExpression('/(value-){6}/', $result);
}
diff --git a/tests/lib/SimpleSAML/Utils/TimeTest.php b/tests/lib/SimpleSAML/Utils/TimeTest.php
index 55dc074c8..9a12a3b12 100644
--- a/tests/lib/SimpleSAML/Utils/TimeTest.php
+++ b/tests/lib/SimpleSAML/Utils/TimeTest.php
@@ -25,7 +25,7 @@ class TimeTest extends TestCase
$this->assertEquals('2016-03-03T14:48:05Z', Time::generateTimestamp(1457016485));
// test timestamp generation for current time
- $this->assertRegExp('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/', Time::generateTimestamp());
+ $this->assertMatchesRegularExpression('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/', Time::generateTimestamp());
}
--
GitLab