maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

switch from algo26-matthias/idna-covert to our own fork as we cannot update to >2.1 without having a minimum requirement for php-7.2 but we need a few fixes for php-7.4 support later on

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-01-03 12:48:01 +01:00
parent b4dedca3db
commit 25d0bbb766
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -46,7 +46,7 @@
"phpmailer/phpmailer": "~6.0", "phpmailer/phpmailer": "~6.0",
"monolog/monolog": "^1.24", "monolog/monolog": "^1.24",
"robthree/twofactorauth": "^1.6", "robthree/twofactorauth": "^1.6",
"algo26-matthias/idna-convert": "^2.1" "froxlor/idna-convert-legacy": "^2.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "8.4.1", "phpunit/phpunit": "8.4.1",

21
composer.lock generated
View File

@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5699c65bbdcd2a61a9ced0ac7be84d64", "content-hash": "a7ba15333ffb4a758ea65039b589545b",
"packages": [ "packages": [
{ {
"name": "algo26-matthias/idna-convert", "name": "froxlor/idna-convert-legacy",
"version": "v2.1.0", "version": "v2.1.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/algo26-matthias/idna-convert.git", "url": "https://github.com/Froxlor/idna-convert-legacy.git",
"reference": "2717d05713454991936bc581d068c6cea0d84e3b" "reference": "09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/2717d05713454991936bc581d068c6cea0d84e3b", "url": "https://api.github.com/repos/Froxlor/idna-convert-legacy/zipball/09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7",
"reference": "2717d05713454991936bc581d068c6cea0d84e3b", "reference": "09c1db623ba19e1ed8f2f9dabc15eeda9dc713b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -43,6 +43,11 @@
"name": "Matthias Sommerfeld", "name": "Matthias Sommerfeld",
"email": "matthias.sommerfeld@algo26.de", "email": "matthias.sommerfeld@algo26.de",
"role": "Developer" "role": "Developer"
},
{
"name": "Michael Kaufmann (d00p)",
"email": "d00p@froxlor.org",
"role": "Developer"
} }
], ],
"description": "A library for encoding and decoding internationalized domain names", "description": "A library for encoding and decoding internationalized domain names",
@@ -52,7 +57,7 @@
"idna", "idna",
"php" "php"
], ],
"time": "2019-03-04T17:07:46+00:00" "time": "2019-12-31T12:16:30+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",