summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-24 16:01:11 +0100
committerRemi Collet <remi@php.net>2022-01-24 16:01:11 +0100
commitd2688238727983bd3bd47231b0cea11e1327243b (patch)
tree0b3431bbb961d2c71d2d1a325212736d9acd3805
parent45987056f0ecc0b6dfc82a59cb336d9d317abe90 (diff)
update to 5.2.0-rc1
raise dependency on PHP 7.2.5 always use bundled libraries
Diffstat
-rw-r--r--composer.json60
-rw-r--r--installed.json1166
-rw-r--r--phpMyAdmin-certs.patch28
-rw-r--r--phpMyAdmin.spec198
4 files changed, 913 insertions, 539 deletions
diff --git a/composer.json b/composer.json
index c980a03..c50a703 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
"autoload": {
"psr-4": {
"PhpMyAdmin\\": "libraries/classes"
- }
+ },
+ "files": ["vendor/phpmyadmin/motranslator/src/functions.php"]
},
"autoload-dev": {
"psr-4": {
@@ -38,36 +39,41 @@
}
],
"require": {
- "php": "^7.1.3 || ^8.0",
+ "php": "^7.2.5 || ^8.0",
"ext-hash": "*",
"ext-iconv": "*",
"ext-json": "*",
"ext-mysqli": "*",
+ "ext-openssl": "*",
"ext-pcre": "*",
"ext-xml": "*",
+ "composer/ca-bundle": "^1.2",
"google/recaptcha": "^1.1",
"nikic/fast-route": "^1.3",
+ "paragonie/sodium_compat": "^1.17",
"phpmyadmin/motranslator": "^5.0",
- "phpmyadmin/shapefile": "^2.0",
+ "phpmyadmin/shapefile": "^3.0.1",
"phpmyadmin/sql-parser": "^5.5",
- "phpmyadmin/twig-i18n-extension": "^3.0",
- "phpseclib/phpseclib": "^2.0",
- "symfony/config": "^4.4.9",
- "symfony/dependency-injection": "^4.4.9",
- "symfony/expression-language": "^4.4.9",
+ "phpmyadmin/twig-i18n-extension": "^4.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0",
+ "slim/psr7": "^1.4",
+ "symfony/config": "^5.2.3",
+ "symfony/dependency-injection": "^5.2.3",
+ "symfony/expression-language": "^5.2.3",
"symfony/polyfill-ctype": "^1.17.0",
"symfony/polyfill-mbstring": "^1.17.0",
- "twig/twig": "^2.14.9 || ^3.3.5",
+ "symfony/polyfill-php80": "^1.16",
+ "twig/twig": "^3.3.5",
+ "webmozart/assert": "^1.10",
"williamdes/mariadb-mysql-kbs": "^1.2"
},
"conflict": {
- "phpseclib/phpseclib": "2.0.8",
- "tecnickcom/tcpdf": "<6.2",
- "pragmarx/google2fa": "<6.1.0 || >8.0",
- "pragmarx/google2fa-qrcode": "<1.0.1"
+ "bacon/bacon-qr-code": "<2.0",
+ "pragmarx/google2fa-qrcode": "<2.1",
+ "tecnickcom/tcpdf": "<6.4.4"
},
"suggest": {
- "ext-openssl": "For encryption performance",
"ext-curl": "Updates checking",
"ext-opcache": "Better performance",
"ext-zlib": "For gz import and export",
@@ -75,24 +81,26 @@
"ext-zip": "For zip import and export",
"ext-gd2": "For image transformations",
"ext-mbstring": "For best performance",
+ "ext-sodium": "Better encryption performance",
"tecnickcom/tcpdf": "For PDF support",
- "pragmarx/google2fa-qrcode": "For 2FA authentication",
- "code-lts/u2f-php-server": "For FIDO U2F authentication",
- "paragonie/sodium_compat": "For modern encryption support"
+ "pragmarx/google2fa-qrcode": "^2.1 - For 2FA authentication",
+ "bacon/bacon-qr-code": "^2.0 - For 2FA authentication",
+ "code-lts/u2f-php-server": "For FIDO U2F authentication"
},
"require-dev": {
+ "bacon/bacon-qr-code": "^2.0",
"code-lts/u2f-php-server": "^1.2",
- "paragonie/sodium_compat": "^1.17",
"php-webdriver/webdriver": "^1.11",
- "phpmyadmin/coding-standard": "^2.1.1",
+ "phpmyadmin/coding-standard": "^3.0.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.3",
"phpstan/phpstan-phpunit": "^1.0",
- "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
- "pragmarx/google2fa-qrcode": "^1.0.1",
- "symfony/console": "^4.4",
- "symfony/finder": "^4.4",
- "symfony/twig-bridge": "^4.4",
+ "phpstan/phpstan-webmozart-assert": "^1.0",
+ "phpunit/phpunit": "^8.5 || ^9.5",
+ "pragmarx/google2fa-qrcode": "^2.1",
+ "psalm/plugin-phpunit": "^0.16.1",
+ "roave/security-advisories": "dev-latest",
+ "symfony/console": "^5.2.3",
"tecnickcom/tcpdf": "^6.4.4",
"vimeo/psalm": "^4.17"
},
@@ -105,7 +113,7 @@
"phpcbf": "phpcbf",
"phpcs": "phpcs",
"phpstan": "phpstan analyse",
- "psalm": "psalm",
+ "psalm": "psalm --no-diff",
"phpunit": "phpunit --color=always",
"test": [
"@phpcs",
@@ -114,7 +122,7 @@
"@phpunit"
],
"update:baselines": "phpstan analyse --generate-baseline && psalm --set-baseline=psalm-baseline.xml",
- "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations"
+ "twig-lint": "php scripts/console lint:twig --ansi --show-deprecations"
},
"config":{
"sort-packages": true,
diff --git a/installed.json b/installed.json
index e732fea..28b385d 100644
--- a/installed.json
+++ b/installed.json
@@ -114,6 +114,85 @@
"install-path": "../code-lts/u2f-php-server"
},
{
+ "name": "composer/ca-bundle",
+ "version": "1.3.1",
+ "version_normalized": "1.3.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/ca-bundle.git",
+ "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+ "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "ext-pcre": "*",
+ "php": "^5.3.2 || ^7.0 || ^8.0"
+ },
+ "require-dev": {
+ "phpstan/phpstan": "^0.12.55",
+ "psr/log": "^1.0",
+ "symfony/phpunit-bridge": "^4.2 || ^5",
+ "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
+ },
+ "time": "2021-10-28T20:44:15+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Composer\\CaBundle\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be"
+ }
+ ],
+ "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+ "keywords": [
+ "cabundle",
+ "cacert",
+ "certificate",
+ "ssl",
+ "tls"
+ ],
+ "support": {
+ "irc": "irc://irc.freenode.org/composer",
+ "issues": "https://github.com/composer/ca-bundle/issues",
+ "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
+ },
+ "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"
+ }
+ ],
+ "install-path": "./ca-bundle"
+ },
+ {
"name": "dasprid/enum",
"version": "1.0.3",
"version_normalized": "1.0.3.0",
@@ -164,6 +243,65 @@
"install-path": "../dasprid/enum"
},
{
+ "name": "fig/http-message-util",
+ "version": "1.1.5",
+ "version_normalized": "1.1.5.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message-util.git",
+ "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message-util/zipball/9d94dc0154230ac39e5bf89398b324a86f63f765",
+ "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3 || ^7.0 || ^8.0"
+ },
+ "suggest": {
+ "psr/http-message": "The package containing the PSR-7 interfaces"
+ },
+ "time": "2020-11-24T22:02:12+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Fig\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "description": "Utility classes and constants for use with PSR-7 (psr/http-message)",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "issues": "https://github.com/php-fig/http-message-util/issues",
+ "source": "https://github.com/php-fig/http-message-util/tree/1.1.5"
+ },
+ "install-path": "../fig/http-message-util"
+ },
+ {
"name": "google/recaptcha",
"version": "1.2.4",
"version_normalized": "1.2.4.0",
@@ -342,6 +480,148 @@
"install-path": "../paragonie/constant_time_encoding"
},
{
+ "name": "paragonie/random_compat",
+ "version": "v9.99.100",
+ "version_normalized": "9.99.100.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a",
+ "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."
+ },
+ "time": "2020-10-15T08:29:30+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "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"
+ ],
+ "support": {
+ "email": "info@paragonie.com",
+ "issues": "https://github.com/paragonie/random_compat/issues",
+ "source": "https://github.com/paragonie/random_compat"
+ },
+ "install-path": "../paragonie/random_compat"
+ },
+ {
+ "name": "paragonie/sodium_compat",
+ "version": "v1.17.0",
+ "version_normalized": "1.17.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/paragonie/sodium_compat.git",
+ "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
+ "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
+ "shasum": ""
+ },
+ "require": {
+ "paragonie/random_compat": ">=1",
+ "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+ },
+ "suggest": {
+ "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+ "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+ },
+ "time": "2021-08-10T02:43:50+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "autoload.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "ISC"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com"
+ },
+ {
+ "name": "Frank Denis",
+ "email": "jedisct1@pureftpd.org"
+ }
+ ],
+ "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+ "keywords": [
+ "Authentication",
+ "BLAKE2b",
+ "ChaCha20",
+ "ChaCha20-Poly1305",
+ "Chapoly",
+ "Curve25519",
+ "Ed25519",
+ "EdDSA",
+ "Edwards-curve Digital Signature Algorithm",
+ "Elliptic Curve Diffie-Hellman",
+ "Poly1305",
+ "Pure-PHP cryptography",
+ "RFC 7748",
+ "RFC 8032",
+ "Salpoly",
+ "Salsa20",
+ "X25519",
+ "XChaCha20-Poly1305",
+ "XSalsa20-Poly1305",
+ "Xchacha20",
+ "Xsalsa20",
+ "aead",
+ "cryptography",
+ "ecdh",
+ "elliptic curve",
+ "elliptic curve cryptography",
+ "encryption",
+ "libsodium",
+ "php",
+ "public-key cryptography",
+ "secret-key cryptography",
+ "side-channel resistant"
+ ],
+ "support": {
+ "issues": "https://github.com/paragonie/sodium_compat/issues",
+ "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
+ },
+ "install-path": "../paragonie/sodium_compat"
+ },
+ {
"name": "phpmyadmin/motranslator",
"version": "5.2.0",
"version_normalized": "5.2.0.0",
@@ -400,30 +680,32 @@
},
{
"name": "phpmyadmin/shapefile",
- "version": "2.1",
- "version_normalized": "2.1.0.0",
+ "version": "3.0.1",
+ "version_normalized": "3.0.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/shapefile.git",
- "reference": "e23b767f2a81f61fee3fc09fc062879985f3e224"
+ "reference": "c232198ef49d3484f26acfe2d12cab103da9371a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpmyadmin/shapefile/zipball/e23b767f2a81f61fee3fc09fc062879985f3e224",
- "reference": "e23b767f2a81f61fee3fc09fc062879985f3e224",
+ "url": "https://api.github.com/repos/phpmyadmin/shapefile/zipball/c232198ef49d3484f26acfe2d12cab103da9371a",
+ "reference": "c232198ef49d3484f26acfe2d12cab103da9371a",
"shasum": ""
},
"require": {
- "php": ">=5.4.0"
+ "php": "^7.1 || ^8.0"
},
"require-dev": {
- "phpunit/php-code-coverage": "*",
- "phpunit/phpunit": "~4.8 || ~5.7"
+ "phpmyadmin/coding-standard": "^2.1.1",
+ "phpstan/phpstan": "^0.12.37",
+ "phpstan/phpstan-phpunit": "^0.12.6",
+ "phpunit/phpunit": "^7.4 || ^8 || ^9"
},
"suggest": {
"ext-dbase": "For dbf files parsing"
},
- "time": "2017-05-15T08:31:47+00:00",
+ "time": "2021-02-06T04:52:58+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -433,7 +715,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "GPL-2.0+"
+ "GPL-2.0-or-later"
],
"authors": [
{
@@ -537,28 +819,30 @@
},
{
"name": "phpmyadmin/twig-i18n-extension",
- "version": "v3.0.0",
- "version_normalized": "3.0.0.0",
+ "version": "v4.0.1",
+ "version_normalized": "4.0.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/twig-i18n-extension.git",
- "reference": "1f509fa3c3f66551e1f4a346e4477c6c0dc76f9e"
+ "reference": "c0d0dd171cd1c7733bf152fd44b61055843df052"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpmyadmin/twig-i18n-extension/zipball/1f509fa3c3f66551e1f4a346e4477c6c0dc76f9e",
- "reference": "1f509fa3c3f66551e1f4a346e4477c6c0dc76f9e",
+ "url": "https://api.github.com/repos/phpmyadmin/twig-i18n-extension/zipball/c0d0dd171cd1c7733bf152fd44b61055843df052",
+ "reference": "c0d0dd171cd1c7733bf152fd44b61055843df052",
"shasum": ""
},
"require": {
- "php": ">=7.1",
+ "php": "^7.1 || ^8.0",
"twig/twig": "^1.42.3|^2.0|^3.0"
},
"require-dev": {
- "phpmyadmin/coding-standard": "^2.0",
+ "phpmyadmin/coding-standard": "^3.0.0",
+ "phpmyadmin/motranslator": "^5.2",
+ "phpstan/phpstan": "^0.12.66",
"phpunit/phpunit": "^7 || ^8 || ^9"
},
- "time": "2020-06-14T07:24:39+00:00",
+ "time": "2021-06-10T15:53:38+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -593,118 +877,6 @@
"install-path": "../phpmyadmin/twig-i18n-extension"
},
{
- "name": "phpseclib/phpseclib",
- "version": "2.0.35",
- "version_normalized": "2.0.35.0",
- "source": {
- "type": "git",
- "url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "4e16cf3f5f927a7d3f5317820af795c0366c0420"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/4e16cf3f5f927a7d3f5317820af795c0366c0420",
- "reference": "4e16cf3f5f927a7d3f5317820af795c0366c0420",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "phing/phing": "~2.7",
- "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4",
- "squizlabs/php_codesniffer": "~2.0"
- },
- "suggest": {
- "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
- "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
- "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
- "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
- },
- "time": "2021-11-28T23:30:39+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "phpseclib/bootstrap.php"
- ],
- "psr-4": {
- "phpseclib\\": "phpseclib/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jim Wigginton",
- "email": "terrafrost@php.net",
- "role": "Lead Developer"
- },
- {
- "name": "Patrick Monnerat",
- "email": "pm@datasphere.ch",
- "role": "Developer"
- },
- {
- "name": "Andreas Fischer",
- "email": "bantu@phpbb.com",
- "role": "Developer"
- },
- {
- "name": "Hans-Jürgen Petrich",
- "email": "petrich@tronic-media.com",
- "role": "Developer"
- },
- {
- "name": "Graham Campbell",
- "email": "graham@alt-three.com",
- "role": "Developer"
- }
- ],
- "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
- "homepage": "http://phpseclib.sourceforge.net",
- "keywords": [
- "BigInteger",
- "aes",
- "asn.1",
- "asn1",
- "blowfish",
- "crypto",
- "cryptography",
- "encryption",
- "rsa",
- "security",
- "sftp",
- "signature",
- "signing",
- "ssh",
- "twofish",
- "x.509",
- "x509"
- ],
- "support": {
- "issues": "https://github.com/phpseclib/phpseclib/issues",
- "source": "https://github.com/phpseclib/phpseclib/tree/2.0.35"
- },
- "funding": [
- {
- "url": "https://github.com/terrafrost",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/phpseclib",
- "type": "patreon"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
- "type": "tidelift"
- }
- ],
- "install-path": "../phpseclib/phpseclib"
- },
- {
"name": "pragmarx/google2fa",
"version": "8.0.0",
"version_normalized": "8.0.0.0",
@@ -761,29 +933,34 @@
},
{
"name": "pragmarx/google2fa-qrcode",
- "version": "v1.0.3",
- "version_normalized": "1.0.3.0",
+ "version": "v2.1.1",
+ "version_normalized": "2.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/antonioribeiro/google2fa-qrcode.git",
- "reference": "fd5ff0531a48b193a659309cc5fb882c14dbd03f"
+ "reference": "0459a5d7bab06b11a09a365288d41a41d2afe63f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/fd5ff0531a48b193a659309cc5fb882c14dbd03f",
- "reference": "fd5ff0531a48b193a659309cc5fb882c14dbd03f",
+ "url": "https://api.github.com/repos/antonioribeiro/google2fa-qrcode/zipball/0459a5d7bab06b11a09a365288d41a41d2afe63f",
+ "reference": "0459a5d7bab06b11a09a365288d41a41d2afe63f",
"shasum": ""
},
"require": {
- "bacon/bacon-qr-code": "~1.0|~2.0",
- "php": ">=5.4",
+ "php": ">=7.1",
"pragmarx/google2fa": ">=4.0"
},
"require-dev": {
+ "bacon/bacon-qr-code": "^2.0",
+ "chillerlan/php-qrcode": "^1.0|^2.0|^3.0|^4.0",
"khanamiryan/qrcode-detector-decoder": "^1.0",
- "phpunit/phpunit": "~4|~5|~6|~7"
+ "phpunit/phpunit": "~4|~5|~6|~7|~8|~9"
},
- "time": "2019-03-20T16:42:58+00:00",
+ "suggest": {
+ "bacon/bacon-qr-code": "For QR Code generation, requires imagick",
+ "chillerlan/php-qrcode": "For QR Code generation"
+ },
+ "time": "2021-07-07T17:06:15+00:00",
"type": "library",
"extra": {
"component": "package",
@@ -820,7 +997,7 @@
],
"support": {
"issues": "https://github.com/antonioribeiro/google2fa-qrcode/issues",
- "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/master"
+ "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/v2.1.1"
},
"install-path": "../pragmarx/google2fa-qrcode"
},
@@ -878,29 +1055,24 @@
},
{
"name": "psr/container",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "1.1.1",
+ "version_normalized": "1.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=7.2.0"
},
- "time": "2017-02-14T16:28:37+00:00",
+ "time": "2021-03-05T17:36:06+00:00",
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
"installation-source": "dist",
"autoload": {
"psr-4": {
@@ -914,7 +1086,7 @@
"authors": [
{
"name": "PHP-FIG",
- "homepage": "http://www.php-fig.org/"
+ "homepage": "https://www.php-fig.org/"
}
],
"description": "Common Container Interface (PHP FIG PSR-11)",
@@ -928,11 +1100,125 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/master"
+ "source": "https://github.com/php-fig/container/tree/1.1.1"
},
"install-path": "../psr/container"
},
{
+ "name": "psr/http-factory",
+ "version": "1.0.1",
+ "version_normalized": "1.0.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-factory.git",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.0.0",
+ "psr/http-message": "^1.0"
+ },
+ "time": "2019-04-30T12:38:16+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interfaces for PSR-7 HTTP message factories",
+ "keywords": [
+ "factory",
+ "http",
+ "message",
+ "psr",
+ "psr-17",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-factory/tree/master"
+ },
+ "install-path": "../psr/http-factory"
+ },
+ {
+ "name": "psr/http-message",
+ "version": "1.0.1",
+ "version_normalized": "1.0.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/php-fig/http-message.git",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2016-08-06T14:39:51+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Psr\\Http\\Message\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "http://www.php-fig.org/"
+ }
+ ],
+ "description": "Common interface for HTTP messages",
+ "homepage": "https://github.com/php-fig/http-message",
+ "keywords": [
+ "http",
+ "http-message",
+ "psr",
+ "psr-7",
+ "request",
+ "response"
+ ],
+ "support": {
+ "source": "https://github.com/php-fig/http-message/tree/master"
+ },
+ "install-path": "../psr/http-message"
+ },
+ {
"name": "psr/log",
"version": "1.1.4",
"version_normalized": "1.1.4.0",
@@ -986,34 +1272,166 @@
"install-path": "../psr/log"
},
{
+ "name": "ralouphie/getallheaders",
+ "version": "3.0.3",
+ "version_normalized": "3.0.3.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ralouphie/getallheaders.git",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+ "reference": "120b605dfeb996808c31b6477290a714d356e822",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6"
+ },
+ "require-dev": {
+ "php-coveralls/php-coveralls": "^2.1",
+ "phpunit/phpunit": "^5 || ^6.5"
+ },
+ "time": "2019-03-08T08:55:37+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "src/getallheaders.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ralph Khattar",
+ "email": "ralph.khattar@gmail.com"
+ }
+ ],
+ "description": "A polyfill for getallheaders.",
+ "support": {
+ "issues": "https://github.com/ralouphie/getallheaders/issues",
+ "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+ },
+ "install-path": "../ralouphie/getallheaders"
+ },
+ {
+ "name": "slim/psr7",
+ "version": "1.4",
+ "version_normalized": "1.4.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/slimphp/Slim-Psr7.git",
+ "reference": "0dca983ca32a26f4a91fb11173b7b9eaee29e9d6"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/0dca983ca32a26f4a91fb11173b7b9eaee29e9d6",
+ "reference": "0dca983ca32a26f4a91fb11173b7b9eaee29e9d6",
+ "shasum": ""
+ },
+ "require": {
+ "fig/http-message-util": "^1.1.5",
+ "php": "^7.2 || ^8.0",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0",
+ "ralouphie/getallheaders": "^3",
+ "symfony/polyfill-php80": "^1.22"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "require-dev": {
+ "adriansuter/php-autoload-override": "^1.2",
+ "ext-json": "*",
+ "http-interop/http-factory-tests": "^0.9.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpstan/phpstan": "^0.12",
+ "phpunit/phpunit": "^8.5 || ^9.5",
+ "squizlabs/php_codesniffer": "^3.6",
+ "weirdan/prophecy-shim": "^1.0 || ^2.0.2"
+ },
+ "time": "2021-05-08T18:22:56+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Slim\\Psr7\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Josh Lockhart",
+ "email": "hello@joshlockhart.com",
+ "homepage": "http://joshlockhart.com"
+ },
+ {
+ "name": "Andrew Smith",
+ "email": "a.smith@silentworks.co.uk",
+ "homepage": "http://silentworks.co.uk"
+ },
+ {
+ "name": "Rob Allen",
+ "email": "rob@akrabat.com",
+ "homepage": "http://akrabat.com"
+ },
+ {
+ "name": "Pierre Berube",
+ "email": "pierre@lgse.com",
+ "homepage": "http://www.lgse.com"
+ }
+ ],
+ "description": "Strict PSR-7 implementation",
+ "homepage": "https://www.slimframework.com",
+ "keywords": [
+ "http",
+ "psr-7",
+ "psr7"
+ ],
+ "support": {
+ "issues": "https://github.com/slimphp/Slim-Psr7/issues",
+ "source": "https://github.com/slimphp/Slim-Psr7/tree/1.4"
+ },
+ "install-path": "../slim/psr7"
+ },
+ {
"name": "symfony/cache",
- "version": "v4.4.36",
- "version_normalized": "4.4.36.0",
+ "version": "v5.4.2",
+ "version_normalized": "5.4.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "1caa6c63f0ebf3022b88263a2b90260cff33f6dc"
+ "reference": "8aad4b69a10c5c51ab54672e78995860f5e447ec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/1caa6c63f0ebf3022b88263a2b90260cff33f6dc",
- "reference": "1caa6c63f0ebf3022b88263a2b90260cff33f6dc",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/8aad4b69a10c5c51ab54672e78995860f5e447ec",
+ "reference": "8aad4b69a10c5c51ab54672e78995860f5e447ec",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
+ "php": ">=7.2.5",
"psr/cache": "^1.0|^2.0",
- "psr/log": "^1|^2|^3",
+ "psr/log": "^1.1|^2|^3",
"symfony/cache-contracts": "^1.1.7|^2",
+ "symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-php73": "^1.9",
"symfony/polyfill-php80": "^1.16",
- "symfony/service-contracts": "^1.1|^2",
- "symfony/var-exporter": "^4.2|^5.0"
+ "symfony/service-contracts": "^1.1|^2|^3",
+ "symfony/var-exporter": "^4.4|^5.0|^6.0"
},
"conflict": {
- "doctrine/dbal": "<2.7",
- "symfony/dependency-injection": "<3.4",
- "symfony/http-kernel": "<4.4|>=5.0",
+ "doctrine/dbal": "<2.13.1",
+ "symfony/dependency-injection": "<4.4",
+ "symfony/http-kernel": "<4.4",
"symfony/var-dumper": "<4.4"
},
"provide": {
@@ -1024,16 +1442,17 @@
"require-dev": {
"cache/integration-tests": "dev-master",
"doctrine/cache": "^1.6|^2.0",
- "doctrine/dbal": "^2.7|^3.0",
+ "doctrine/dbal": "^2.13.1|^3.0",
"predis/predis": "^1.1",
"psr/simple-cache": "^1.0|^2.0",
- "symfony/config": "^4.2|^5.0",
- "symfony/dependency-injection": "^3.4|^4.1|^5.0",
- "symfony/filesystem": "^4.4|^5.0",
- "symfony/http-kernel": "^4.4",
- "symfony/var-dumper": "^4.4|^5.0"
- },
- "time": "2021-12-28T10:59:50+00:00",
+ "symfony/config": "^4.4|^5.0|^6.0",
+ "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+ "symfony/filesystem": "^4.4|^5.0|^6.0",
+ "symfony/http-kernel": "^4.4|^5.0|^6.0",
+ "symfony/messenger": "^4.4|^5.0|^6.0",
+ "symfony/var-dumper": "^4.4|^5.0|^6.0"
+ },
+ "time": "2021-12-28T17:15:56+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1065,7 +1484,7 @@
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v4.4.36"
+ "source": "https://github.com/symfony/cache/tree/v5.4.2"
},
"funding": [
{
@@ -1085,31 +1504,31 @@
},
{
"name": "symfony/cache-contracts",
- "version": "v1.1.11",
- "version_normalized": "1.1.11.0",
+ "version": "v2.5.0",
+ "version_normalized": "2.5.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache-contracts.git",
- "reference": "41c956506500bea5502022f6be81da96fb9c7626"
+ "reference": "ac2e168102a2e06a2624f0379bde94cd5854ced2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/41c956506500bea5502022f6be81da96fb9c7626",
- "reference": "41c956506500bea5502022f6be81da96fb9c7626",
+ "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ac2e168102a2e06a2624f0379bde94cd5854ced2",
+ "reference": "ac2e168102a2e06a2624f0379bde94cd5854ced2",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
+ "php": ">=7.2.5",
"psr/cache": "^1.0|^2.0|^3.0"
},
"suggest": {
"symfony/cache-implementation": ""
},
- "time": "2021-07-13T09:33:53+00:00",
+ "time": "2021-08-17T14:20:01+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.1-dev"
+ "dev-main": "2.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -1147,7 +1566,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/cache-contracts/tree/v1.1.11"
+ "source": "https://github.com/symfony/cache-contracts/tree/v2.5.0"
},
"funding": [
{
@@ -1167,40 +1586,41 @@
},
{
"name": "symfony/config",
- "version": "v4.4.36",
- "version_normalized": "4.4.36.0",
+ "version": "v5.4.2",
+ "version_normalized": "5.4.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "03218ffbd5faeda5e6a97f9109acebf7973ff385"
+ "reference": "2e082dae50da563c639119b7b52347a2a3db4ba5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/03218ffbd5faeda5e6a97f9109acebf7973ff385",
- "reference": "03218ffbd5faeda5e6a97f9109acebf7973ff385",
+ "url": "https://api.github.com/repos/symfony/config/zipball/2e082dae50da563c639119b7b52347a2a3db4ba5",
+ "reference": "2e082dae50da563c639119b7b52347a2a3db4ba5",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
- "symfony/filesystem": "^3.4|^4.0|^5.0",
+ "php": ">=7.2.5",
+ "symfony/deprecation-contracts": "^2.1|^3",
+ "symfony/filesystem": "^4.4|^5.0|^6.0",
"symfony/polyfill-ctype": "~1.8",
"symfony/polyfill-php80": "^1.16",
"symfony/polyfill-php81": "^1.22"
},
"conflict": {
- "symfony/finder": "<3.4"
+ "symfony/finder": "<4.4"
},
"require-dev": {
- "symfony/event-dispatcher": "^3.4|^4.0|^5.0",
- "symfony/finder": "^3.4|^4.0|^5.0",
- "symfony/messenger": "^4.1|^5.0",
- "symfony/service-contracts": "^1.1|^2",
- "symfony/yaml": "^3.4|^4.0|^5.0"
+ "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+ "symfony/finder": "^4.4|^5.0|^6.0",
+ "symfony/messenger": "^4.4|^5.0|^6.0",
+ "symfony/service-contracts": "^1.1|^2|^3",
+ "symfony/yaml": "^4.4|^5.0|^6.0"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
},
- "time": "2021-12-12T15:06:47+00:00",
+ "time": "2021-12-15T11:06:13+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1228,7 +1648,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/config/tree/v4.4.36"
+ "source": "https://github.com/symfony/config/tree/v5.4.2"
},
"funding": [
{
@@ -1248,39 +1668,42 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v4.4.36",
- "version_normalized": "4.4.36.0",
+ "version": "v5.4.2",
+ "version_normalized": "5.4.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "24e802b4973d3a60c01fd77bdaac8a66944202e1"
+ "reference": "ba94559be9738d77cd29e24b5d81cf3b89b7d628"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/24e802b4973d3a60c01fd77bdaac8a66944202e1",
- "reference": "24e802b4973d3a60c01fd77bdaac8a66944202e1",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ba94559be9738d77cd29e24b5d81cf3b89b7d628",
+ "reference": "ba94559be9738d77cd29e24b5d81cf3b89b7d628",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
- "psr/container": "^1.0",
+ "php": ">=7.2.5",
+ "psr/container": "^1.1.1",
+ "symfony/deprecation-contracts": "^2.1|^3",
"symfony/polyfill-php80": "^1.16",
+ "symfony/polyfill-php81": "^1.22",
"symfony/service-contracts": "^1.1.6|^2"
},
"conflict": {
- "symfony/config": "<4.3|>=5.0",
- "symfony/finder": "<3.4",
- "symfony/proxy-manager-bridge": "<3.4",
- "symfony/yaml": "<3.4"
+ "ext-psr": "<1.1|>=2",
+ "symfony/config": "<5.3",
+ "symfony/finder": "<4.4",
+ "symfony/proxy-manager-bridge": "<4.4",
+ "symfony/yaml": "<4.4"
},
"provide": {
"psr/container-implementation": "1.0",
"symfony/service-implementation": "1.0|2.0"
},
"require-dev": {
- "symfony/config": "^4.3",
- "symfony/expression-language": "^3.4|^4.0|^5.0",
- "symfony/yaml": "^4.4|^5.0"
+ "symfony/config": "^5.3|^6.0",
+ "symfony/expression-language": "^4.4|^5.0|^6.0",
+ "symfony/yaml": "^4.4|^5.0|^6.0"
},
"suggest": {
"symfony/config": "",
@@ -1289,7 +1712,7 @@
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
"symfony/yaml": ""
},
- "time": "2021-12-29T10:03:29+00:00",
+ "time": "2021-12-29T10:10:35+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1317,7 +1740,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v4.4.36"
+ "source": "https://github.com/symfony/dependency-injection/tree/v5.4.2"
},
"funding": [
{
@@ -1336,26 +1759,96 @@
"install-path": "../symfony/dependency-injection"
},
{
+ "name": "symfony/deprecation-contracts",
+ "version": "v2.5.0",
+ "version_normalized": "2.5.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/deprecation-contracts.git",
+ "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+ "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "time": "2021-07-12T14:48:14+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-main": "2.5-dev"
+ },
+ "thanks": {
+ "name": "symfony/contracts",
+ "url": "https://github.com/symfony/contracts"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "function.php"
+ ]
+ },
+ "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": "A generic function and convention to trigger deprecation notices",
+ "homepage": "https://symfony.com",
+ "support": {
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
+ },
+ "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"
+ }
+ ],
+ "install-path": "../symfony/deprecation-contracts"
+ },
+ {
"name": "symfony/expression-language",
- "version": "v4.4.34",
- "version_normalized": "4.4.34.0",
+ "version": "v5.4.0",
+ "version_normalized": "5.4.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
- "reference": "6331d834d364cce857e5a83368ce19141d5147bd"
+ "reference": "aff6ee3cf4ac1f37f5c7dad3f89f439dbe0893f2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/expression-language/zipball/6331d834d364cce857e5a83368ce19141d5147bd",
- "reference": "6331d834d364cce857e5a83368ce19141d5147bd",
+ "url": "https://api.github.com/repos/symfony/expression-language/zipball/aff6ee3cf4ac1f37f5c7dad3f89f439dbe0893f2",
+ "reference": "aff6ee3cf4ac1f37f5c7dad3f89f439dbe0893f2",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
- "symfony/cache": "^3.4|^4.0|^5.0",
- "symfony/service-contracts": "^1.1|^2"
+ "php": ">=7.2.5",
+ "symfony/cache": "^4.4|^5.0|^6.0",
+ "symfony/service-contracts": "^1.1|^2|^3"
},
- "time": "2021-11-16T18:00:05+00:00",
+ "time": "2021-11-23T10:19:22+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1383,7 +1876,7 @@
"description": "Provides an engine that can compile and evaluate expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/expression-language/tree/v4.4.34"
+ "source": "https://github.com/symfony/expression-language/tree/v5.4.0"
},
"funding": [
{
@@ -1403,25 +1896,26 @@
},
{
"name": "symfony/filesystem",
- "version": "v4.4.27",
- "version_normalized": "4.4.27.0",
+ "version": "v5.4.0",
+ "version_normalized": "5.4.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "517fb795794faf29086a77d99eb8f35e457837a7"
+ "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/517fb795794faf29086a77d99eb8f35e457837a7",
- "reference": "517fb795794faf29086a77d99eb8f35e457837a7",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01",
+ "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
+ "php": ">=7.2.5",
"symfony/polyfill-ctype": "~1.8",
+ "symfony/polyfill-mbstring": "~1.8",
"symfony/polyfill-php80": "^1.16"
},
- "time": "2021-07-21T12:19:41+00:00",
+ "time": "2021-10-28T13:39:27+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1449,7 +1943,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v4.4.27"
+ "source": "https://github.com/symfony/filesystem/tree/v5.4.0"
},
"funding": [
{
@@ -1639,85 +2133,6 @@
"install-path": "../symfony/polyfill-mbstring"
},
{
- "name": "symfony/polyfill-php72",
- "version": "v1.24.0",
- "version_normalized": "1.24.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
- "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
- "shasum": ""
- },
- "require": {
- "php": ">=7.1"
- },
- "time": "2021-05-27T09:17:38+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-main": "1.23-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php72\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "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.2+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
- },
- "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"
- }
- ],
- "install-path": "../symfony/polyfill-php72"
- },
- {
"name": "symfony/polyfill-php73",
"version": "v1.24.0",
"version_normalized": "1.24.0.0",
@@ -1969,31 +2384,35 @@
},
{
"name": "symfony/service-contracts",
- "version": "v1.1.11",
- "version_normalized": "1.1.11.0",
+ "version": "v2.5.0",
+ "version_normalized": "2.5.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "633df678bec3452e04a7b0337c9bcfe7354124b3"
+ "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/633df678bec3452e04a7b0337c9bcfe7354124b3",
- "reference": "633df678bec3452e04a7b0337c9bcfe7354124b3",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+ "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
- "psr/container": "^1.0"
+ "php": ">=7.2.5",
+ "psr/container": "^1.1",
+ "symfony/deprecation-contracts": "^2.1"
+ },
+ "conflict": {
+ "ext-psr": "<1.1|>=2"
},
"suggest": {
"symfony/service-implementation": ""
},
- "time": "2021-11-04T13:32:43+00:00",
+ "time": "2021-11-04T16:48:04+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.1-dev"
+ "dev-main": "2.5-dev"
},
"thanks": {
"name": "symfony/contracts",
@@ -2031,7 +2450,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v1.1.11"
+ "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
},
"funding": [
{
@@ -2051,27 +2470,27 @@
},
{
"name": "symfony/var-exporter",
- "version": "v4.4.34",
- "version_normalized": "4.4.34.0",
+ "version": "v5.4.2",
+ "version_normalized": "5.4.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "75a297f25a87ce9343d39241679578886f3fd458"
+ "reference": "2360c8525815b8535caac27cbc1994e2fa8644ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/75a297f25a87ce9343d39241679578886f3fd458",
- "reference": "75a297f25a87ce9343d39241679578886f3fd458",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/2360c8525815b8535caac27cbc1994e2fa8644ba",
+ "reference": "2360c8525815b8535caac27cbc1994e2fa8644ba",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
+ "php": ">=7.2.5",
"symfony/polyfill-php80": "^1.16"
},
"require-dev": {
- "symfony/var-dumper": "^4.4.9|^5.0.9"
+ "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
},
- "time": "2021-11-22T10:04:59+00:00",
+ "time": "2021-12-16T21:58:21+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -2107,7 +2526,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v4.4.34"
+ "source": "https://github.com/symfony/var-exporter/tree/v5.4.2"
},
"funding": [
{
@@ -2202,41 +2621,37 @@
},
{
"name": "twig/twig",
- "version": "v2.14.10",
- "version_normalized": "2.14.10.0",
+ "version": "v3.3.7",
+ "version_normalized": "3.3.7.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba"
+ "reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/95fb194cd4dd6ac373a27af2bde2bad5d3f27aba",
- "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
+ "reference": "8f168c6ffa3ce76d1786b3cd52275424a3fc675b",
"shasum": ""
},
"require": {
- "php": ">=7.1.3",
+ "php": ">=7.2.5",
"symfony/polyfill-ctype": "^1.8",
- "symfony/polyfill-mbstring": "^1.3",
- "symfony/polyfill-php72": "^1.8"
+ "symfony/polyfill-mbstring": "^1.3"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
},
- "time": "2022-01-03T21:13:26+00:00",
+ "time": "2022-01-03T21:15:37+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.14-dev"
+ "dev-master": "3.3-dev"
}
},
"installation-source": "dist",
"autoload": {
- "psr-0": {
- "Twig_": "lib/"
- },
"psr-4": {
"Twig\\": "src/"
}
@@ -2269,7 +2684,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v2.14.10"
+ "source": "https://github.com/twigphp/Twig/tree/v3.3.7"
},
"funding": [
{
@@ -2284,6 +2699,67 @@
"install-path": "../twig/twig"
},
{
+ "name": "webmozart/assert",
+ "version": "1.10.0",
+ "version_normalized": "1.10.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/webmozarts/assert.git",
+ "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
+ "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^7.2 || ^8.0",
+ "symfony/polyfill-ctype": "^1.8"
+ },
+ "conflict": {
+ "phpstan/phpstan": "<0.12.20",
+ "vimeo/psalm": "<4.6.1 || 4.6.2"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^8.5.13"
+ },
+ "time": "2021-03-09T10:59:23+00:00",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.10-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Webmozart\\Assert\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bernhard Schussek",
+ "email": "bschussek@gmail.com"
+ }
+ ],
+ "description": "Assertions to validate method input/output with nice error messages.",
+ "keywords": [
+ "assert",
+ "check",
+ "validate"
+ ],
+ "support": {
+ "issues": "https://github.com/webmozarts/assert/issues",
+ "source": "https://github.com/webmozarts/assert/tree/1.10.0"
+ },
+ "install-path": "../webmozart/assert"
+ },
+ {
"name": "williamdes/mariadb-mysql-kbs",
"version": "v1.2.13",
"version_normalized": "1.2.13.0",
diff --git a/phpMyAdmin-certs.patch b/phpMyAdmin-certs.patch
index 9601ab9..15cacac 100644
--- a/phpMyAdmin-certs.patch
+++ b/phpMyAdmin-certs.patch
@@ -1,18 +1,12 @@
-diff -up ./libraries/classes/Utils/HttpRequest.php.rpm ./libraries/classes/Utils/HttpRequest.php
---- ./libraries/classes/Utils/HttpRequest.php.rpm 2019-09-12 15:57:49.955739598 +0200
-+++ ./libraries/classes/Utils/HttpRequest.php 2019-09-12 15:58:00.262698588 +0200
-@@ -141,12 +141,12 @@ class HttpRequest
- *
- * See https://letsencrypt.org/certificates/
- */
-- $certsDir = ROOT_PATH . 'libraries/certs/';
-+ $certsDir = '/etc/pki/tls/';
- /* See code below for logic */
- if ($ssl == CURLOPT_CAPATH) {
- $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAPATH, $certsDir);
- } elseif ($ssl == CURLOPT_CAINFO) {
-- $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAINFO, $certsDir . 'cacert.pem');
-+ $curlStatus &= curl_setopt($curlHandle, CURLOPT_CAINFO, $certsDir . 'cert.pem');
- }
+diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-bundle/src/CaBundle.php
+--- ./vendor/composer/ca-bundle/src/CaBundle.php.rpm 2022-01-24 15:53:57.460789560 +0100
++++ ./vendor/composer/ca-bundle/src/CaBundle.php 2022-01-24 15:55:26.021390384 +0100
+@@ -125,7 +125,7 @@ class CaBundle
+ */
+ public static function getBundledCaBundlePath()
+ {
+- $caBundleFile = __DIR__.'/../res/cacert.pem';
++ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
- $curlStatus &= curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+ // cURL does not understand 'phar://' paths
+ // see https://github.com/composer/ca-bundle/issues/10
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index c37dcff..14daa98 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -12,13 +12,6 @@
#
%{!?_pkgdocdir: %global _pkgdocdir %{_datadir}/doc/%{name}-%{version}}
-# Switch from PHP system libraries to bundled ones
-%if 0%{?fedora}
-%bcond_without syslib
-%else
-%bcond_with syslib
-%endif
-
# remirepo:1
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
# nginx 1.6 with nginx-filesystem
@@ -31,8 +24,8 @@
%global with_httpd 0
%endif
-%global upstream_version 5.1.2
-#global upstream_prever rc2
+%global upstream_version 5.2.0
+%global upstream_prever rc1
Name: phpMyAdmin
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
@@ -42,9 +35,6 @@ Summary: A web interface for MySQL and MariaDB
# MIT (js/jquery/, js/jqplot, js/codemirror/, js/tracekit/)
# BSD (js/openlayers/)
# GPLv2+ (the rest)
-%if %{with syslib}
-License: GPLv2+ and MIT and BSD
-%else
# BSD: bacon/bacon-qr-code, dasprid/enum, google/recaptcha, nikic/fast-route,
# code-lts/u2f-php-server, twig/twig
# MIT: paragonie/constant_time_encoding, phpmyadmin/twig-i18n-extension,
@@ -54,7 +44,6 @@ License: GPLv2+ and MIT and BSD
# LGPLv3: tecnickcom/tcpdf
# MPLv2.0: williamdes/mariadb-mysql-kbs
License: GPLv2+ and MIT and BSD and LGPLv3 and MPLv2.0
-%endif
URL: https://www.phpmyadmin.net/
Source0: https://files.phpmyadmin.net/%{name}/%{upstream_version}%{?upstream_prever:-%upstream_prever}/%{name}-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages.tar.xz
Source1: https://files.phpmyadmin.net/%{name}/%{upstream_version}%{?upstream_prever:-%upstream_prever}/%{name}-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages.tar.xz.asc
@@ -69,14 +58,10 @@ Patch0: phpMyAdmin-certs.patch
BuildArch: noarch
BuildRequires: gnupg2
-%if %{with syslib}
-# ensure dependencies are there
-BuildRequires: php-symfony4-common >= 4.4.9
-%else
# to run phpMyAdmin-bundled.php
+BuildRequires: php(language) >= 7.2.5
BuildRequires: php-cli
BuildRequires: php-json
-%endif
Requires(post): coreutils sed
Requires: webserver
@@ -96,11 +81,12 @@ Requires: php(httpd)
Suggests: httpd
%endif
# From composer.json, "require": {
-# "php": "^7.1.3 || ^8.0",
+# "php": "^7.2.5 || ^8.0",
# "ext-hash": "*",
# "ext-iconv": "*",
# "ext-json": "*",
# "ext-mysqli": "*",
+# "ext-openssl": "*",
# "ext-pcre": "*",
# "ext-xml": "*",
# "google/recaptcha": "^1.1",
@@ -117,118 +103,61 @@ Suggests: httpd
# "symfony/polyfill-mbstring": "^1.17.0",
# "twig/twig": "^2.14.9 || ^3.3.5",
# "williamdes/mariadb-mysql-kbs": "^1.2"
-Requires: php(language) >= 7.1.3
+Requires: php(language) >= 7.2.5
Requires: php-hash
Requires: php-iconv
Requires: php-json
Requires: php-mysqli
+Requires: php-openssl
Requires: php-pcre
Requires: php-xml
-%if %{with syslib}
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(google/recaptcha) >= 1.1 with php-composer(google/recaptcha) < 2)
-Requires: (php-composer(nikic/fast-route) >= 1.3 with php-composer(nikic/fast-route) < 2)
-Requires: (php-composer(phpmyadmin/motranslator) >= 5.0 with php-composer(phpmyadmin/motranslator) < 6)
-Requires: (php-composer(phpmyadmin/shapefile) >= 2.0 with php-composer(phpmyadmin/shapefile) < 3)
-Requires: (php-composer(phpmyadmin/sql-parser) >= 5.5 with php-composer(phpmyadmin/sql-parser) < 6)
-Requires: (php-composer(phpmyadmin/twig-i18n-extension) >= 3.0 with php-composer(phpmyadmin/twig-i18n-extension) < 4)
-Requires: (php-composer(phpseclib/phpseclib) >= 2.0.9 with php-composer(phpseclib/phpseclib) < 3)
-Requires: (php-composer(symfony/config) >= 4.4.9 with php-composer(symfony/config) < 5)
-Requires: (php-composer(symfony/dependency-injection) >= 4.4.9 with php-composer(symfony/dependency-injection) < 5)
-Requires: (php-composer(symfony/expression-language) >= 4.4.9 with php-composer(symfony/expression-language) < 5)
-Requires: (php-composer(symfony/polyfill-mbstring) >= 1.17 with php-composer(symfony/polyfill-mbstring) < 2)
-Requires: (php-composer(twig/twig) >= 2.14.9 with php-composer(twig/twig) < 4)
-Requires: (php-composer(williamdes/mariadb-mysql-kbs) >= 1.2 with php-composer(williamdes/mariadb-mysql-kbs) < 2)
-# remirepo:15
-%else
-Requires: php-google-recaptcha >= 1.1
-Requires: php-nikic-fast-route >= 1.3
-Requires: php-phpmyadmin-motranslator5 >= 5.0
-Requires: php-phpmyadmin-shapefile >= 2.0
-Requires: php-phpmyadmin-sql-parser5 >= 5.5
-Requires: php-phpmyadmin-twig-i18n-extension
-Requires: php-phpseclib >= 2.0.9
-Requires: php-symfony4-config >= 4.4.9
-Requires: php-symfony4-dependency-injection >= 4.4.9
-Requires: php-symfony4-expression-language >= 4.4.9
-Requires: php-symfony-polyfill >= 1.17
-Requires: php-twig2 >= 2.14.9
-Requires: php-williamdes-mariadb-mysql-kbs >= 1.2
-%endif
-# Autoloader
-Requires: php-composer(fedora/autoloader)
-# From composer.json, "suggest": {
-# "ext-openssl": "Cookie encryption",
-# "ext-curl": "Updates checking",
-# "ext-opcache": "Better performance",
-# "ext-zlib": "For gz import and export",
-# "ext-bz2": "For bzip2 import and export",
-# "ext-zip": "For zip import and export",
-# "ext-gd2": "For image transformations",
-# "ext-mbstring": "For best performance",
-# "tecnickcom/tcpdf": "For PDF support",
-# "code-lts/u2f-php-server": "For FIDO U2F authentication",
-# "paragonie/sodium_compat": "For modern encryption support"
-# "conflict": {
-# "phpseclib/phpseclib": "2.0.8",
-# "tecnickcom/tcpdf": "<6.2",
-# "pragmarx/google2fa-qrcode": "<1.0.1"
-# remirepo:1
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
-Recommends: php-opcache
-Recommends: php-composer(tecnickcom/tcpdf) >= 6.3
-Recommends: php-composer(pragmarx/google2fa-qrcode) >= 1.0.1
-Recommends: php-composer(code-lts/u2f-php-server) >= 1.2
-Recommends: php-tcpdf-dejavu-sans-fonts >= 6.2
-# remirepo:6
-%else
-Requires: php-tcpdf >= 6.4.1
-Requires: php-pragmarx-google2fa-qrcode >= 1.0.1
-Requires: php-code-lts-u2f-php-server >= 1.2
-Requires: php-tcpdf-dejavu-sans-fonts >= 6.2
-%endif
-%else
-Provides: bundled(php-bacon-bacon-qr-code) = 2.0.4
+
Provides: bundled(php-code-lts-u2f-php-server) = v1.2.0
+Provides: bundled(php-composer-ca-bundle) = 1.3.1
Provides: bundled(php-dasprid-enum) = 1.0.3
+Provides: bundled(php-fig-http-message-util) = 1.1.5
Provides: bundled(php-google-recaptcha) = 1.2.4
Provides: bundled(php-nikic-fast-route) = v1.3.0
Provides: bundled(php-paragonie-constant-time-encoding) = v2.5.0
+Provides: bundled(php-paragonie-random-compat) = v9.99.100
+Provides: bundled(php-paragonie-sodium-compat) = v1.17.0
Provides: bundled(php-phpmyadmin-motranslator) = 5.2.0
-Provides: bundled(php-phpmyadmin-shapefile) = 2.1
+Provides: bundled(php-phpmyadmin-shapefile) = 3.0.1
Provides: bundled(php-phpmyadmin-sql-parser) = 5.5.0
-Provides: bundled(php-phpmyadmin-twig-i18n-extension) = v3.0.0
-Provides: bundled(php-phpseclib-phpseclib) = 2.0.35
+Provides: bundled(php-phpmyadmin-twig-i18n-extension) = v4.0.1
Provides: bundled(php-pragmarx-google2fa) = 8.0.0
-Provides: bundled(php-pragmarx-google2fa-qrcode) = v1.0.3
+Provides: bundled(php-pragmarx-google2fa-qrcode) = v2.1.1
Provides: bundled(php-psr-cache) = 1.0.1
-Provides: bundled(php-psr-container) = 1.0.0
+Provides: bundled(php-psr-container) = 1.1.1
+Provides: bundled(php-psr-http-factory) = 1.0.1
+Provides: bundled(php-psr-http-message) = 1.0.1
Provides: bundled(php-psr-log) = 1.1.4
-Provides: bundled(php-symfony-cache) = v4.4.36
-Provides: bundled(php-symfony-cache-contracts) = v1.1.11
-Provides: bundled(php-symfony-config) = v4.4.36
-Provides: bundled(php-symfony-dependency-injection) = v4.4.36
-Provides: bundled(php-symfony-expression-language) = v4.4.34
-Provides: bundled(php-symfony-filesystem) = v4.4.27
+Provides: bundled(php-ralouphie-getallheaders) = 3.0.3
+Provides: bundled(php-slim-psr7) = 1.4
+Provides: bundled(php-symfony-cache) = v5.4.2
+Provides: bundled(php-symfony-cache-contracts) = v2.5.0
+Provides: bundled(php-symfony-config) = v5.4.2
+Provides: bundled(php-symfony-dependency-injection) = v5.4.2
+Provides: bundled(php-symfony-deprecation-contracts) = v2.5.0
+Provides: bundled(php-symfony-expression-language) = v5.4.0
+Provides: bundled(php-symfony-filesystem) = v5.4.0
Provides: bundled(php-symfony-polyfill-ctype) = v1.24.0
Provides: bundled(php-symfony-polyfill-mbstring) = v1.24.0
-Provides: bundled(php-symfony-polyfill-php72) = v1.24.0
Provides: bundled(php-symfony-polyfill-php73) = v1.24.0
Provides: bundled(php-symfony-polyfill-php80) = v1.24.0
Provides: bundled(php-symfony-polyfill-php81) = v1.24.0
-Provides: bundled(php-symfony-service-contracts) = v1.1.11
-Provides: bundled(php-symfony-var-exporter) = v4.4.34
+Provides: bundled(php-symfony-service-contracts) = v2.5.0
+Provides: bundled(php-symfony-var-exporter) = v5.4.2
Provides: bundled(php-tecnickcom-tcpdf) = 6.4.4
-Provides: bundled(php-twig-twig) = v2.14.10
+Provides: bundled(php-twig-twig) = v3.3.7
+Provides: bundled(php-webmozart-assert) = 1.10.0
Provides: bundled(php-williamdes-mariadb-mysql-kbs) = v1.2.13
+
Requires: php-dom
Requires: php-intl
Requires: php-posix
# php-tidy required by tcpdf is not used (fixHTMLCode)
-%endif
Requires: php-ctype
-Requires: php-openssl
Requires: php-curl
Requires: php-zlib
Requires: php-bz2
@@ -277,6 +206,7 @@ is available in 50 languages
%setup -qn phpMyAdmin-%{upstream_version}%{?upstream_prever:-%upstream_prever}-all-languages
%patch0 -p1
+rm -r vendor/composer/ca-bundle/res/
# Minimal configuration file
sed -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \
@@ -285,57 +215,21 @@ sed -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \
config.sample.inc.php >CONFIG
# Setup vendor config file
-sed -e "/'CHANGELOG_FILE'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
- -e "/'LICENSE_FILE'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
- -e "/'CONFIG_DIR'/s@ROOT_PATH@'%{_sysconfdir}/%{name}/'@" \
+sed -e "/'changeLogFile'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
+ -e "/'licenseFile'/s@ROOT_PATH@'%{_pkgdocdir}/'@" \
+ -e "/'configFile'/s@ROOT_PATH@'%{_sysconfdir}/%{name}/'@" \
%if 0%{?_licensedir:1}
- -e '/LICENSE_FILE/s:%_defaultdocdir:%_defaultlicensedir:' \
+ -e '/licenseFile/s:%_defaultdocdir:%_defaultlicensedir:' \
%endif
- -e "/VERSION_SUFFIX/s/''/'-%{release}'/" \
- -e '/AUTOLOAD_FILE/s@./vendor@%{_datadir}/%{name}/vendor@' \
- -e "/TEMP_DIR/s@ROOT.*tmp'@'%{_localstatedir}/lib/%{name}/temp'@" \
- -e "/CACHE_DIR/s@ROOT.*cache'@'%{_localstatedir}/lib/%{name}/cache'@" \
+ -e "/versionSuffix/s/''/'-%{release}'/" \
+ -e "/tempDir/s@ROOT.*tmp'@'%{_localstatedir}/lib/%{name}/temp'@" \
+ -e "/cacheDir/s@ROOT.*cache'@'%{_localstatedir}/lib/%{name}/cache'@" \
-i libraries/vendor_config.php
# For debug
-grep '^define' libraries/vendor_config.php
-
-%if %{with syslib}
-# Generate autoloader
-rm -rf vendor/*
-cat << 'EOF' | tee vendor/autoload.php
-<?php
-/* Autoloader for phpMyAdmin and its dependencies */
-
-require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('PhpMyAdmin\\', dirname(__DIR__) . '/libraries/classes');
-\Fedora\Autoloader\Dependencies::required([
- '%{_datadir}/php/FastRoute/autoload.php',
- '%{_datadir}/php/PhpMyAdmin/MoTranslator5/autoload.php', /* before sqlparser which may allow other version */
- '%{_datadir}/php/PhpMyAdmin/SqlParser5/autoload.php',
- '%{_datadir}/php/PhpMyAdmin/ShapeFile/autoload.php',
- '%{_datadir}/php/phpseclib/autoload.php',
- '%{_datadir}/php/ReCaptcha/autoload.php',
- [
- '%{_datadir}/php/Twig3/autoload.php',
- '%{_datadir}/php/Twig2/autoload.php',
- ],
- '%{_datadir}/php/PhpMyAdmin/Twig/Extensions/autoload.php',
- '%{_datadir}/php/Symfony4/Component/Config/autoload.php',
- '%{_datadir}/php/Symfony4/Component/DependencyInjection/autoload.php',
- '%{_datadir}/php/Symfony4/Component/ExpressionLanguage/autoload.php',
- '%{_datadir}/php/Symfony/Polyfill/autoload.php',
- '%{_datadir}/php/Williamdes/MariaDBMySQLKBS/autoload.php',
-]);
-\Fedora\Autoloader\Dependencies::optional([
- '%{_datadir}/php/tcpdf/autoload.php',
- '%{_datadir}/php/PragmaRX/Google2FAQRCode/autoload.php',
- '%{_datadir}/php/CodeLts/U2F/U2FServer/autoload.php',
-]);
-EOF
-%else
+grep '=>' libraries/vendor_config.php
+
php %{SOURCE5} vendor/composer/installed.json
-%endif
%build
@@ -370,9 +264,6 @@ mv %{buildroot}%{_datadir}/%{name}/libraries/cache %{buildroot}/%{_localstat
#rm -r %%{buildroot}%%{_datadir}/%{name}/js/jquery/src
#rm -r %%{buildroot}%%{_datadir}/%{name}/js/openlayers/src
-# Bundled certificates
-rm -r %{buildroot}%{_datadir}/%{name}/libraries/certs
-
# documentation
rm -rf %{buildroot}%{_datadir}/%{name}/examples/
rm -rf %{buildroot}%{_datadir}/%{name}/doc/
@@ -420,6 +311,11 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \
%changelog
+* Mon Jan 24 2022 Remi Collet <remi@remirepo.net> - 5.2.0~rc1-1
+- update to 5.2.0-rc1
+- raise dependency on PHP 7.2.5
+- always use bundled libraries
+
* Sun Jan 23 2022 Remi Collet <remi@remirepo.net> - 5.1.2-1
- update to 5.1.2 (2022-01-22, security and bugfix release)
- raise dependency on phpmyadmin/sql-parser 5.5
generated by cgit (git 2.34.1) at 2024-11-17 20:17:08 +0000