From f714e6fa14c949f7c147cfdfbaab35a20ea70676 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 27 Nov 2020 14:13:59 +0200 Subject: [PATCH] PHP 8 fixes (part 2) --- composer.lock | 275 +++++++----------- .../Traits/ControllerResponseTrait.php | 2 +- 2 files changed, 107 insertions(+), 170 deletions(-) diff --git a/composer.lock b/composer.lock index c0c1241cc..899658c3e 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": "5018a33d28d9548d37318a86986c8d07", + "content-hash": "13d9162e932f8b9c46210416d34d6e1a", "packages": [ { "name": "antoligy/dom-string-iterators", @@ -390,10 +390,6 @@ } ], "description": "An SVG sanitizer for PHP", - "support": { - "issues": "https://github.com/darylldoyle/svg-sanitizer/issues", - "source": "https://github.com/darylldoyle/svg-sanitizer/tree/develop" - }, "time": "2020-01-20T01:34:17+00:00" }, { @@ -440,10 +436,6 @@ "markdown", "parser" ], - "support": { - "issues": "https://github.com/erusev/parsedown/issues", - "source": "https://github.com/erusev/parsedown/tree/1.7.x" - }, "time": "2019-12-30T22:54:17+00:00" }, { @@ -491,10 +483,6 @@ "parsedown", "parser" ], - "support": { - "issues": "https://github.com/erusev/parsedown-extra/issues", - "source": "https://github.com/erusev/parsedown-extra/tree/0.8.x" - }, "time": "2019-12-30T23:20:37+00:00" }, { @@ -556,10 +544,6 @@ "throwable", "whoops" ], - "support": { - "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.9.1" - }, "time": "2020-11-01T12:00:00+00:00" }, { @@ -730,16 +714,16 @@ }, { "name": "itsgoingd/clockwork", - "version": "v5.0.1", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/itsgoingd/clockwork.git", - "reference": "a6665903018ea5ac2d0219ccb6e9e03ed1339c3f" + "reference": "6e351e0f2cdd5b8999c1bca95476372eb40333b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/a6665903018ea5ac2d0219ccb6e9e03ed1339c3f", - "reference": "a6665903018ea5ac2d0219ccb6e9e03ed1339c3f", + "url": "https://api.github.com/repos/itsgoingd/clockwork/zipball/6e351e0f2cdd5b8999c1bca95476372eb40333b2", + "reference": "6e351e0f2cdd5b8999c1bca95476372eb40333b2", "shasum": "" }, "require": { @@ -785,7 +769,7 @@ "profiling", "slim" ], - "time": "2020-11-22T00:14:53+00:00" + "time": "2020-11-24T16:24:08+00:00" }, { "name": "kodus/psr7-server", @@ -901,10 +885,6 @@ "php", "terminal" ], - "support": { - "issues": "https://github.com/thephpleague/climate/issues", - "source": "https://github.com/thephpleague/climate/tree/3.6.0" - }, "time": "2020-10-04T16:02:59+00:00" }, { @@ -1368,24 +1348,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": { @@ -1414,11 +1394,7 @@ "container", "dependency injection" ], - "support": { - "issues": "https://github.com/silexphp/Pimple/issues", - "source": "https://github.com/silexphp/Pimple/tree/master" - }, - "time": "2020-03-03T09:12:48+00:00" + "time": "2020-11-24T20:35:42+00:00" }, { "name": "psr/cache", @@ -2028,9 +2004,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/console/tree/v4.4.16" - }, "time": "2020-10-24T11:50:19+00:00" }, { @@ -2174,9 +2147,6 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.16" - }, "time": "2020-10-24T11:50:19+00:00" }, { @@ -2240,9 +2210,6 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-client/tree/v4.4.16" - }, "time": "2020-10-24T11:50:19+00:00" }, { @@ -2305,9 +2272,6 @@ "polyfill", "portable" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2371,9 +2335,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2437,9 +2398,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2499,9 +2457,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2564,9 +2519,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2630,9 +2582,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php74/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2699,9 +2648,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0" - }, "time": "2020-10-23T14:02:19+00:00" }, { @@ -2746,9 +2692,6 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v4.4.16" - }, "time": "2020-10-24T11:50:19+00:00" }, { @@ -2821,9 +2764,6 @@ "debug", "dump" ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.16" - }, "time": "2020-10-26T20:47:51+00:00" }, { @@ -2878,9 +2818,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.16" - }, "time": "2020-10-24T11:50:19+00:00" }, { @@ -2945,36 +2882,32 @@ "keywords": [ "templating" ], - "support": { - "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v1.44.1" - }, "time": "2020-10-27T19:22:48+00:00" }, { "name": "willdurand/negotiation", - "version": "2.x-dev", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "cf78c9ac47e8e1e141bf609c71e9e2c3a7780dcf" + "reference": "04e14f38d4edfcc974114a07d2777d90c98f3d9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/cf78c9ac47e8e1e141bf609c71e9e2c3a7780dcf", - "reference": "cf78c9ac47e8e1e141bf609c71e9e2c3a7780dcf", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/04e14f38d4edfcc974114a07d2777d90c98f3d9c", + "reference": "04e14f38d4edfcc974114a07d2777d90c98f3d9c", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "~4.5" + "symfony/phpunit-bridge": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -3001,7 +2934,7 @@ "header", "negotiation" ], - "time": "2017-08-04T15:54:30+00:00" + "time": "2020-09-25T08:01:41+00:00" } ], "packages-dev": [ @@ -3787,16 +3720,16 @@ }, { "name": "nette/di", - "version": "v3.0.5", + "version": "v3.0.6", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "766e8185196a97ded4f9128db6d79a3a124b7eb6" + "reference": "e639ccfbc0230e022ca08bf59c6b07df7caf2007" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/766e8185196a97ded4f9128db6d79a3a124b7eb6", - "reference": "766e8185196a97ded4f9128db6d79a3a124b7eb6", + "url": "https://api.github.com/repos/nette/di/zipball/e639ccfbc0230e022ca08bf59c6b07df7caf2007", + "reference": "e639ccfbc0230e022ca08bf59c6b07df7caf2007", "shasum": "" }, "require": { @@ -3805,8 +3738,8 @@ "nette/php-generator": "^3.3.3", "nette/robot-loader": "^3.2", "nette/schema": "^1.0", - "nette/utils": "^3.1", - "php": ">=7.1" + "nette/utils": "^3.1.4", + "php": ">=7.1 <8.1" }, "conflict": { "nette/bootstrap": "<3.0" @@ -3854,7 +3787,7 @@ "nette", "static" ], - "time": "2020-08-13T13:04:23+00:00" + "time": "2020-11-25T22:42:55+00:00" }, { "name": "nette/finder", @@ -4110,21 +4043,21 @@ }, { "name": "nette/schema", - "version": "v1.0.2", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/nette/schema.git", - "reference": "febf71fb4052c824046f5a33f4f769a6e7fa0cb4" + "reference": "34baf9eca75eccdad3d04306c5d6bec0f6b252ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/febf71fb4052c824046f5a33f4f769a6e7fa0cb4", - "reference": "febf71fb4052c824046f5a33f4f769a6e7fa0cb4", + "url": "https://api.github.com/repos/nette/schema/zipball/34baf9eca75eccdad3d04306c5d6bec0f6b252ad", + "reference": "34baf9eca75eccdad3d04306c5d6bec0f6b252ad", "shasum": "" }, "require": { - "nette/utils": "^3.1", - "php": ">=7.1" + "nette/utils": "^3.1.4", + "php": ">=7.1 <8.1" }, "require-dev": { "nette/tester": "^2.2", @@ -4132,73 +4065,9 @@ "tracy/tracy": "^2.3" }, "type": "library", - "extra": { - "branch-alias": [] - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "📐 Nette Schema: validating data structures against a given Schema.", - "homepage": "https://nette.org", - "keywords": [ - "config", - "nette" - ], - "time": "2020-01-06T22:52:48+00:00" - }, - { - "name": "nette/utils", - "version": "v3.1.3", - "source": { - "type": "git", - "url": "https://github.com/nette/utils.git", - "reference": "c09937fbb24987b2a41c6022ebe84f4f1b8eec0f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/c09937fbb24987b2a41c6022ebe84f4f1b8eec0f", - "reference": "c09937fbb24987b2a41c6022ebe84f4f1b8eec0f", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "nette/tester": "~2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.3" - }, - "suggest": { - "ext-gd": "to use Image", - "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", - "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", - "ext-json": "to use Nette\\Utils\\Json", - "ext-mbstring": "to use Strings::lower() etc...", - "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", - "ext-xml": "to use Strings::length() etc. when mbstring is not available" - }, - "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -4222,7 +4091,76 @@ "homepage": "https://nette.org/contributors" } ], - "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", + "description": "📐 Nette Schema: validating data structures against a given Schema.", + "homepage": "https://nette.org", + "keywords": [ + "config", + "nette" + ], + "time": "2020-11-25T21:54:59+00:00" + }, + { + "name": "nette/utils", + "version": "v3.2.0", + "source": { + "type": "git", + "url": "https://github.com/nette/utils.git", + "reference": "d0427c1811462dbb6c503143eabe5478b26685f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nette/utils/zipball/d0427c1811462dbb6c503143eabe5478b26685f7", + "reference": "d0427c1811462dbb6c503143eabe5478b26685f7", + "shasum": "" + }, + "require": { + "php": ">=7.2 <8.1" + }, + "conflict": { + "nette/di": "<3.0.6" + }, + "require-dev": { + "nette/tester": "~2.0", + "phpstan/phpstan": "^0.12", + "tracy/tracy": "^2.3" + }, + "suggest": { + "ext-gd": "to use Image", + "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", + "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", + "ext-json": "to use Nette\\Utils\\Json", + "ext-mbstring": "to use Strings::lower() etc...", + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", + "ext-xml": "to use Strings::length() etc. when mbstring is not available" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause", + "GPL-2.0-only", + "GPL-3.0-only" + ], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + }, + { + "name": "Nette Community", + "homepage": "https://nette.org/contributors" + } + ], + "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", "homepage": "https://nette.org", "keywords": [ "array", @@ -4240,7 +4178,7 @@ "utility", "validation" ], - "time": "2020-08-07T10:34:21+00:00" + "time": "2020-11-25T23:47:50+00:00" }, { "name": "nikic/php-parser", @@ -6159,7 +6097,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "willdurand/negotiation": 20, "victorjonsson/markdowndocs": 20 }, "prefer-stable": false, diff --git a/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php b/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php index dd44ea623..69077edc9 100644 --- a/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php +++ b/system/src/Grav/Framework/Controller/Traits/ControllerResponseTrait.php @@ -229,7 +229,7 @@ trait ControllerResponseTrait * @param string $type * @return $this */ - abstract protected function setMessage($message, $type = 'info'); + abstract protected function setMessage(string $message, string $type = 'info'); /** * @return Config