From e246ab03e94da225ca0d18c2148aa4d4786f88a2 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 22 Feb 2022 22:58:57 +0100 Subject: [PATCH] Partial PHP 8 compatibility But we still need to update rinvex/countries --- composer.json | 52 ++++----- composer.lock | 288 +++++++++++++++++++++++--------------------------- 2 files changed, 157 insertions(+), 183 deletions(-) diff --git a/composer.json b/composer.json index 9fc941c..72e6468 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,8 @@ { "name": "rudloff/alltube", - "type": "project", "description": "HTML GUI for youtube-dl", - "homepage": "https://alltubedownload.net/", "license": "GPL-3.0-only", + "type": "project", "authors": [ { "name": "Pierre Rudloff", @@ -18,6 +17,7 @@ "role": "Designer" } ], + "homepage": "https://alltubedownload.net/", "require": { "php": ">=7.3", "ext-intl": "*", @@ -42,7 +42,7 @@ "require-dev": { "consolidation/robo": "^2.1", "enlightn/security-checker": "^1.4", - "ergebnis/composer-normalize": "^2.6", + "ergebnis/composer-normalize": "^2.20", "insite/composer-dangling-locked-deps": "^0.2.1", "junker/debugbar-smarty": "^0.1.0", "kitchenu/slim-debugbar": "^1.1", @@ -57,6 +57,29 @@ "symfony/error-handler": "^5.4", "symfony/var-dumper": "^5.4" }, + "repositories": [ + { + "type": "package", + "package": { + "name": "ytdl-org/youtube-dl", + "version": "2021.12.17", + "dist": { + "type": "tar", + "url": "https://yt-dl.org/downloads/2021.12.17/youtube-dl-2021.12.17.tar.gz" + } + } + } + ], + "autoload": { + "psr-4": { + "Alltube\\": "classes/" + } + }, + "autoload-dev": { + "psr-4": { + "Alltube\\Test\\": "tests/" + } + }, "config": { "platform": { "php": "7.3.11" @@ -76,29 +99,6 @@ "library" ] }, - "autoload": { - "psr-4": { - "Alltube\\": "classes/" - } - }, - "autoload-dev": { - "psr-4": { - "Alltube\\Test\\": "tests/" - } - }, - "repositories": [ - { - "type": "package", - "package": { - "name": "ytdl-org/youtube-dl", - "version": "2021.12.17", - "dist": { - "type": "tar", - "url": "https://yt-dl.org/downloads/2021.12.17/youtube-dl-2021.12.17.tar.gz" - } - } - } - ], "scripts": { "lint": "grumphp run --ansi", "release": "robo release --ansi", diff --git a/composer.lock b/composer.lock index ac02ce5..29a4a78 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": "f8a4cb982920f807202eee5f0807882f", + "content-hash": "f0b1941ee7bf6b47d0e64b985820f67f", "packages": [ { "name": "aura/session", @@ -259,24 +259,24 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.10.99", + "version": "1.11.99.5", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "dd51b4443d58b34b6d9344cf4c288e621c9a826f" + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/dd51b4443d58b34b6d9344cf4c288e621c9a826f", - "reference": "dd51b4443d58b34b6d9344cf4c288e621c9a826f", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", "shasum": "" }, "require": { "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7" + "php": "^7 || ^8" }, "replace": { - "ocramius/package-versions": "1.10.99" + "ocramius/package-versions": "1.11.99" }, "require-dev": { "composer/composer": "^1.9.3 || ^2.0@dev", @@ -312,7 +312,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.10.99" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" }, "funding": [ { @@ -328,7 +328,7 @@ "type": "tidelift" } ], - "time": "2020-07-15T08:39:18+00:00" + "time": "2022-01-17T14:14:24+00:00" }, { "name": "consolidation/log", @@ -598,21 +598,27 @@ }, { "name": "jawira/case-converter", - "version": "v3.4.1", + "version": "v3.4.6", "source": { "type": "git", "url": "https://github.com/jawira/case-converter.git", - "reference": "756089a523ce268fb173a9f4af4ca95629b3a7f0" + "reference": "2f284c0760ee8085ab463f57275cf1f887fb78ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jawira/case-converter/zipball/756089a523ce268fb173a9f4af4ca95629b3a7f0", - "reference": "756089a523ce268fb173a9f4af4ca95629b3a7f0", + "url": "https://api.github.com/repos/jawira/case-converter/zipball/2f284c0760ee8085ab463f57275cf1f887fb78ae", + "reference": "2f284c0760ee8085ab463f57275cf1f887fb78ae", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^7.1" + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "behat/behat": "^3.0", + "phpstan/phpstan": "^1.0", + "phpunit/phpunit": "^9.0", + "vimeo/psalm": "^4.0" }, "suggest": { "pds/skeleton": "PHP Package Development Standards", @@ -631,8 +637,7 @@ "authors": [ { "name": "Jawira Portugal", - "email": "dev@tugal.be", - "homepage": "http://jawira.com/" + "email": "dev@tugal.be" } ], "description": "Convert strings between 13 naming conventions: Snake case, Camel case, Pascal case, Kebab case, Ada case, Train case, Cobol case, Macro case, Upper case, Lower case, Sentence case, Title case and Dot notation.", @@ -654,9 +659,9 @@ ], "support": { "issues": "https://github.com/jawira/case-converter/issues", - "source": "https://github.com/jawira/case-converter/tree/v3.4.1" + "source": "https://github.com/jawira/case-converter/tree/v3.4.6" }, - "time": "2019-12-15T14:31:43+00:00" + "time": "2021-11-21T19:52:51+00:00" }, { "name": "jean85/pretty-package-versions", @@ -1004,24 +1009,24 @@ }, { "name": "pimple/pimple", - "version": "v3.3.0", + "version": "v3.3.1", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "e55d12f9d6a0e7f9c85992b73df1267f46279930" + "reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/e55d12f9d6a0e7f9c85992b73df1267f46279930", - "reference": "e55d12f9d6a0e7f9c85992b73df1267f46279930", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/21e45061c3429b1e06233475cc0e1f6fc774d5b0", + "reference": "21e45061c3429b1e06233475cc0e1f6fc774d5b0", "shasum": "" }, "require": { - "php": "^7.2.5", + "php": ">=7.2.5", "psr/container": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4|^4.4|^5.0" + "symfony/phpunit-bridge": "^5.0" }, "type": "library", "extra": { @@ -1051,10 +1056,9 @@ "dependency injection" ], "support": { - "issues": "https://github.com/silexphp/Pimple/issues", - "source": "https://github.com/silexphp/Pimple/tree/master" + "source": "https://github.com/silexphp/Pimple/tree/v3.3.1" }, - "time": "2020-03-03T09:12:48+00:00" + "time": "2020-11-24T20:35:42+00:00" }, { "name": "psr/container", @@ -4087,43 +4091,43 @@ }, { "name": "ergebnis/composer-normalize", - "version": "2.6.0", + "version": "2.20.0", "source": { "type": "git", "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "ad7a07896aaf513bdcda7ef883c793a344c04aba" + "reference": "c172e90a0afa77f2665031dfde3fccb9415bddd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/ad7a07896aaf513bdcda7ef883c793a344c04aba", - "reference": "ad7a07896aaf513bdcda7ef883c793a344c04aba", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/c172e90a0afa77f2665031dfde3fccb9415bddd7", + "reference": "c172e90a0afa77f2665031dfde3fccb9415bddd7", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1.0 || ^2.0.0", - "ergebnis/json-normalizer": "~0.12.0", - "ergebnis/json-printer": "^3.0.2", - "justinrainbow/json-schema": "^5.2.10", - "localheinz/diff": "^1.0.1", - "php": "^7.1 || ^8.0" + "composer-plugin-api": "^2.0.0", + "ergebnis/json-normalizer": "^1.0.3", + "ergebnis/json-printer": "^3.1.1", + "justinrainbow/json-schema": "^5.2.11", + "localheinz/diff": "^1.1.1", + "php": "^7.3 || ^8.0" }, "require-dev": { - "composer/composer": "^1.10.8 || ^2.0.0", - "composer/package-versions-deprecated": "^1.8.1", - "ergebnis/phpstan-rules": "~0.15.0", - "ergebnis/test-util": "~1.0.0", - "jangregor/phpstan-prophecy": "~0.8.0", - "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan": "~0.12.32", - "phpstan/phpstan-deprecation-rules": "~0.12.4", - "phpstan/phpstan-phpunit": "~0.12.11", - "phpstan/phpstan-strict-rules": "~0.12.2", - "phpunit/phpunit": "^7.5.20", - "symfony/filesystem": "^4.4.9" + "composer/composer": "^2.2.1", + "ergebnis/license": "^1.1.0", + "ergebnis/php-cs-fixer-config": "^3.4.0", + "fakerphp/faker": "^1.17.0", + "phpunit/phpunit": "^9.5.11", + "psalm/plugin-phpunit": "~0.16.1", + "symfony/filesystem": "^5.4.0", + "vimeo/psalm": "^4.16.1" }, "type": "composer-plugin", "extra": { - "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin" + "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin", + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } }, "autoload": { "psr-4": { @@ -4153,64 +4157,48 @@ "source": "https://github.com/ergebnis/composer-normalize" }, "funding": [ - { - "url": "https://cottonbureau.com/people/andreas-moller", - "type": "custom" - }, - { - "url": "https://paypal.me/localheinz", - "type": "custom" - }, - { - "url": "https://www.amazon.de/hz/wishlist/ls/2NCHMSJ4BC1OW", - "type": "custom" - }, - { - "url": "https://www.buymeacoffee.com/localheinz", - "type": "custom" - }, { "url": "https://github.com/localheinz", "type": "github" } ], - "time": "2020-07-03T18:09:23+00:00" + "time": "2021-12-28T11:05:22+00:00" }, { "name": "ergebnis/json-normalizer", - "version": "0.12.0", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "0197447cd5d8f7e82116e904196a3e9f470655db" + "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/0197447cd5d8f7e82116e904196a3e9f470655db", - "reference": "0197447cd5d8f7e82116e904196a3e9f470655db", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/4a7f064ce34d5a2e382564565cdd433dbc5b9494", + "reference": "4a7f064ce34d5a2e382564565cdd433dbc5b9494", "shasum": "" }, "require": { - "ergebnis/json-printer": "^3.0.2", + "ergebnis/json-printer": "^3.1.1", "ext-json": "*", - "justinrainbow/json-schema": "^4.0.0 || ^5.0.0", - "php": "^7.1" + "justinrainbow/json-schema": "^5.2.10", + "php": "^7.2 || ^8.0" }, "require-dev": { - "ergebnis/license": "~0.1.0", - "ergebnis/php-cs-fixer-config": "^2.1.2", - "ergebnis/phpstan-rules": "~0.14.4", - "ergebnis/test-util": "~1.0.0", - "infection/infection": "~0.13.6", - "jangregor/phpstan-prophecy": "~0.6.2", - "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan": "~0.12.18", - "phpstan/phpstan-deprecation-rules": "~0.12.2", - "phpstan/phpstan-phpunit": "~0.12.8", - "phpstan/phpstan-strict-rules": "~0.12.2", - "phpunit/phpunit": "^7.5.20", - "psalm/plugin-phpunit": "~0.10.0", - "vimeo/psalm": "^3.11.2" + "ergebnis/license": "^1.1.0", + "ergebnis/php-cs-fixer-config": "^2.10.0", + "ergebnis/phpstan-rules": "~0.15.3", + "ergebnis/test-util": "^1.4.0", + "infection/infection": "~0.15.3", + "jangregor/phpstan-prophecy": "~0.8.1", + "phpstan/extension-installer": "^1.1.0", + "phpstan/phpstan": "~0.12.80", + "phpstan/phpstan-deprecation-rules": "~0.12.6", + "phpstan/phpstan-phpunit": "~0.12.17", + "phpstan/phpstan-strict-rules": "~0.12.9", + "phpunit/phpunit": "^8.5.14", + "psalm/plugin-phpunit": "~0.12.2", + "vimeo/psalm": "^3.18" }, "type": "library", "autoload": { @@ -4239,58 +4227,46 @@ "source": "https://github.com/ergebnis/json-normalizer" }, "funding": [ - { - "url": "https://paypal.me/localheinz", - "type": "custom" - }, - { - "url": "https://www.amazon.de/hz/wishlist/ls/2NCHMSJ4BC1OW", - "type": "custom" - }, - { - "url": "https://www.buymeacoffee.com/localheinz", - "type": "custom" - }, { "url": "https://github.com/localheinz", "type": "github" } ], - "time": "2020-04-19T12:30:41+00:00" + "time": "2021-03-06T13:33:57+00:00" }, { "name": "ergebnis/json-printer", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/ergebnis/json-printer.git", - "reference": "776a5c85ce3c67d97c6af08a67c917adbdb4758e" + "reference": "e4190dadd9937a77d8afcaf2b6c42a528ab367d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/776a5c85ce3c67d97c6af08a67c917adbdb4758e", - "reference": "776a5c85ce3c67d97c6af08a67c917adbdb4758e", + "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/e4190dadd9937a77d8afcaf2b6c42a528ab367d6", + "reference": "e4190dadd9937a77d8afcaf2b6c42a528ab367d6", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "ergebnis/license": "~1.0.0", + "ergebnis/license": "^1.0.0", "ergebnis/php-cs-fixer-config": "^2.2.1", - "ergebnis/phpstan-rules": "~0.15.0", - "ergebnis/test-util": "~1.0.0", - "infection/infection": "~0.13.6", + "ergebnis/phpstan-rules": "~0.15.2", + "ergebnis/test-util": "^1.1.0", + "infection/infection": "~0.15.3", "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan": "~0.12.32", - "phpstan/phpstan-deprecation-rules": "~0.12.4", - "phpstan/phpstan-phpunit": "~0.12.11", - "phpstan/phpstan-strict-rules": "~0.12.2", - "phpunit/phpunit": "^7.5.20", - "psalm/plugin-phpunit": "~0.10.1", - "vimeo/psalm": "^3.12.2" + "phpstan/phpstan": "~0.12.40", + "phpstan/phpstan-deprecation-rules": "~0.12.5", + "phpstan/phpstan-phpunit": "~0.12.16", + "phpstan/phpstan-strict-rules": "~0.12.4", + "phpunit/phpunit": "^8.5.8", + "psalm/plugin-phpunit": "~0.11.0", + "vimeo/psalm": "^3.14.2" }, "type": "library", "autoload": { @@ -4320,28 +4296,12 @@ "source": "https://github.com/ergebnis/json-printer" }, "funding": [ - { - "url": "https://cottonbureau.com/people/andreas-moller", - "type": "custom" - }, - { - "url": "https://paypal.me/localheinz", - "type": "custom" - }, - { - "url": "https://www.amazon.de/hz/wishlist/ls/2NCHMSJ4BC1OW", - "type": "custom" - }, - { - "url": "https://www.buymeacoffee.com/localheinz", - "type": "custom" - }, { "url": "https://github.com/localheinz", "type": "github" } ], - "time": "2020-07-04T17:09:39+00:00" + "time": "2020-08-30T12:17:03+00:00" }, { "name": "gitonomy/gitlib", @@ -4655,16 +4615,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.10", + "version": "5.2.11", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b" + "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", - "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa", + "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa", "shasum": "" }, "require": { @@ -4719,9 +4679,9 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.10" + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11" }, - "time": "2020-05-27T16:41:55+00:00" + "time": "2021-07-22T09:24:00+00:00" }, { "name": "kitchenu/slim-debugbar", @@ -4776,21 +4736,21 @@ }, { "name": "league/container", - "version": "2.4.1", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0" + "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/43f35abd03a12977a60ffd7095efd6a7808488c0", - "reference": "43f35abd03a12977a60ffd7095efd6a7808488c0", + "url": "https://api.github.com/repos/thephpleague/container/zipball/8438dc47a0674e3378bcce893a0a04d79a2c22b3", + "reference": "8438dc47a0674e3378bcce893a0a04d79a2c22b3", "shasum": "" }, "require": { "container-interop/container-interop": "^1.2", - "php": "^5.4.0 || ^7.0" + "php": "^5.4 || ^7.0 || ^8.0" }, "provide": { "container-interop/container-interop-implementation": "^1.2", @@ -4800,7 +4760,9 @@ "orno/di": "~2.0" }, "require-dev": { - "phpunit/phpunit": "4.*" + "phpunit/phpunit": "^4.8.36", + "scrutinizer/ocular": "^1.3", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { @@ -4839,30 +4801,36 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/2.x" + "source": "https://github.com/thephpleague/container/tree/2.5.0" }, - "time": "2017-05-10T09:20:27+00:00" + "funding": [ + { + "url": "https://github.com/philipobenito", + "type": "github" + } + ], + "time": "2021-02-22T09:20:06+00:00" }, { "name": "localheinz/diff", - "version": "1.0.1", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/localheinz/diff.git", - "reference": "bd5661db4bbed26c6f25df8851fd9f4b424a356e" + "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/localheinz/diff/zipball/bd5661db4bbed26c6f25df8851fd9f4b424a356e", - "reference": "bd5661db4bbed26c6f25df8851fd9f4b424a356e", + "url": "https://api.github.com/repos/localheinz/diff/zipball/851bb20ea8358c86f677f5f111c4ab031b1c764c", + "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.1 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "symfony/process": "^4.2 || ^5" }, "type": "library", "autoload": { @@ -4885,7 +4853,7 @@ } ], "description": "Fork of sebastian/diff for use with ergebnis/composer-normalize", - "homepage": "https://github.com/sebastianbergmann/diff", + "homepage": "https://github.com/localheinz/diff", "keywords": [ "diff", "udiff", @@ -4893,9 +4861,15 @@ "unified diff" ], "support": { - "source": "https://github.com/localheinz/diff/tree/master" + "source": "https://github.com/localheinz/diff/tree/main" }, - "time": "2019-12-17T07:42:37+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-07-06T04:49:32+00:00" }, { "name": "maximebf/debugbar",