PHP 8.1 and Symfony 5.4 upgrade #2

Merged
skobkin merged 6 commits from composer_udpate into master 2022-07-04 22:19:09 +00:00
5 changed files with 172 additions and 270 deletions
Showing only changes of commit 0e806ff8f4 - Show all commits

View file

@ -17,7 +17,7 @@
"ext-hash": "*",
"ext-iconv": "*",
"ext-json": "*",
"babdev/pagerfanta-bundle": "^2.4",
"babdev/pagerfanta-bundle": "^3.0",
"composer/package-versions-deprecated": "1.11.99.5",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2",
@ -26,7 +26,6 @@
"excelwebzone/recaptcha-bundle": "^1.5",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.6",
"pugx/sentry-sdk": "^2.0",
"sensio/framework-extra-bundle": "^5.1",
"sentry/sentry-symfony": "^4",
"suin/php-rss-writer": "^1.6",

397
composer.lock generated
View file

@ -4,68 +4,68 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "a948502e5aa65e256b987beb714d44d6",
"content-hash": "c26defbe635b34f805f9593f6ca098b7",
"packages": [
{
"name": "babdev/pagerfanta-bundle",
"version": "v2.11.0",
"version": "v3.7.0",
"source": {
"type": "git",
"url": "https://github.com/BabDev/PagerfantaBundle.git",
"reference": "98bd0756de82080ace1a2e41e66f618e469da943"
"reference": "d2760ebc3d22db10f219544323bea432dedc9eb0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/BabDev/PagerfantaBundle/zipball/98bd0756de82080ace1a2e41e66f618e469da943",
"reference": "98bd0756de82080ace1a2e41e66f618e469da943",
"url": "https://api.github.com/repos/BabDev/PagerfantaBundle/zipball/d2760ebc3d22db10f219544323bea432dedc9eb0",
"reference": "d2760ebc3d22db10f219544323bea432dedc9eb0",
"shasum": ""
},
"require": {
"pagerfanta/pagerfanta": "^2.7",
"php": "^7.2 || ^8.0",
"symfony/config": "^3.4 || ^4.4 || ^5.3",
"symfony/dependency-injection": "^3.4 || ^4.4 || ^5.3",
"symfony/deprecation-contracts": "^2.1",
"symfony/http-foundation": "^3.4 || ^4.4 || ^5.3",
"symfony/http-kernel": "^3.4 || ^4.4 || ^5.3",
"symfony/property-access": "^3.4 || ^4.4 || ^5.3",
"symfony/routing": "^3.4 || ^4.4 || ^5.3"
"pagerfanta/core": "^3.1",
"php": "^7.4 || ^8.0",
"symfony/config": "^4.4 || ^5.4 || ^6.0",
"symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
"symfony/deprecation-contracts": "^2.1 || ^3.0",
"symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
"symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
"symfony/polyfill-php80": "^1.15",
"symfony/property-access": "^4.4 || ^5.4 || ^6.0",
"symfony/routing": "^4.4 || ^5.4 || ^6.0"
},
"conflict": {
"pagerfanta/twig": "<3.1",
"twig/twig": "<1.35 || >=2.0,<2.5",
"white-october/pagerfanta-bundle": "*"
},
"require-dev": {
"doctrine/annotations": "^1.8",
"jms/serializer": "^3.0",
"jms/serializer-bundle": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
"jms/serializer-bundle": "^3.0 || ^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
"pagerfanta/twig": "^3.1",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^0.12.94",
"phpstan/phpstan-phpunit": "^0.12.21",
"phpstan/phpstan-symfony": "^0.12.41",
"phpunit/phpunit": "^8.5 || ^9.3",
"symfony/phpunit-bridge": "^4.4 || ^5.3",
"symfony/serializer": "^3.4 || ^4.4 || ^5.3",
"symfony/translation": "^3.4 || ^4.4 || ^5.3",
"symfony/twig-bridge": "^3.4 || ^4.4 || ^5.3",
"symfony/twig-bundle": "^3.4 || ^4.4 || ^5.3",
"phpstan/phpstan": "1.7.2",
"phpstan/phpstan-phpunit": "1.1.1",
"phpstan/phpstan-symfony": "1.2.0",
"phpunit/phpunit": "^9.5",
"symfony/phpunit-bridge": "^5.4 || ^6.0",
"symfony/serializer": "^4.4 || ^5.4 || ^6.0",
"symfony/translation": "^4.4 || ^5.4 || ^6.0",
"symfony/twig-bridge": "^4.4 || ^5.4 || ^6.0",
"symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0",
"twig/twig": "^1.35 || ^2.5 || ^3.0"
},
"suggest": {
"jms/serializer-bundle": "To use the Pagerfanta class with the JMS Serializer",
"symfony/serializer": "To use the Pagerfanta class with the Symfony Serializer",
"symfony/translation": "To use the Pagerfanta views with translation support",
"symfony/translation": "To use the Twig templates with translation support",
"twig/twig": "To integrate Pagerfanta with Twig through extensions"
},
"type": "symfony-bundle",
"autoload": {
"psr-4": {
"BabDev\\PagerfantaBundle\\": ""
},
"exclude-from-classmap": [
"Tests/"
]
"BabDev\\PagerfantaBundle\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@ -79,7 +79,7 @@
],
"support": {
"issues": "https://github.com/BabDev/PagerfantaBundle/issues",
"source": "https://github.com/BabDev/PagerfantaBundle/tree/v2.11.0"
"source": "https://github.com/BabDev/PagerfantaBundle/tree/v3.7.0"
},
"funding": [
{
@ -87,7 +87,7 @@
"type": "github"
}
],
"time": "2021-08-01T16:42:35+00:00"
"time": "2022-05-27T20:58:26+00:00"
},
{
"name": "clue/stream-filter",
@ -2040,6 +2040,64 @@
],
"time": "2022-06-20T21:43:11+00:00"
},
{
"name": "http-interop/http-factory-guzzle",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/http-interop/http-factory-guzzle.git",
"reference": "8f06e92b95405216b237521cc64c804dd44c4a81"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/http-interop/http-factory-guzzle/zipball/8f06e92b95405216b237521cc64c804dd44c4a81",
"reference": "8f06e92b95405216b237521cc64c804dd44c4a81",
"shasum": ""
},
"require": {
"guzzlehttp/psr7": "^1.7||^2.0",
"php": ">=7.3",
"psr/http-factory": "^1.0"
},
"provide": {
"psr/http-factory-implementation": "^1.0"
},
"require-dev": {
"http-interop/http-factory-tests": "^0.9",
"phpunit/phpunit": "^9.5"
},
"suggest": {
"guzzlehttp/psr7": "Includes an HTTP factory starting in version 2.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Http\\Factory\\Guzzle\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "An HTTP Factory using Guzzle PSR7",
"keywords": [
"factory",
"http",
"psr-17",
"psr-7"
],
"support": {
"issues": "https://github.com/http-interop/http-factory-guzzle/issues",
"source": "https://github.com/http-interop/http-factory-guzzle/tree/1.2.0"
},
"time": "2021-07-21T13:50:14+00:00"
},
{
"name": "jean85/pretty-package-versions",
"version": "2.0.5",
@ -2270,177 +2328,50 @@
"time": "2022-06-09T08:59:12+00:00"
},
{
"name": "nyholm/psr7",
"version": "1.5.1",
"name": "pagerfanta/core",
"version": "v3.6.1",
"source": {
"type": "git",
"url": "https://github.com/Nyholm/psr7.git",
"reference": "f734364e38a876a23be4d906a2a089e1315be18a"
"url": "https://github.com/Pagerfanta/core.git",
"reference": "ed751ad06edea1d88451683405e4a207f20c26ac"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a",
"reference": "f734364e38a876a23be4d906a2a089e1315be18a",
"shasum": ""
},
"require": {
"php": ">=7.1",
"php-http/message-factory": "^1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0"
},
"provide": {
"psr/http-factory-implementation": "1.0",
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"http-interop/http-factory-tests": "^0.9",
"php-http/psr7-integration-tests": "^1.0",
"phpunit/phpunit": "^7.5 || 8.5 || 9.4",
"symfony/error-handler": "^4.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
}
},
"autoload": {
"psr-4": {
"Nyholm\\Psr7\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Tobias Nyholm",
"email": "tobias.nyholm@gmail.com"
},
{
"name": "Martijn van der Ven",
"email": "martijn@vanderven.se"
}
],
"description": "A fast PHP7 implementation of PSR-7",
"homepage": "https://tnyholm.se",
"keywords": [
"psr-17",
"psr-7"
],
"support": {
"issues": "https://github.com/Nyholm/psr7/issues",
"source": "https://github.com/Nyholm/psr7/tree/1.5.1"
},
"funding": [
{
"url": "https://github.com/Zegnat",
"type": "github"
},
{
"url": "https://github.com/nyholm",
"type": "github"
}
],
"time": "2022-06-22T07:13:36+00:00"
},
{
"name": "pagerfanta/pagerfanta",
"version": "v2.7.3",
"source": {
"type": "git",
"url": "https://github.com/BabDev/Pagerfanta.git",
"reference": "5f2aa1f1c9d1a6520f459e84b63e2bc25e9eea5b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/5f2aa1f1c9d1a6520f459e84b63e2bc25e9eea5b",
"reference": "5f2aa1f1c9d1a6520f459e84b63e2bc25e9eea5b",
"url": "https://api.github.com/repos/Pagerfanta/core/zipball/ed751ad06edea1d88451683405e4a207f20c26ac",
"reference": "ed751ad06edea1d88451683405e4a207f20c26ac",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": "^7.2 || ^8.0",
"symfony/deprecation-contracts": "^2.1",
"php": "^7.4 || ^8.0",
"symfony/deprecation-contracts": "^2.1 || ^3.0",
"symfony/polyfill-php80": "^1.15"
},
"conflict": {
"twig/twig": "<1.35 || >=2.0,<2.5"
},
"replace": {
"pagerfanta/core": "self.version",
"pagerfanta/doctrine-collections-adapter": "self.version",
"pagerfanta/doctrine-dbal-adapter": "self.version",
"pagerfanta/doctrine-mongodb-odm-adapter": "self.version",
"pagerfanta/doctrine-orm-adapter": "self.version",
"pagerfanta/doctrine-phpcr-odm-adapter": "self.version",
"pagerfanta/elastica-adapter": "self.version",
"pagerfanta/solarium-adapter": "self.version",
"pagerfanta/twig": "self.version"
},
"require-dev": {
"dg/bypass-finals": "^1.3.1",
"doctrine/cache": "^1.11 || ^2.0",
"doctrine/collections": "^1.4",
"doctrine/dbal": "^2.5 || ^3.0",
"doctrine/orm": "^2.5",
"doctrine/phpcr-odm": "^1.3",
"friendsofphp/php-cs-fixer": "^3.0",
"jackalope/jackalope-doctrine-dbal": "^1.3",
"mandango/mandango": "^1.0@dev",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^0.12.93",
"phpstan/phpstan-phpunit": "^0.12.21",
"phpunit/phpunit": "^8.5 || ^9.5",
"propel/propel": "^2.0@dev",
"propel/propel1": "^1.7",
"ruflin/elastica": "^1.3 || ^2.0 || ^3.0 || ^5.0 || ^6.0 || ^7.0",
"solarium/solarium": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0",
"symfony/cache": "^4.4 || ^5.2 || ^6.0",
"twig/twig": "^1.35 || ^2.5 || ^3.0"
},
"suggest": {
"twig/twig": "To integrate Pagerfanta with Twig"
"phpunit/phpunit": "^9.5",
"symfony/phpunit-bridge": "^5.4 || ^6.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Pagerfanta\\": "lib/Core/",
"Pagerfanta\\Twig\\": "lib/Twig/",
"Pagerfanta\\Adapter\\": "src/Adapter/",
"Pagerfanta\\Elastica\\": "lib/Adapter/Elastica/",
"Pagerfanta\\Solarium\\": "lib/Adapter/Solarium/",
"Pagerfanta\\Doctrine\\ORM\\": "lib/Adapter/Doctrine/ORM/",
"Pagerfanta\\Doctrine\\DBAL\\": "lib/Adapter/Doctrine/DBAL/",
"Pagerfanta\\Doctrine\\PHPCRODM\\": "lib/Adapter/Doctrine/PHPCRODM/",
"Pagerfanta\\Doctrine\\MongoDBODM\\": "lib/Adapter/Doctrine/MongoDBODM/",
"Pagerfanta\\Doctrine\\Collections\\": "lib/Adapter/Doctrine/Collections/"
}
"Pagerfanta\\": "./"
},
"exclude-from-classmap": [
"Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Pagination for PHP",
"description": "Core Pagerfanta API",
"keywords": [
"page",
"pagination",
"paginator",
"paging"
"pagerfanta"
],
"support": {
"issues": "https://github.com/BabDev/Pagerfanta/issues",
"source": "https://github.com/BabDev/Pagerfanta/tree/v2.7.3"
"source": "https://github.com/Pagerfanta/core/tree/v3.6.1"
},
"funding": [
{
"url": "https://github.com/mbabker",
"type": "github"
}
],
"time": "2022-03-03T00:01:24+00:00"
"time": "2022-03-15T23:30:46+00:00"
},
{
"name": "php-http/client-common",
@ -3343,57 +3274,6 @@
},
"time": "2021-07-14T16:41:46+00:00"
},
{
"name": "pugx/sentry-sdk",
"version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/PUGX/sentry-sdk.git",
"reference": "9001514fa84645ef1e93596426f8d875171205a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PUGX/sentry-sdk/zipball/9001514fa84645ef1e93596426f8d875171205a2",
"reference": "9001514fa84645ef1e93596426f8d875171205a2",
"shasum": ""
},
"require": {
"nyholm/psr7": "^1.3",
"sentry/sentry": "^3.0",
"symfony/http-client": "^4.4 || ^5.0"
},
"replace": {
"sentry/sdk": "3.*"
},
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PUGX community",
"homepage": "https://github.com/pugx"
}
],
"description": "This is a metapackage shipping sentry/sentry with Symfony HTTP client.",
"homepage": "https://pugx.org",
"keywords": [
"crash-reporting",
"crash-reports",
"error-handler",
"error-monitoring",
"log",
"logging",
"sentry"
],
"support": {
"issues": "https://github.com/PUGX/sentry-sdk/issues",
"source": "https://github.com/PUGX/sentry-sdk/tree/v2.0.0"
},
"abandoned": "sentry/sdk",
"time": "2021-01-25T10:33:38+00:00"
},
{
"name": "ralouphie/getallheaders",
"version": "3.0.3",
@ -3518,6 +3398,63 @@
},
"time": "2020-08-25T19:10:18+00:00"
},
{
"name": "sentry/sdk",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php-sdk.git",
"reference": "6d78bd83b43efbb52f81d6824f4af344fa9ba292"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php-sdk/zipball/6d78bd83b43efbb52f81d6824f4af344fa9ba292",
"reference": "6d78bd83b43efbb52f81d6824f4af344fa9ba292",
"shasum": ""
},
"require": {
"http-interop/http-factory-guzzle": "^1.0",
"sentry/sentry": "^3.5",
"symfony/http-client": "^4.3|^5.0|^6.0"
},
"type": "metapackage",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Sentry",
"email": "accounts@sentry.io"
}
],
"description": "This is a metapackage shipping sentry/sentry with a recommended HTTP client.",
"homepage": "http://sentry.io",
"keywords": [
"crash-reporting",
"crash-reports",
"error-handler",
"error-monitoring",
"log",
"logging",
"sentry"
],
"support": {
"issues": "https://github.com/getsentry/sentry-php-sdk/issues",
"source": "https://github.com/getsentry/sentry-php-sdk/tree/3.2.0"
},
"funding": [
{
"url": "https://sentry.io/",
"type": "custom"
},
{
"url": "https://sentry.io/pricing/",
"type": "custom"
}
],
"time": "2022-05-21T11:10:11+00:00"
},
{
"name": "sentry/sentry",
"version": "3.6.1",

View file

@ -1,21 +0,0 @@
services:
# Register nyholm/psr7 services for autowiring with PSR-17 (HTTP factories)
Psr\Http\Message\RequestFactoryInterface: '@nyholm.psr7.psr17_factory'
Psr\Http\Message\ResponseFactoryInterface: '@nyholm.psr7.psr17_factory'
Psr\Http\Message\ServerRequestFactoryInterface: '@nyholm.psr7.psr17_factory'
Psr\Http\Message\StreamFactoryInterface: '@nyholm.psr7.psr17_factory'
Psr\Http\Message\UploadedFileFactoryInterface: '@nyholm.psr7.psr17_factory'
Psr\Http\Message\UriFactoryInterface: '@nyholm.psr7.psr17_factory'
# Register nyholm/psr7 services for autowiring with HTTPlug factories
Http\Message\MessageFactory: '@nyholm.psr7.httplug_factory'
Http\Message\RequestFactory: '@nyholm.psr7.httplug_factory'
Http\Message\ResponseFactory: '@nyholm.psr7.httplug_factory'
Http\Message\StreamFactory: '@nyholm.psr7.httplug_factory'
Http\Message\UriFactory: '@nyholm.psr7.httplug_factory'
nyholm.psr7.psr17_factory:
class: Nyholm\Psr7\Factory\Psr17Factory
nyholm.psr7.httplug_factory:
class: Nyholm\Psr7\Factory\HttplugFactory

View file

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace App\Pager\View;
use Pagerfanta\Pagerfanta;
@ -27,7 +29,7 @@ class TwitterBootstrap4PagelessView implements ViewInterface
$this->template = $template ?: $this->createDefaultTemplate();
}
public function render(PagerfantaInterface $pagerfanta, $routeGenerator, array $options = array())
public function render(PagerfantaInterface $pagerfanta, callable $routeGenerator, array $options = []): string
{
$this->initializePagerfanta($pagerfanta);
@ -36,7 +38,7 @@ class TwitterBootstrap4PagelessView implements ViewInterface
return $this->generate();
}
public function getName()
public function getName(): string
{
return 'twitter_bootstrap4_pageless';
}

View file

@ -120,27 +120,12 @@
"monolog/monolog": {
"version": "1.23.0"
},
"nyholm/psr7": {
"version": "1.0",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "1.0",
"ref": "7c0a9352a57376f04f5444e74565102c3a23d0c7"
},
"files": [
"config/packages/nyholm_psr7.yaml"
]
},
"ocramius/package-versions": {
"version": "1.3.0"
},
"ocramius/proxy-manager": {
"version": "2.2.0"
},
"pagerfanta/pagerfanta": {
"version": "v2.3.0"
},
"php": {
"version": "8.0"
},