Обновил php, composer

И сделал косметические правки бандлов
This commit is contained in:
Anton Vakhrushev 2020-11-08 11:18:56 +03:00
parent 7998209e95
commit 7676933e40
14 changed files with 250 additions and 5 deletions

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
use Homepage\HtmlPrettierBundle\HtmlPrettierBundle;
use Homepage\SiteMapBundle\SiteMapBundle;
use Homepage\TwigExtensionBundle\TwigExtensionBundle;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\HtmlPrettierBundle\DependencyInjection;
use Symfony\Component\Config\FileLocator;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\HtmlPrettierBundle;
use Generator;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\HtmlPrettierBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\SiteMapBundle\DependencyInjection;
use Symfony\Component\Config\FileLocator;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\SiteMapBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\SiteMapBundle;
use Sculpin\Core\DataProvider\DataProviderInterface;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\TwigExtensionBundle\DependencyInjection;
use Symfony\Component\Config\FileLocator;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\TwigExtensionBundle;
use Twig\Extension\AbstractExtension;

View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Homepage\TwigExtensionBundle;
use Symfony\Component\HttpKernel\Bundle\Bundle;

View File

@ -9,7 +9,7 @@
}
],
"require": {
"php": "~7.3",
"php": "~7.4",
"ext-tidy": "*"
},
"require-dev": {

227
composer.lock generated
View File

@ -67,6 +67,11 @@
"validation",
"versioning"
],
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
"source": "https://github.com/composer/semver/tree/3.2.2"
},
"funding": [
{
"url": "https://packagist.com",
@ -125,6 +130,11 @@
"Xdebug",
"performance"
],
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
"source": "https://github.com/composer/xdebug-handler/tree/1.4.4"
},
"funding": [
{
"url": "https://packagist.com",
@ -188,6 +198,10 @@
"path",
"pattern"
],
"support": {
"issues": "https://github.com/dflydev/dflydev-util-antPathMatcher/issues",
"source": "https://github.com/dflydev/dflydev-util-antPathMatcher/tree/v1.0.3"
},
"time": "2012-12-03T05:03:00+00:00"
},
{
@ -243,6 +257,10 @@
"mime",
"mimetypes"
],
"support": {
"issues": "https://github.com/dflydev/dflydev-apache-mime-types/issues",
"source": "https://github.com/dflydev/dflydev-apache-mime-types/tree/v1.0.1"
},
"time": "2013-05-14T02:02:01+00:00"
},
{
@ -298,6 +316,10 @@
"mime",
"type"
],
"support": {
"issues": "https://github.com/dflydev/dflydev-canal/issues",
"source": "https://github.com/dflydev/dflydev-canal/tree/master"
},
"time": "2013-05-14T05:22:25+00:00"
},
{
@ -358,6 +380,10 @@
"config",
"configuration"
],
"support": {
"issues": "https://github.com/dflydev/dflydev-dot-access-configuration/issues",
"source": "https://github.com/dflydev/dflydev-dot-access-configuration/tree/master"
},
"time": "2018-09-08T23:00:17+00:00"
},
{
@ -417,6 +443,10 @@
"dot",
"notation"
],
"support": {
"issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
"source": "https://github.com/dflydev/dflydev-dot-access-data/tree/master"
},
"time": "2017-01-20T21:14:22+00:00"
},
{
@ -469,6 +499,10 @@
"placeholder",
"resolver"
],
"support": {
"issues": "https://github.com/dflydev/dflydev-placeholder-resolver/issues",
"source": "https://github.com/dflydev/dflydev-placeholder-resolver/tree/v1.0.2"
},
"time": "2012-10-28T21:08:28+00:00"
},
{
@ -540,6 +574,10 @@
"docblock",
"parser"
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/1.11.1"
},
"time": "2020-10-26T10:28:16+00:00"
},
{
@ -618,6 +656,10 @@
"uppercase",
"words"
],
"support": {
"issues": "https://github.com/doctrine/inflector/issues",
"source": "https://github.com/doctrine/inflector/tree/1.4.x"
},
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@ -694,6 +736,10 @@
"parser",
"php"
],
"support": {
"issues": "https://github.com/doctrine/lexer/issues",
"source": "https://github.com/doctrine/lexer/tree/1.2.1"
},
"funding": [
{
"url": "https://www.doctrine-project.org/sponsorship.html",
@ -751,6 +797,10 @@
"event-dispatcher",
"event-emitter"
],
"support": {
"issues": "https://github.com/igorw/evenement/issues",
"source": "https://github.com/igorw/evenement/tree/master"
},
"time": "2017-07-23T21:35:13+00:00"
},
{
@ -842,6 +892,10 @@
}
],
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.16.7"
},
"funding": [
{
"url": "https://github.com/keradus",
@ -897,6 +951,10 @@
"keywords": [
"markdown"
],
"support": {
"issues": "https://github.com/michelf/php-markdown/issues",
"source": "https://github.com/michelf/php-markdown/tree/1.9.0"
},
"time": "2019-12-02T02:32:27+00:00"
},
{
@ -950,6 +1008,12 @@
"plaintext",
"textile"
],
"support": {
"irc": "irc://irc.freenode.net/textile",
"issues": "https://github.com/textile/php-textile/issues",
"source": "https://github.com/textile/php-textile",
"wiki": "https://github.com/textile/php-textile/wiki"
},
"time": "2020-01-08T21:13:37+00:00"
},
{
@ -1001,6 +1065,10 @@
"keywords": [
"diff"
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/diff/issues",
"source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1"
},
"time": "2020-10-14T08:39:05+00:00"
},
{
@ -1050,6 +1118,10 @@
"container-interop",
"psr"
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
"source": "https://github.com/php-fig/container/tree/master"
},
"time": "2017-02-14T16:28:37+00:00"
},
{
@ -1100,6 +1172,9 @@
"request",
"response"
],
"support": {
"source": "https://github.com/php-fig/http-message/tree/master"
},
"time": "2016-08-06T14:39:51+00:00"
},
{
@ -1147,6 +1222,9 @@
"psr",
"psr-3"
],
"support": {
"source": "https://github.com/php-fig/log/tree/1.1.3"
},
"time": "2020-03-23T09:12:05+00:00"
},
{
@ -1209,6 +1287,10 @@
"promise",
"reactphp"
],
"support": {
"issues": "https://github.com/reactphp/cache/issues",
"source": "https://github.com/reactphp/cache/tree/v1.1.0"
},
"funding": [
{
"url": "https://github.com/WyriHaximus",
@ -1285,6 +1367,10 @@
"dns-resolver",
"reactphp"
],
"support": {
"issues": "https://github.com/reactphp/dns/issues",
"source": "https://github.com/reactphp/dns/tree/v1.4.0"
},
"funding": [
{
"url": "https://github.com/WyriHaximus",
@ -1337,6 +1423,10 @@
"asynchronous",
"event-loop"
],
"support": {
"issues": "https://github.com/reactphp/event-loop/issues",
"source": "https://github.com/reactphp/event-loop/tree/v1.1.1"
},
"time": "2020-01-01T18:39:52+00:00"
},
{
@ -1385,6 +1475,10 @@
"server",
"streaming"
],
"support": {
"issues": "https://github.com/reactphp/http/issues",
"source": "https://github.com/reactphp/http/tree/v0.8.7"
},
"time": "2020-07-05T11:32:28+00:00"
},
{
@ -1431,6 +1525,10 @@
"promise",
"promises"
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v2.8.0"
},
"time": "2020-05-12T15:16:56+00:00"
},
{
@ -1487,6 +1585,10 @@
"stream",
"unwrap"
],
"support": {
"issues": "https://github.com/reactphp/promise-stream/issues",
"source": "https://github.com/reactphp/promise-stream/tree/v1.2.0"
},
"time": "2019-07-03T12:29:10+00:00"
},
{
@ -1540,6 +1642,10 @@
"timeout",
"timer"
],
"support": {
"issues": "https://github.com/reactphp/promise-timer/issues",
"source": "https://github.com/reactphp/promise-timer/tree/v1.6.0"
},
"time": "2020-07-10T12:18:06+00:00"
},
{
@ -1610,6 +1716,10 @@
"reactphp",
"stream"
],
"support": {
"issues": "https://github.com/reactphp/socket/issues",
"source": "https://github.com/reactphp/socket/tree/v1.6.0"
},
"funding": [
{
"url": "https://github.com/WyriHaximus",
@ -1666,6 +1776,10 @@
"stream",
"writable"
],
"support": {
"issues": "https://github.com/reactphp/stream/issues",
"source": "https://github.com/reactphp/stream/tree/v1.1.1"
},
"time": "2020-05-04T10:17:57+00:00"
},
{
@ -1724,6 +1838,9 @@
"stream",
"uri"
],
"support": {
"source": "https://github.com/ringcentral/psr7/tree/master"
},
"time": "2018-05-29T20:21:04+00:00"
},
{
@ -1827,6 +1944,10 @@
"site",
"static"
],
"support": {
"issues": "https://github.com/sculpin/sculpin/issues",
"source": "https://github.com/sculpin/sculpin/tree/master"
},
"time": "2019-12-05T07:27:19+00:00"
},
{
@ -1866,6 +1987,10 @@
"MIT"
],
"description": "Plugin for theming sculpin sites",
"support": {
"issues": "https://github.com/sculpin/sculpin-theme-composer-plugin/issues",
"source": "https://github.com/sculpin/sculpin-theme-composer-plugin/tree/1.0.3"
},
"time": "2020-10-29T13:20:43+00:00"
},
{
@ -1925,6 +2050,9 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/config/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2011,6 +2139,9 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/console/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2077,6 +2208,9 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/debug/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2159,6 +2293,9 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/dependency-injection/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2223,6 +2360,9 @@
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/master"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2289,6 +2429,9 @@
],
"description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/error-handler/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2369,6 +2512,9 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2445,6 +2591,9 @@
"interoperability",
"standards"
],
"support": {
"source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2504,6 +2653,9 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2562,6 +2714,9 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/finder/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2638,6 +2793,9 @@
"interoperability",
"standards"
],
"support": {
"source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2708,6 +2866,9 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2809,6 +2970,9 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2874,6 +3038,9 @@
"configuration",
"options"
],
"support": {
"source": "https://github.com/symfony/options-resolver/tree/v5.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -2950,6 +3117,9 @@
"polyfill",
"portable"
],
"support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3027,6 +3197,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3092,6 +3265,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3165,6 +3341,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3241,6 +3420,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php73/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3321,6 +3503,9 @@
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3380,6 +3565,9 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/v5.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3456,6 +3644,9 @@
"interoperability",
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/master"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3515,6 +3706,9 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/stopwatch/tree/v5.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3600,6 +3794,9 @@
"debug",
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.1.8"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3668,6 +3865,9 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v4.4.16"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
@ -3737,6 +3937,11 @@
"i18n",
"text"
],
"support": {
"issues": "https://github.com/twigphp/Twig-extensions/issues",
"source": "https://github.com/twigphp/Twig-extensions/tree/master"
},
"abandoned": true,
"time": "2018-12-05T18:34:18+00:00"
},
{
@ -3802,6 +4007,10 @@
"keywords": [
"templating"
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
"source": "https://github.com/twigphp/Twig/tree/v2.14.1"
},
"funding": [
{
"url": "https://github.com/fabpot",
@ -3858,6 +4067,10 @@
"string",
"terminated"
],
"support": {
"issues": "https://github.com/webignition/disallowed-character-terminated-string/issues",
"source": "https://github.com/webignition/disallowed-character-terminated-string/tree/master"
},
"time": "2019-12-20T15:52:44+00:00"
},
{
@ -3909,6 +4122,10 @@
"media type",
"media-type"
],
"support": {
"issues": "https://github.com/webignition/internet-media-type/issues",
"source": "https://github.com/webignition/internet-media-type/tree/master"
},
"time": "2018-03-12T14:54:00+00:00"
},
{
@ -3956,6 +4173,10 @@
"parser",
"quoted-string"
],
"support": {
"issues": "https://github.com/webignition/quoted-string/issues",
"source": "https://github.com/webignition/quoted-string/tree/master"
},
"time": "2017-05-11T11:41:31+00:00"
},
{
@ -4003,6 +4224,10 @@
"parser",
"string"
],
"support": {
"issues": "https://github.com/webignition/string-parser/issues",
"source": "https://github.com/webignition/string-parser/tree/master"
},
"time": "2017-05-11T10:04:12+00:00"
}
],
@ -4016,5 +4241,5 @@
"ext-tidy": "*"
},
"platform-dev": [],
"plugin-api-version": "1.1.0"
"plugin-api-version": "2.0.0"
}

View File

@ -1,4 +1,4 @@
FROM php:7.4.7-cli
FROM php:7.4.12-cli
COPY ./docker/provision.sh /opt/

View File

@ -19,7 +19,7 @@ docker-php-ext-install tidy \
mkdir -p /srv/app
# Composer and required tools
curl -sLO https://getcomposer.org/download/1.10.8/composer.phar \
curl -sLO https://getcomposer.org/download/2.0.6/composer.phar \
&& mv composer.phar /usr/local/bin/composer \
&& chmod +x /usr/local/bin/composer