From 8c87b3954bc791ea7eef192b669310ee8276798a Mon Sep 17 00:00:00 2001 From: Olivier Mairet Date: Fri, 8 May 2020 18:08:26 +0200 Subject: [PATCH 1/6] feat(crud): add pagination on list controllers --- composer.json | 1 + composer.lock | 1060 +++-------------- config/bundles.php | 1 + config/packages/knp_paginator.yaml | 3 + config/services.yaml | 2 + .../AssetType/AssetTypeListController.php | 15 +- .../AssetsListController.php | 12 +- .../MissionType/MissionTypeController.php | 9 +- .../OrganizationListController.php | 14 +- .../Organization/User/UserListController.php | 12 +- .../organization/assetType/list.html.twig | 4 + .../commissionable_asset/_list.html.twig | 4 + templates/organization/list.html.twig | 4 + .../organization/mission_type/index.html.twig | 4 + templates/organization/user/_list.html.twig | 4 + 15 files changed, 243 insertions(+), 906 deletions(-) create mode 100644 config/packages/knp_paginator.yaml diff --git a/composer.json b/composer.json index 8cb53be7..4e200acb 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,7 @@ "beberlei/assert": "^3.2", "doctrine/annotations": "^1.8", "doctrine/doctrine-fixtures-bundle": "^3.3", + "knplabs/knp-paginator-bundle": "^5.2", "martin-georgiev/postgresql-for-doctrine": "^1.3", "odolbeau/phone-number-bundle": "^3.0", "sensio/framework-extra-bundle": "5.*", diff --git a/composer.lock b/composer.lock index 1e66f743..a9db4eb9 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": "8b3bcfa39b72b3daa37852dba4dc26eb", + "content-hash": "6665759d0e5a2f9783166358b04203a1", "packages": [ { "name": "beberlei/assert", @@ -1179,20 +1179,6 @@ "database", "orm" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine/orm", - "type": "tidelift" - } - ], "time": "2020-03-19T06:41:02+00:00" }, { @@ -1276,20 +1262,6 @@ "orm", "persistence" ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", - "type": "tidelift" - } - ], "time": "2020-03-21T15:13:52+00:00" }, { @@ -1537,6 +1509,150 @@ ], "time": "2014-01-12T16:20:24+00:00" }, + { + "name": "knplabs/knp-components", + "version": "v2.3.4", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/knp-components.git", + "reference": "a57e196b8ab413cb409aa49a5bd28fea61f619b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/a57e196b8ab413cb409aa49a5bd28fea61f619b2", + "reference": "a57e196b8ab413cb409aa49a5bd28fea61f619b2", + "shasum": "" + }, + "require": { + "php": "^7.2", + "symfony/event-dispatcher": "^3.4 || ^4.0 || ^5.0", + "symfony/http-foundation": "^3.4 || ^4.0 || ^5.0" + }, + "require-dev": { + "doctrine/mongodb-odm": "^2.0", + "doctrine/orm": "^2.5", + "doctrine/phpcr-odm": "^1.2", + "jackalope/jackalope-doctrine-dbal": "^1.2", + "phpunit/phpunit": "^8.0", + "ruflin/elastica": "^1.0", + "symfony/http-kernel": "^3.4 || ^4.0 || ^5.0", + "symfony/property-access": "^3.4 || ^4.0 || ^5.0" + }, + "suggest": { + "doctrine/common": "to allow usage pagination with Doctrine ArrayCollection", + "doctrine/mongodb-odm": "to allow usage pagination with Doctrine ODM MongoDB", + "doctrine/orm": "to allow usage pagination with Doctrine ORM", + "doctrine/phpcr-odm": "to allow usage pagination with Doctrine ODM PHPCR", + "propel/propel1": "to allow usage pagination with Propel ORM", + "ruflin/elastica": "to allow usage pagination with ElasticSearch Client", + "solarium/solarium": "to allow usage pagination with Solarium Client", + "symfony/property-access": "To allow sorting arrays" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Knp\\Component\\": "src/Knp/Component" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "https://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "https://github.com/KnpLabs/knp-components/contributors" + } + ], + "description": "Knplabs component library", + "homepage": "http://github.com/KnpLabs/knp-components", + "keywords": [ + "components", + "knp", + "knplabs", + "pager", + "paginator" + ], + "time": "2020-04-24T07:13:34+00:00" + }, + { + "name": "knplabs/knp-paginator-bundle", + "version": "v5.2.0", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git", + "reference": "787174799b8de92287865566dce9e0625015f8ff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/787174799b8de92287865566dce9e0625015f8ff", + "reference": "787174799b8de92287865566dce9e0625015f8ff", + "shasum": "" + }, + "require": { + "knplabs/knp-components": "^2.0", + "php": "^7.2", + "symfony/config": "^4.3 || ^5.0", + "symfony/dependency-injection": "^4.3 || ^5.0", + "symfony/event-dispatcher": "^4.3 || ^5.0", + "symfony/http-foundation": "^4.3 || ^5.0", + "symfony/http-kernel": "^4.3 || ^5.0", + "symfony/routing": "^4.3 || ^5.0", + "symfony/translation": "^4.3 || ^5.0", + "twig/twig": "^2.0 || ^3.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.5 || ^8.5", + "symfony/expression-language": "^4.3 || ^5.0", + "symfony/templating": "^4.3 || ^5.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "5.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Knp\\Bundle\\PaginatorBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "http://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle/contributors" + } + ], + "description": "Paginator bundle for Symfony to automate pagination and simplify sorting and other features", + "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle", + "keywords": [ + "bundle", + "knp", + "knplabs", + "pager", + "pagination", + "paginator", + "symfony" + ], + "time": "2020-04-28T06:16:13+00:00" + }, { "name": "laminas/laminas-code", "version": "3.4.1", @@ -1706,12 +1822,6 @@ "laminas", "zf" ], - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], "time": "2020-04-03T16:01:00+00:00" }, { @@ -1910,16 +2020,6 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "funding": [ - { - "url": "https://github.com/Ocramius", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ocramius/package-versions", - "type": "tidelift" - } - ], "time": "2020-03-06T11:34:16+00:00" }, { @@ -2531,20 +2631,6 @@ ], "description": "Symfony Asset Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -2624,20 +2710,6 @@ "caching", "psr6" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -2760,20 +2832,6 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-15T15:59:10+00:00" }, { @@ -2850,20 +2908,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -2937,20 +2981,6 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-28T17:58:55+00:00" }, { @@ -3047,20 +3077,6 @@ ], "description": "Symfony Doctrine Bridge", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3118,20 +3134,6 @@ "env", "environment" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3187,20 +3189,6 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T14:14:32+00:00" }, { @@ -3271,20 +3259,6 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3394,20 +3368,6 @@ ], "description": "Symfony ExpressionLanguage Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3458,20 +3418,6 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-12T14:40:17+00:00" }, { @@ -3521,20 +3467,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3668,20 +3600,6 @@ ], "description": "Symfony Form Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3812,20 +3730,6 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -3881,20 +3785,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T14:14:32+00:00" }, { @@ -3991,20 +3881,6 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T15:04:59+00:00" }, { @@ -4063,20 +3939,6 @@ "symfony", "words" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4152,20 +4014,6 @@ "l10n", "localization" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4228,20 +4076,6 @@ "mime", "mime-type" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4309,20 +4143,6 @@ ], "description": "Symfony Monolog Bridge", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4440,20 +4260,6 @@ "configuration", "options" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -4541,20 +4347,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -4608,24 +4400,10 @@ "keywords": [ "compatibility", "icu", - "intl", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } + "intl", + "polyfill", + "portable", + "shim" ], "time": "2020-02-27T09:26:54+00:00" }, @@ -4689,20 +4467,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -4766,20 +4530,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -4839,20 +4589,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-09T19:04:49+00:00" }, { @@ -4911,20 +4647,6 @@ "portable", "shim" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-02-27T09:26:54+00:00" }, { @@ -4992,20 +4714,6 @@ "property path", "reflection" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5082,20 +4790,6 @@ "type", "validator" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5172,20 +4866,6 @@ "uri", "url" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -5269,20 +4949,6 @@ ], "description": "Symfony SecurityBundle", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -5356,20 +5022,6 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T14:14:32+00:00" }, { @@ -5429,20 +5081,6 @@ ], "description": "Symfony Security Component - CSRF Library", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5497,20 +5135,6 @@ ], "description": "Symfony Security Component - Guard", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5576,20 +5200,6 @@ ], "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T14:14:32+00:00" }, { @@ -5672,20 +5282,6 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5716,20 +5312,6 @@ "MIT" ], "description": "A pack for the Symfony serializer", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-28T16:26:24+00:00" }, { @@ -5838,20 +5420,6 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5916,20 +5484,6 @@ "utf-8", "utf8" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-16T13:02:39+00:00" }, { @@ -6007,20 +5561,6 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6179,20 +5719,6 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6268,20 +5794,6 @@ ], "description": "Symfony TwigBundle", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6403,20 +5915,6 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -6492,20 +5990,6 @@ "debug", "dump" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6566,20 +6050,6 @@ "instantiate", "serialize" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -6692,20 +6162,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -6986,12 +6442,6 @@ "safe writer", "webimpress" ], - "funding": [ - { - "url": "https://github.com/michalbundyra", - "type": "github" - } - ], "time": "2020-03-21T15:49:08+00:00" }, { @@ -7331,12 +6781,6 @@ "Xdebug", "performance" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - } - ], "time": "2020-03-01T12:26:26+00:00" }, { @@ -7870,16 +7314,16 @@ }, { "name": "guikingone/panther-extension", - "version": "0.4.1", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/Guikingone/panther-extension.git", - "reference": "849fd2c87ed7ecd760c99784cf83984f376058dc" + "reference": "bdb5cdcaa95459969e7c9b0a9315ea01b740228b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guikingone/panther-extension/zipball/849fd2c87ed7ecd760c99784cf83984f376058dc", - "reference": "849fd2c87ed7ecd760c99784cf83984f376058dc", + "url": "https://api.github.com/repos/Guikingone/panther-extension/zipball/bdb5cdcaa95459969e7c9b0a9315ea01b740228b", + "reference": "bdb5cdcaa95459969e7c9b0a9315ea01b740228b", "shasum": "" }, "require": { @@ -7888,13 +7332,12 @@ "behat/mink-extension": "^2.0", "ext-zip": "*", "php": ">=7.1", - "symfony/config": "^3.0|^4.0|^5.0", + "symfony/config": "^2.7|^3.0|^4.0|^5.0", "symfony/panther": "^0.7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.16", "infection/infection": "^0.13.6", - "phpstan/phpstan": "^0.12.23", "phpunit/phpunit": "^7.5" }, "type": "library", @@ -7905,7 +7348,6 @@ "PantherExtension\\Driver\\": "src/Driver/", "PantherExtension\\Driver\\Element\\": "src/Driver/Element/", "PantherExtension\\Driver\\Exception\\": "src/Driver/Exception/", - "PantherExtension\\Driver\\Helper\\": "src/Driver/Helper/", "PantherExtension\\Extension\\": "src/Extension/" } }, @@ -7928,7 +7370,7 @@ "extension", "web" ], - "time": "2020-05-06T19:31:23+00:00" + "time": "2020-04-29T12:31:06+00:00" }, { "name": "hautelook/alice-bundle", @@ -7996,12 +7438,6 @@ "orm", "symfony" ], - "funding": [ - { - "url": "https://github.com/theofidry", - "type": "github" - } - ], "time": "2020-03-15T10:07:54+00:00" }, { @@ -8504,24 +7940,21 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.19", + "version": "0.12.18", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d" + "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d", - "reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286", + "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286", "shasum": "" }, "require": { "php": "^7.1" }, - "conflict": { - "phpstan/phpstan-shim": "*" - }, "bin": [ "phpstan", "phpstan.phar" @@ -8542,21 +7975,7 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "funding": [ - { - "url": "https://github.com/ondrejmirtes", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpstan", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" - } - ], - "time": "2020-04-19T20:35:10+00:00" + "time": "2020-03-22T16:51:47+00:00" }, { "name": "phpstan/phpstan-doctrine", @@ -8624,16 +8043,16 @@ }, { "name": "phpstan/phpstan-symfony", - "version": "0.12.6", + "version": "0.12.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "ba69dcd8e57c1a8580bf190e0554bea0fc37fe2f" + "reference": "5e4b7ba02f2235271a069deeb88340a210d6c87c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/ba69dcd8e57c1a8580bf190e0554bea0fc37fe2f", - "reference": "ba69dcd8e57c1a8580bf190e0554bea0fc37fe2f", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/5e4b7ba02f2235271a069deeb88340a210d6c87c", + "reference": "5e4b7ba02f2235271a069deeb88340a210d6c87c", "shasum": "" }, "require": { @@ -8690,7 +8109,7 @@ } ], "description": "Symfony Framework extensions and rules for PHPStan", - "time": "2020-04-15T20:26:41+00:00" + "time": "2020-01-22T10:19:41+00:00" }, { "name": "phpunit/php-code-coverage", @@ -9025,16 +8444,6 @@ "testing", "xunit" ], - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-03-31T08:52:04+00:00" }, { @@ -9299,16 +8708,6 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "funding": [ - { - "url": "https://github.com/Ocramius", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", - "type": "tidelift" - } - ], "time": "2020-03-31T14:30:16+00:00" }, { @@ -10034,20 +9433,6 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -10101,20 +9486,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10176,20 +9547,6 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -10258,20 +9615,6 @@ ], "description": "Symfony HttpClient component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-12T16:45:47+00:00" }, { @@ -10397,20 +9740,6 @@ "scaffold", "scaffolding" ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-04T13:57:29+00:00" }, { @@ -10548,20 +9877,6 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10611,20 +9926,6 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-04-15T15:59:10+00:00" }, { @@ -10710,20 +10011,6 @@ ], "description": "Symfony ProxyManager Bridge", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10818,20 +10105,6 @@ ], "description": "Symfony WebProfilerBundle", "homepage": "https://symfony.com", - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10967,6 +10240,5 @@ "ext-iconv": "*", "ext-json": "*" }, - "platform-dev": [], - "plugin-api-version": "1.1.0" + "platform-dev": [] } diff --git a/config/bundles.php b/config/bundles.php index 687cb6d7..bb6f5cb0 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -21,4 +21,5 @@ Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'panther' => true], Hautelook\AliceBundle\HautelookAliceBundle::class => ['dev' => true, 'test' => true, 'panther' => true], Misd\PhoneNumberBundle\MisdPhoneNumberBundle::class => ['all' => true], + Knp\Bundle\PaginatorBundle\KnpPaginatorBundle::class => ['all' => true], ]; diff --git a/config/packages/knp_paginator.yaml b/config/packages/knp_paginator.yaml new file mode 100644 index 00000000..c7778510 --- /dev/null +++ b/config/packages/knp_paginator.yaml @@ -0,0 +1,3 @@ +knp_paginator: + template: + pagination: '@KnpPaginator/Pagination/twitter_bootstrap_v4_pagination.html.twig' diff --git a/config/services.yaml b/config/services.yaml index ccf41ca0..939bd842 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,6 +4,8 @@ # Put parameters here that don't need to change on each machine where the app is deployed # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration parameters: + app.pagination_default_limit: 2 + app.pagination_default_start: 1 app.most_important_skills_limit: 6 # used for separing data in the planning app.most_important_skills_to_display: [ch_vpsp, ch_vl] # used for displaying a badge near the user name app.slot_interval: '%env(APP_SLOT_INTERVAL)%' diff --git a/src/Controller/Organization/AssetType/AssetTypeListController.php b/src/Controller/Organization/AssetType/AssetTypeListController.php index c3c572ab..f480cfbb 100644 --- a/src/Controller/Organization/AssetType/AssetTypeListController.php +++ b/src/Controller/Organization/AssetType/AssetTypeListController.php @@ -6,8 +6,10 @@ use App\Entity\Organization; use App\Repository\AssetTypeRepository; +use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -18,19 +20,26 @@ class AssetTypeListController extends AbstractController { private AssetTypeRepository $assetTypeRepository; + private PaginatorInterface $paginator; - public function __construct(AssetTypeRepository $assetTypeRepository) + public function __construct(AssetTypeRepository $assetTypeRepository, PaginatorInterface $paginator) { $this->assetTypeRepository = $assetTypeRepository; + $this->paginator = $paginator; } - public function __invoke(): Response + public function __invoke(Request $request): Response { /** @var Organization $organization */ $organization = $this->getUser(); + $assetTypes = $this->paginator->paginate( + $this->assetTypeRepository->findByOrganization($organization), + $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), + $this->getParameter('app.pagination_default_limit') + ); return $this->render('organization/assetType/list.html.twig', [ - 'assetTypes' => $this->assetTypeRepository->findByOrganization($organization), + 'assetTypes' => $assetTypes, ]); } } diff --git a/src/Controller/Organization/CommissionableAsset/AssetsListController.php b/src/Controller/Organization/CommissionableAsset/AssetsListController.php index 3ad68671..a9098bc8 100644 --- a/src/Controller/Organization/CommissionableAsset/AssetsListController.php +++ b/src/Controller/Organization/CommissionableAsset/AssetsListController.php @@ -8,6 +8,7 @@ use App\Form\Factory\OrganizationSelectorFormFactory; use App\Repository\CommissionableAssetRepository; use App\Security\Voter\OrganizationVoter; +use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -22,23 +23,30 @@ class AssetsListController extends AbstractController { private CommissionableAssetRepository $assetRepository; private OrganizationSelectorFormFactory $organizationSelectorFormFactory; + private PaginatorInterface $paginator; - public function __construct(CommissionableAssetRepository $assetRepository, OrganizationSelectorFormFactory $organizationSelectorFormFactory) + public function __construct(CommissionableAssetRepository $assetRepository, OrganizationSelectorFormFactory $organizationSelectorFormFactory, PaginatorInterface $paginator) { $this->assetRepository = $assetRepository; $this->organizationSelectorFormFactory = $organizationSelectorFormFactory; + $this->paginator = $paginator; } public function __invoke(Request $request, Organization $organization): Response { /** @var Organization $currentOrganization */ $currentOrganization = $this->getUser(); + $assets = $this->paginator->paginate( + $this->assetRepository->findByOrganization($organization), + $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), + $this->getParameter('app.pagination_default_limit') + ); return $this->render( 'organization/commissionable_asset/list.html.twig', [ 'organization' => $organization, - 'assets' => $this->assetRepository->findByOrganization($organization), + 'assets' => $assets, 'organization_selector_form' => $this->organizationSelectorFormFactory->createForm( $organization, $currentOrganization, diff --git a/src/Controller/Organization/MissionType/MissionTypeController.php b/src/Controller/Organization/MissionType/MissionTypeController.php index c1494067..11978b0c 100644 --- a/src/Controller/Organization/MissionType/MissionTypeController.php +++ b/src/Controller/Organization/MissionType/MissionTypeController.php @@ -8,6 +8,7 @@ use App\Entity\Organization; use App\Form\Type\MissionTypeType; use App\Repository\MissionTypeRepository; +use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -30,11 +31,15 @@ public function __construct(MissionTypeRepository $missionTypeRepository) /** * @Route("/", name="app_organization_mission_type_index", methods={"GET"}) */ - public function index(): Response + public function index(Request $request, PaginatorInterface $paginator): Response { /** @var Organization $organization */ $organization = $this->getUser(); - $missionTypes = $this->missionTypeRepository->findByOrganization($organization); + $missionTypes = $paginator->paginate( + $this->missionTypeRepository->findByOrganizationQb($organization), + $request->query->getInt('page', 1), + 2 + ); return $this->render('organization/mission_type/index.html.twig', [ 'mission_types' => $missionTypes, diff --git a/src/Controller/Organization/OrganizationListController.php b/src/Controller/Organization/OrganizationListController.php index 10736919..db6d4db7 100644 --- a/src/Controller/Organization/OrganizationListController.php +++ b/src/Controller/Organization/OrganizationListController.php @@ -6,7 +6,9 @@ use App\Entity\Organization; use App\Repository\OrganizationRepository; +use Knp\Component\Pager\PaginatorInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Exception\AccessDeniedException; @@ -17,20 +19,26 @@ class OrganizationListController extends AbstractController { protected OrganizationRepository $organizationRepository; + private PaginatorInterface $paginator; - public function __construct(OrganizationRepository $organizationRepository) + public function __construct(OrganizationRepository $organizationRepository, PaginatorInterface $paginator) { $this->organizationRepository = $organizationRepository; + $this->paginator = $paginator; } - public function __invoke(): Response + public function __invoke(Request $request): Response { $organization = $this->getUser(); if (!$organization instanceof Organization || !$organization->isParent()) { throw new AccessDeniedException(); } - $organizations = $this->organizationRepository->findBy(['parent' => $organization], ['name' => 'ASC']); + $organizations = $this->paginator->paginate( + $this->organizationRepository->findByParentQueryBuilder($organization), + $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), + $this->getParameter('app.pagination_default_limit') + ); return $this->render('organization/list.html.twig', [ 'organizations' => $organizations, diff --git a/src/Controller/Organization/User/UserListController.php b/src/Controller/Organization/User/UserListController.php index 043f7d21..4aec242a 100644 --- a/src/Controller/Organization/User/UserListController.php +++ b/src/Controller/Organization/User/UserListController.php @@ -9,6 +9,7 @@ use App\Repository\OrganizationRepository; use App\Repository\UserRepository; use App\Security\Voter\OrganizationVoter; +use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\IsGranted; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; @@ -24,24 +25,31 @@ class UserListController extends AbstractController protected UserRepository $userRepository; protected OrganizationRepository $organizationRepository; private OrganizationSelectorFormFactory $organizationSelectorFormFactory; + private PaginatorInterface $paginator; - public function __construct(OrganizationRepository $organizationRepository, UserRepository $userRepository, OrganizationSelectorFormFactory $organizationSelectorFormFactory) + public function __construct(OrganizationRepository $organizationRepository, UserRepository $userRepository, OrganizationSelectorFormFactory $organizationSelectorFormFactory, PaginatorInterface $paginator) { $this->userRepository = $userRepository; $this->organizationRepository = $organizationRepository; $this->organizationSelectorFormFactory = $organizationSelectorFormFactory; + $this->paginator = $paginator; } public function __invoke(Request $request, Organization $organization): Response { /** @var Organization $currentOrganization */ $currentOrganization = $this->getUser(); + $users = $this->paginator->paginate( + $this->userRepository->findByOrganization($organization), + $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), + $this->getParameter('app.pagination_default_limit') + ); return $this->render( 'organization/user/list.html.twig', [ 'organization' => $organization, - 'users' => $this->userRepository->findByOrganization($organization), + 'users' => $users, 'organization_selector_form' => $this->organizationSelectorFormFactory->createForm( $organization, $currentOrganization, diff --git a/templates/organization/assetType/list.html.twig b/templates/organization/assetType/list.html.twig index a408ab8b..441e4ede 100644 --- a/templates/organization/assetType/list.html.twig +++ b/templates/organization/assetType/list.html.twig @@ -35,4 +35,8 @@ + {# display pagination #} +
+ {{ knp_pagination_render(assetTypes) }} +
{% endblock %} diff --git a/templates/organization/commissionable_asset/_list.html.twig b/templates/organization/commissionable_asset/_list.html.twig index 9cf0d396..f730a1cc 100644 --- a/templates/organization/commissionable_asset/_list.html.twig +++ b/templates/organization/commissionable_asset/_list.html.twig @@ -50,4 +50,8 @@ + {# display pagination #} +
+ {{ knp_pagination_render(assets) }} +
diff --git a/templates/organization/list.html.twig b/templates/organization/list.html.twig index 4e1465ab..c6e4ae65 100644 --- a/templates/organization/list.html.twig +++ b/templates/organization/list.html.twig @@ -33,4 +33,8 @@ + {# display pagination #} +
+ {{ knp_pagination_render(organizations) }} +
{% endblock %} diff --git a/templates/organization/mission_type/index.html.twig b/templates/organization/mission_type/index.html.twig index 555f91ee..ee7a1160 100644 --- a/templates/organization/mission_type/index.html.twig +++ b/templates/organization/mission_type/index.html.twig @@ -36,4 +36,8 @@ + {# display pagination #} +
+ {{ knp_pagination_render(mission_types) }} +
{% endblock %} diff --git a/templates/organization/user/_list.html.twig b/templates/organization/user/_list.html.twig index 2a221e89..ce4461fe 100644 --- a/templates/organization/user/_list.html.twig +++ b/templates/organization/user/_list.html.twig @@ -56,4 +56,8 @@ {% endfor %} + {# display pagination #} +
+ {{ knp_pagination_render(users) }} +
From 27dd52bd7db86f499cd72b0e568c13094b259aae Mon Sep 17 00:00:00 2001 From: Olivier Mairet Date: Fri, 8 May 2020 18:16:53 +0200 Subject: [PATCH 2/6] fix(pagination): change default pagination parameters --- config/services.yaml | 2 +- .../Organization/MissionType/MissionTypeController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/services.yaml b/config/services.yaml index 939bd842..9039f6d2 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,7 +4,7 @@ # Put parameters here that don't need to change on each machine where the app is deployed # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration parameters: - app.pagination_default_limit: 2 + app.pagination_default_limit: 30 app.pagination_default_start: 1 app.most_important_skills_limit: 6 # used for separing data in the planning app.most_important_skills_to_display: [ch_vpsp, ch_vl] # used for displaying a badge near the user name diff --git a/src/Controller/Organization/MissionType/MissionTypeController.php b/src/Controller/Organization/MissionType/MissionTypeController.php index 11978b0c..33674461 100644 --- a/src/Controller/Organization/MissionType/MissionTypeController.php +++ b/src/Controller/Organization/MissionType/MissionTypeController.php @@ -37,8 +37,8 @@ public function index(Request $request, PaginatorInterface $paginator): Response $organization = $this->getUser(); $missionTypes = $paginator->paginate( $this->missionTypeRepository->findByOrganizationQb($organization), - $request->query->getInt('page', 1), - 2 + $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), + $this->getParameter('app.pagination_default_limit') ); return $this->render('organization/mission_type/index.html.twig', [ From a677c46c472b57dd2747c9a35c4937b765440dcc Mon Sep 17 00:00:00 2001 From: Olivier Mairet Date: Sat, 9 May 2020 11:40:00 +0200 Subject: [PATCH 3/6] fix(ci): update composer to fix lock error in CI --- composer.lock | 1514 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 1154 insertions(+), 360 deletions(-) diff --git a/composer.lock b/composer.lock index a9db4eb9..c5cf356f 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": "6665759d0e5a2f9783166358b04203a1", + "content-hash": "ba46025de3c7c197b747a3506727f7d5", "packages": [ { "name": "beberlei/assert", @@ -70,20 +70,21 @@ }, { "name": "doctrine/annotations", - "version": "v1.8.0", + "version": "1.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" + "reference": "b9d758e831c70751155c698c2f7df4665314a1cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", - "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb", + "reference": "b9d758e831c70751155c698c2f7df4665314a1cb", "shasum": "" }, "require": { "doctrine/lexer": "1.*", + "ext-tokenizer": "*", "php": "^7.1" }, "require-dev": { @@ -93,7 +94,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -134,7 +135,7 @@ "docblock", "parser" ], - "time": "2019-10-01T18:55:10+00:00" + "time": "2020-04-20T09:18:32+00:00" }, { "name": "doctrine/cache", @@ -437,16 +438,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.10.1", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8" + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", - "reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/aab745e7b6b2de3b47019da81e7225e14dcfdac8", + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8", "shasum": "" }, "require": { @@ -458,9 +459,11 @@ "require-dev": { "doctrine/coding-standard": "^6.0", "jetbrains/phpstorm-stubs": "^2019.1", - "phpstan/phpstan": "^0.11.3", + "nikic/php-parser": "^4.4", + "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^8.4.1", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", + "vimeo/psalm": "^3.11" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -525,20 +528,34 @@ "sqlserver", "sqlsrv" ], - "time": "2020-01-04T12:56:21+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", + "type": "tidelift" + } + ], + "time": "2020-04-20T17:19:26+00:00" }, { "name": "doctrine/doctrine-bundle", - "version": "2.0.7", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "6926771140ee87a823c3b2c72602de9dda4490d3" + "reference": "b0e0deb6e700438401ede433a15a6372d2285202" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/6926771140ee87a823c3b2c72602de9dda4490d3", - "reference": "6926771140ee87a823c3b2c72602de9dda4490d3", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/b0e0deb6e700438401ede433a15a6372d2285202", + "reference": "b0e0deb6e700438401ede433a15a6372d2285202", "shasum": "" }, "require": { @@ -617,26 +634,41 @@ "orm", "persistence" ], - "time": "2020-01-18T11:56:15+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-bundle", + "type": "tidelift" + } + ], + "time": "2020-04-23T10:52:09+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "8f07fcfdac7f3591f3c4bf13a50cbae05f65ed70" + "reference": "39defca57ee0949e1475c46177b30b6d1b732e8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/8f07fcfdac7f3591f3c4bf13a50cbae05f65ed70", - "reference": "8f07fcfdac7f3591f3c4bf13a50cbae05f65ed70", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/39defca57ee0949e1475c46177b30b6d1b732e8f", + "reference": "39defca57ee0949e1475c46177b30b6d1b732e8f", "shasum": "" }, "require": { "doctrine/data-fixtures": "^1.3", "doctrine/doctrine-bundle": "^1.11|^2.0", "doctrine/orm": "^2.6.0", + "doctrine/persistence": "^1.3", "php": "^7.1", "symfony/config": "^3.4|^4.3|^5.0", "symfony/console": "^3.4|^4.3|^5.0", @@ -684,7 +716,21 @@ "Fixture", "persistence" ], - "time": "2019-11-13T15:46:58+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", + "type": "tidelift" + } + ], + "time": "2020-04-02T16:40:37+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", @@ -832,33 +878,38 @@ }, { "name": "doctrine/inflector", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" + "reference": "ab5de36233a1995f9c776c741b803eb8207aebef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", - "reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/ab5de36233a1995f9c776c741b803eb8207aebef", + "reference": "ab5de36233a1995f9c776c741b803eb8207aebef", "shasum": "" }, "require": { - "php": "^7.1" + "php": "^7.2" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "doctrine/coding-standard": "^7.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -887,15 +938,35 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", "keywords": [ "inflection", - "pluralize", - "singularize", - "string" + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" ], - "time": "2019-10-30T19:59:35+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], + "time": "2020-05-06T11:01:57+00:00" }, { "name": "doctrine/instantiator", @@ -1344,16 +1415,16 @@ }, { "name": "giggsey/libphonenumber-for-php", - "version": "8.12.1", + "version": "8.12.3", "source": { "type": "git", "url": "https://github.com/giggsey/libphonenumber-for-php.git", - "reference": "198dffa12831e17320207ce1bd3b121402d2cc8d" + "reference": "efe098354b5dd49a5457d9e35aa92298de736343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/198dffa12831e17320207ce1bd3b121402d2cc8d", - "reference": "198dffa12831e17320207ce1bd3b121402d2cc8d", + "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/efe098354b5dd49a5457d9e35aa92298de736343", + "reference": "efe098354b5dd49a5457d9e35aa92298de736343", "shasum": "" }, "require": { @@ -1408,7 +1479,7 @@ "phonenumber", "validation" ], - "time": "2020-03-30T08:29:12+00:00" + "time": "2020-05-06T11:46:14+00:00" }, { "name": "giggsey/locale", @@ -1511,16 +1582,16 @@ }, { "name": "knplabs/knp-components", - "version": "v2.3.4", + "version": "v2.3.5", "source": { "type": "git", "url": "https://github.com/KnpLabs/knp-components.git", - "reference": "a57e196b8ab413cb409aa49a5bd28fea61f619b2" + "reference": "b1945bc58cabb2b95fe028388d44a8a8743b04e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/a57e196b8ab413cb409aa49a5bd28fea61f619b2", - "reference": "a57e196b8ab413cb409aa49a5bd28fea61f619b2", + "url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/b1945bc58cabb2b95fe028388d44a8a8743b04e5", + "reference": "b1945bc58cabb2b95fe028388d44a8a8743b04e5", "shasum": "" }, "require": { @@ -1582,7 +1653,7 @@ "pager", "paginator" ], - "time": "2020-04-24T07:13:34+00:00" + "time": "2020-05-03T14:06:14+00:00" }, { "name": "knplabs/knp-paginator-bundle", @@ -1826,16 +1897,16 @@ }, { "name": "martin-georgiev/postgresql-for-doctrine", - "version": "v1.3.0", + "version": "v1.4.1", "source": { "type": "git", "url": "https://github.com/martin-georgiev/postgresql-for-doctrine.git", - "reference": "ec04e152a70f00718b0cd8c811d612450bbbb076" + "reference": "c7fc2b8a87744c17ac7c922e360ee7a29865167c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/martin-georgiev/postgresql-for-doctrine/zipball/ec04e152a70f00718b0cd8c811d612450bbbb076", - "reference": "ec04e152a70f00718b0cd8c811d612450bbbb076", + "url": "https://api.github.com/repos/martin-georgiev/postgresql-for-doctrine/zipball/c7fc2b8a87744c17ac7c922e360ee7a29865167c", + "reference": "c7fc2b8a87744c17ac7c922e360ee7a29865167c", "shasum": "" }, "require": { @@ -1843,7 +1914,7 @@ "ext-ctype": "*", "ext-json": "*", "ext-mbstring": "*", - "php": "^7.1" + "php": "^7.2" }, "require-dev": { "doctrine/orm": "~2.5", @@ -1852,7 +1923,7 @@ "php-coveralls/php-coveralls": "^2.1", "phpstan/phpstan": "^0.11", "phpstan/phpstan-phpunit": "^0.11", - "phpunit/phpunit": "^7.5 || ^8.0", + "phpunit/phpunit": "^8.5", "sensiolabs/security-checker": "^6.0" }, "suggest": { @@ -1888,7 +1959,7 @@ "text search", "tsvector" ], - "time": "2020-03-09T17:13:06+00:00" + "time": "2020-04-22T09:31:14+00:00" }, { "name": "monolog/monolog", @@ -1973,24 +2044,24 @@ }, { "name": "ocramius/package-versions", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/Ocramius/PackageVersions.git", - "reference": "651c372efc914aea8223e049f85afaf65e09ba23" + "reference": "421679846270a5772534828013a93be709fb13df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/651c372efc914aea8223e049f85afaf65e09ba23", - "reference": "651c372efc914aea8223e049f85afaf65e09ba23", + "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/421679846270a5772534828013a93be709fb13df", + "reference": "421679846270a5772534828013a93be709fb13df", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1.0", + "composer-plugin-api": "^1.1.0 || ^2.0", "php": "^7.4.0" }, "require-dev": { - "composer/composer": "^1.9.3", + "composer/composer": "^1.9.3 || ^2.0@dev", "doctrine/coding-standard": "^7.0.2", "ext-zip": "^1.15.0", "infection/infection": "^0.15.3", @@ -2020,27 +2091,37 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2020-03-06T11:34:16+00:00" + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ocramius/package-versions", + "type": "tidelift" + } + ], + "time": "2020-04-06T17:43:35+00:00" }, { "name": "ocramius/proxy-manager", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "e77928e8f11ea36b388f87e75c993d05f5da6bf1" + "reference": "ac1dd414fd114cfc0da9930e0ab46063c2f5e62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/e77928e8f11ea36b388f87e75c993d05f5da6bf1", - "reference": "e77928e8f11ea36b388f87e75c993d05f5da6bf1", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/ac1dd414fd114cfc0da9930e0ab46063c2f5e62a", + "reference": "ac1dd414fd114cfc0da9930e0ab46063c2f5e62a", "shasum": "" }, "require": { "laminas/laminas-code": "^3.4.1", - "ocramius/package-versions": "^1.5.1", - "php": "7.4.*", - "webimpress/safe-writer": "^2.0" + "ocramius/package-versions": "^1.8.0", + "php": "~7.4.1", + "webimpress/safe-writer": "^2.0.1" }, "conflict": { "doctrine/annotations": "<1.6.1", @@ -2050,13 +2131,13 @@ "require-dev": { "doctrine/coding-standard": "^6.0.0", "ext-phar": "*", - "infection/infection": "^0.15.0", - "nikic/php-parser": "^4.3.0", + "infection/infection": "^0.16.2", + "nikic/php-parser": "^4.4.0", "phpbench/phpbench": "^0.17.0", - "phpunit/phpunit": "^8.5.2", + "phpunit/phpunit": "^9.1.1", "slevomat/coding-standard": "^5.0.4", "squizlabs/php_codesniffer": "^3.5.4", - "vimeo/psalm": "^3.8.5" + "vimeo/psalm": "^3.11.1" }, "suggest": { "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)", @@ -2095,20 +2176,30 @@ "proxy pattern", "service proxies" ], - "time": "2020-02-08T19:22:03+00:00" + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/ocramius/proxy-manager", + "type": "tidelift" + } + ], + "time": "2020-04-13T14:42:16+00:00" }, { "name": "odolbeau/phone-number-bundle", - "version": "v3.0.0", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/odolbeau/phone-number-bundle.git", - "reference": "aa996f8fc45677d8ec9e518af895161e0428efce" + "reference": "7e89b82ccf8e0fc64ce5dda5e4c7111ea0d54592" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/odolbeau/phone-number-bundle/zipball/aa996f8fc45677d8ec9e518af895161e0428efce", - "reference": "aa996f8fc45677d8ec9e518af895161e0428efce", + "url": "https://api.github.com/repos/odolbeau/phone-number-bundle/zipball/7e89b82ccf8e0fc64ce5dda5e4c7111ea0d54592", + "reference": "7e89b82ccf8e0fc64ce5dda5e4c7111ea0d54592", "shasum": "" }, "require": { @@ -2116,6 +2207,9 @@ "php": "^7.2", "symfony/framework-bundle": "^3.4|^4.3|^5.0" }, + "conflict": { + "misd/phone-number-bundle": "*" + }, "require-dev": { "doctrine/doctrine-bundle": "^1.12|^2.0", "phpunit/phpunit": "^8.4", @@ -2134,16 +2228,13 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { "psr-4": { - "Misd\\PhoneNumberBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Misd\\PhoneNumberBundle\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2158,28 +2249,25 @@ "phonenumber", "telephone number" ], - "time": "2019-11-26T16:42:13+00:00" + "time": "2020-04-27T20:34:27+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", - "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", "shasum": "" }, "require": { "php": ">=7.1" }, - "require-dev": { - "phpunit/phpunit": "~6" - }, "type": "library", "extra": { "branch-alias": { @@ -2210,7 +2298,7 @@ "reflection", "static analysis" ], - "time": "2018-08-07T13:53:10+00:00" + "time": "2020-04-27T09:25:28+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -2501,25 +2589,25 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v5.5.3", + "version": "v5.5.5", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "98f0807137b13d0acfdf3c255a731516e97015de" + "reference": "c76bb1c5c67840ecb6d9be8e9d8d7036e375e317" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/98f0807137b13d0acfdf3c255a731516e97015de", - "reference": "98f0807137b13d0acfdf3c255a731516e97015de", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/c76bb1c5c67840ecb6d9be8e9d8d7036e375e317", + "reference": "c76bb1c5c67840ecb6d9be8e9d8d7036e375e317", "shasum": "" }, "require": { "doctrine/annotations": "^1.0", "php": ">=7.1.3", - "symfony/config": "^4.3|^5.0", - "symfony/dependency-injection": "^4.3|^5.0", - "symfony/framework-bundle": "^4.3|^5.0", - "symfony/http-kernel": "^4.3|^5.0" + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/framework-bundle": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0" }, "conflict": { "doctrine/doctrine-cache-bundle": "<1.3.1" @@ -2528,24 +2616,19 @@ "doctrine/doctrine-bundle": "^1.11|^2.0", "doctrine/orm": "^2.5", "nyholm/psr7": "^1.1", - "symfony/browser-kit": "^4.3|^5.0", - "symfony/dom-crawler": "^4.3|^5.0", - "symfony/expression-language": "^4.3|^5.0", - "symfony/finder": "^4.3|^5.0", + "symfony/browser-kit": "^4.4|^5.0", + "symfony/dom-crawler": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", "symfony/monolog-bridge": "^4.0|^5.0", "symfony/monolog-bundle": "^3.2", "symfony/phpunit-bridge": "^4.3.5|^5.0", "symfony/psr-http-message-bridge": "^1.1", - "symfony/security-bundle": "^4.3|^5.0", - "symfony/twig-bundle": "^4.3|^5.0", - "symfony/yaml": "^4.3|^5.0", + "symfony/security-bundle": "^4.4|^5.0", + "symfony/twig-bundle": "^4.4|^5.0", + "symfony/yaml": "^4.4|^5.0", "twig/twig": "^1.34|^2.4|^3.0" }, - "suggest": { - "symfony/expression-language": "", - "symfony/psr-http-message-bridge": "To use the PSR-7 converters", - "symfony/security-bundle": "" - }, "type": "symfony-bundle", "extra": { "branch-alias": { @@ -2575,20 +2658,20 @@ "annotations", "controllers" ], - "time": "2019-12-27T08:57:19+00:00" + "time": "2020-05-06T12:12:33+00:00" }, { "name": "symfony/asset", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "8872144d5d9f28eec62857400bb437693ef4d082" + "reference": "be35f49cf2cf1c54de30bc31d2c5ff3c1d880be8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/8872144d5d9f28eec62857400bb437693ef4d082", - "reference": "8872144d5d9f28eec62857400bb437693ef4d082", + "url": "https://api.github.com/repos/symfony/asset/zipball/be35f49cf2cf1c54de30bc31d2c5ff3c1d880be8", + "reference": "be35f49cf2cf1c54de30bc31d2c5ff3c1d880be8", "shasum": "" }, "require": { @@ -2631,20 +2714,34 @@ ], "description": "Symfony Asset Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T14:40:17+00:00" }, { "name": "symfony/cache", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "7c229da093cb0c630e5d16b99fd253e20f979ac2" + "reference": "0c5f5b1882dc82b255a4bdead4ed3c7738cddc04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/7c229da093cb0c630e5d16b99fd253e20f979ac2", - "reference": "7c229da093cb0c630e5d16b99fd253e20f979ac2", + "url": "https://api.github.com/repos/symfony/cache/zipball/0c5f5b1882dc82b255a4bdead4ed3c7738cddc04", + "reference": "0c5f5b1882dc82b255a4bdead4ed3c7738cddc04", "shasum": "" }, "require": { @@ -2710,7 +2807,21 @@ "caching", "psr6" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T17:58:55+00:00" }, { "name": "symfony/cache-contracts", @@ -2836,7 +2947,7 @@ }, { "name": "symfony/console", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -2908,6 +3019,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T11:42:42+00:00" }, { @@ -2985,16 +3110,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "12f943c5b0d5bdc79f5d0099ecdd1b201071b04f" + "reference": "013f4ce1a10c6aad81c4ad14466e49d802417f4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/12f943c5b0d5bdc79f5d0099ecdd1b201071b04f", - "reference": "12f943c5b0d5bdc79f5d0099ecdd1b201071b04f", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/013f4ce1a10c6aad81c4ad14466e49d802417f4f", + "reference": "013f4ce1a10c6aad81c4ad14466e49d802417f4f", "shasum": "" }, "require": { @@ -3077,11 +3202,25 @@ ], "description": "Symfony Doctrine Bridge", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T16:45:47+00:00" }, { "name": "symfony/dotenv", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", @@ -3134,11 +3273,25 @@ "env", "environment" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/error-handler", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", @@ -3189,11 +3342,25 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-30T14:14:32+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -3259,6 +3426,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3321,16 +3502,16 @@ }, { "name": "symfony/expression-language", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "00e044885469d193c3b8dfa62030cd4525576d4e" + "reference": "b93755750b9e2a8d240bdf014de5b545105c5178" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/00e044885469d193c3b8dfa62030cd4525576d4e", - "reference": "00e044885469d193c3b8dfa62030cd4525576d4e", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/b93755750b9e2a8d240bdf014de5b545105c5178", + "reference": "b93755750b9e2a8d240bdf014de5b545105c5178", "shasum": "" }, "require": { @@ -3368,7 +3549,21 @@ ], "description": "Symfony ExpressionLanguage Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-15T15:59:10+00:00" }, { "name": "symfony/filesystem", @@ -3422,7 +3617,7 @@ }, { "name": "symfony/finder", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3467,6 +3662,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -3520,16 +3729,16 @@ }, { "name": "symfony/form", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "2b8e26176c4b88ac44d822bb78dad3403d37ff83" + "reference": "a3ec37026c13851565599522f7c1d26cdcdbf7dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/2b8e26176c4b88ac44d822bb78dad3403d37ff83", - "reference": "2b8e26176c4b88ac44d822bb78dad3403d37ff83", + "url": "https://api.github.com/repos/symfony/form/zipball/a3ec37026c13851565599522f7c1d26cdcdbf7dd", + "reference": "a3ec37026c13851565599522f7c1d26cdcdbf7dd", "shasum": "" }, "require": { @@ -3600,20 +3809,34 @@ ], "description": "Symfony Form Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T17:58:55+00:00" }, { "name": "symfony/framework-bundle", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "b1807be65ff05c21d47094e77b6c5a4246284c33" + "reference": "3fd5aec4bc84750752ba1f039829362fa071e037" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/b1807be65ff05c21d47094e77b6c5a4246284c33", - "reference": "b1807be65ff05c21d47094e77b6c5a4246284c33", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/3fd5aec4bc84750752ba1f039829362fa071e037", + "reference": "3fd5aec4bc84750752ba1f039829362fa071e037", "shasum": "" }, "require": { @@ -3730,20 +3953,34 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "time": "2020-03-30T11:42:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T17:58:55+00:00" }, { "name": "symfony/http-foundation", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "26fb006a2c7b6cdd23d52157b05f8414ffa417b6" + "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/26fb006a2c7b6cdd23d52157b05f8414ffa417b6", - "reference": "26fb006a2c7b6cdd23d52157b05f8414ffa417b6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d", + "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d", "shasum": "" }, "require": { @@ -3785,20 +4022,34 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2020-03-30T14:14:32+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-18T20:50:06+00:00" }, { "name": "symfony/http-kernel", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "ad574c55d451127cab1c45b4ac51bf283e340cf0" + "reference": "3565e51eecd06106304baba5ccb7ba89db2d7d2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad574c55d451127cab1c45b4ac51bf283e340cf0", - "reference": "ad574c55d451127cab1c45b4ac51bf283e340cf0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3565e51eecd06106304baba5ccb7ba89db2d7d2b", + "reference": "3565e51eecd06106304baba5ccb7ba89db2d7d2b", "shasum": "" }, "require": { @@ -3814,6 +4065,7 @@ "symfony/browser-kit": "<4.4", "symfony/cache": "<5.0", "symfony/config": "<5.0", + "symfony/console": "<4.4", "symfony/dependency-injection": "<4.4", "symfony/doctrine-bridge": "<5.0", "symfony/form": "<5.0", @@ -3881,11 +4133,25 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2020-03-30T15:04:59+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T18:53:25+00:00" }, { "name": "symfony/inflector", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", @@ -3939,20 +4205,34 @@ "symfony", "words" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/intl", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "a02d65b026413150223c010db3000028bf9770eb" + "reference": "dc50ad5039ac685ca87306a346dc119cacdfea25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/a02d65b026413150223c010db3000028bf9770eb", - "reference": "a02d65b026413150223c010db3000028bf9770eb", + "url": "https://api.github.com/repos/symfony/intl/zipball/dc50ad5039ac685ca87306a346dc119cacdfea25", + "reference": "dc50ad5039ac685ca87306a346dc119cacdfea25", "shasum": "" }, "require": { @@ -4014,20 +4294,34 @@ "l10n", "localization" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T14:40:17+00:00" }, { "name": "symfony/mime", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "481b7d6da88922fb1e0d86a943987722b08f3955" + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955", - "reference": "481b7d6da88922fb1e0d86a943987722b08f3955", + "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b", + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b", "shasum": "" }, "require": { @@ -4076,20 +4370,34 @@ "mime", "mime-type" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-17T03:29:44+00:00" }, { "name": "symfony/monolog-bridge", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "fd67744bd7b1bd18350a102769b0575052a1fb9e" + "reference": "5f1bdaba25858fe22be47ddcf5e8f78e1b72a248" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/fd67744bd7b1bd18350a102769b0575052a1fb9e", - "reference": "fd67744bd7b1bd18350a102769b0575052a1fb9e", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/5f1bdaba25858fe22be47ddcf5e8f78e1b72a248", + "reference": "5f1bdaba25858fe22be47ddcf5e8f78e1b72a248", "shasum": "" }, "require": { @@ -4143,7 +4451,21 @@ ], "description": "Symfony Monolog Bridge", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T16:45:47+00:00" }, { "name": "symfony/monolog-bundle", @@ -4210,16 +4532,16 @@ }, { "name": "symfony/options-resolver", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "09dccfffd24b311df7f184aa80ee7b61ad61ed8d" + "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/09dccfffd24b311df7f184aa80ee7b61ad61ed8d", - "reference": "09dccfffd24b311df7f184aa80ee7b61ad61ed8d", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3707e3caeff2b797c0bfaadd5eba723dd44e6bf1", + "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1", "shasum": "" }, "require": { @@ -4260,7 +4582,21 @@ "configuration", "options" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-06T10:40:56+00:00" }, { "name": "symfony/orm-pack", @@ -4291,16 +4627,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b6786f69dd7b062390582f20520ab4918283217e" + "reference": "81f5385a0237989ec43a5ed2d94176c5c9616cc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b6786f69dd7b062390582f20520ab4918283217e", - "reference": "b6786f69dd7b062390582f20520ab4918283217e", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81f5385a0237989ec43a5ed2d94176c5c9616cc8", + "reference": "81f5385a0237989ec43a5ed2d94176c5c9616cc8", "shasum": "" }, "require": { @@ -4312,7 +4648,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -4347,20 +4683,34 @@ "portable", "shim" ], - "time": "2020-03-09T19:04:49+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-08T16:50:20+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "9c281272735eb66476e0fa7381e03fb0d4b60197" + "reference": "0913a9ab67d6042966287c8ad996927b6c710330" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/9c281272735eb66476e0fa7381e03fb0d4b60197", - "reference": "9c281272735eb66476e0fa7381e03fb0d4b60197", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/0913a9ab67d6042966287c8ad996927b6c710330", + "reference": "0913a9ab67d6042966287c8ad996927b6c710330", "shasum": "" }, "require": { @@ -4373,7 +4723,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -4405,20 +4755,34 @@ "portable", "shim" ], - "time": "2020-02-27T09:26:54+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-08T16:50:20+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" + "reference": "ab0af41deab94ec8dceb3d1fb408bdd038eba4dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", - "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ab0af41deab94ec8dceb3d1fb408bdd038eba4dc", + "reference": "ab0af41deab94ec8dceb3d1fb408bdd038eba4dc", "shasum": "" }, "require": { @@ -4432,7 +4796,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -4467,20 +4831,34 @@ "portable", "shim" ], - "time": "2020-03-09T19:04:49+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-08T16:50:20+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "e62715f03f90dd8d2f3eb5daa21b4d19d71aebde" + "reference": "cc65fba80f49c547e16f1afcc6fd26a1b101556e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/e62715f03f90dd8d2f3eb5daa21b4d19d71aebde", - "reference": "e62715f03f90dd8d2f3eb5daa21b4d19d71aebde", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/cc65fba80f49c547e16f1afcc6fd26a1b101556e", + "reference": "cc65fba80f49c547e16f1afcc6fd26a1b101556e", "shasum": "" }, "require": { @@ -4492,7 +4870,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -4530,20 +4908,34 @@ "portable", "shim" ], - "time": "2020-02-27T09:26:54+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-08T16:50:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" + "reference": "a54881ec0ab3b2005c406aed0023c062879031e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a54881ec0ab3b2005c406aed0023c062879031e7", + "reference": "a54881ec0ab3b2005c406aed0023c062879031e7", "shasum": "" }, "require": { @@ -4555,7 +4947,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -4589,20 +4981,34 @@ "portable", "shim" ], - "time": "2020-03-09T19:04:49+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-08T16:50:20+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7" + "reference": "7e95fe59d12169fcf4041487e4bf34fca37ee0ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", - "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/7e95fe59d12169fcf4041487e4bf34fca37ee0ed", + "reference": "7e95fe59d12169fcf4041487e4bf34fca37ee0ed", "shasum": "" }, "require": { @@ -4611,7 +5017,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -4647,20 +5053,34 @@ "portable", "shim" ], - "time": "2020-02-27T09:26:54+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-02T14:56:09+00:00" }, { "name": "symfony/property-access", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "6b14bd5e184fc3bbbd35e378692c61af765515b8" + "reference": "259f26529231ab653fc96fb358e5e41dbb438aed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/6b14bd5e184fc3bbbd35e378692c61af765515b8", - "reference": "6b14bd5e184fc3bbbd35e378692c61af765515b8", + "url": "https://api.github.com/repos/symfony/property-access/zipball/259f26529231ab653fc96fb358e5e41dbb438aed", + "reference": "259f26529231ab653fc96fb358e5e41dbb438aed", "shasum": "" }, "require": { @@ -4714,20 +5134,34 @@ "property path", "reflection" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-15T15:59:10+00:00" }, { "name": "symfony/property-info", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "e43b6acca3951ef2575e05f9bc9d5723df97afcc" + "reference": "e9e40f14a2d2d163fb603f8646a76a6ff4b9426e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/e43b6acca3951ef2575e05f9bc9d5723df97afcc", - "reference": "e43b6acca3951ef2575e05f9bc9d5723df97afcc", + "url": "https://api.github.com/repos/symfony/property-info/zipball/e9e40f14a2d2d163fb603f8646a76a6ff4b9426e", + "reference": "e9e40f14a2d2d163fb603f8646a76a6ff4b9426e", "shasum": "" }, "require": { @@ -4790,20 +5224,34 @@ "type", "validator" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-06T10:40:56+00:00" }, { "name": "symfony/routing", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d98a95d0a684caba47a47c1c50c602a669dc973b" + "reference": "9b18480a6e101f8d9ab7c483ace7c19441be5111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d98a95d0a684caba47a47c1c50c602a669dc973b", - "reference": "d98a95d0a684caba47a47c1c50c602a669dc973b", + "url": "https://api.github.com/repos/symfony/routing/zipball/9b18480a6e101f8d9ab7c483ace7c19441be5111", + "reference": "9b18480a6e101f8d9ab7c483ace7c19441be5111", "shasum": "" }, "require": { @@ -4866,20 +5314,34 @@ "uri", "url" ], - "time": "2020-03-30T11:42:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-21T21:02:50+00:00" }, { "name": "symfony/security-bundle", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "1f42f8213cfbffce09c0a1834f34a4b1d444c4c1" + "reference": "b26fa15f2f748430112731f51f2c3c70fc6bbe1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/1f42f8213cfbffce09c0a1834f34a4b1d444c4c1", - "reference": "1f42f8213cfbffce09c0a1834f34a4b1d444c4c1", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/b26fa15f2f748430112731f51f2c3c70fc6bbe1a", + "reference": "b26fa15f2f748430112731f51f2c3c70fc6bbe1a", "shasum": "" }, "require": { @@ -4949,20 +5411,34 @@ ], "description": "Symfony SecurityBundle", "homepage": "https://symfony.com", - "time": "2020-03-30T11:42:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-22T00:36:07+00:00" }, { "name": "symfony/security-core", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "90a6f8982ca80dcb1a384e0d9b1ac8de073a4e34" + "reference": "5945abf1e64df5fdfb6aae9753c04f130fe96010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/90a6f8982ca80dcb1a384e0d9b1ac8de073a4e34", - "reference": "90a6f8982ca80dcb1a384e0d9b1ac8de073a4e34", + "url": "https://api.github.com/repos/symfony/security-core/zipball/5945abf1e64df5fdfb6aae9753c04f130fe96010", + "reference": "5945abf1e64df5fdfb6aae9753c04f130fe96010", "shasum": "" }, "require": { @@ -5022,11 +5498,25 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "time": "2020-03-30T14:14:32+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-21T21:19:41+00:00" }, { "name": "symfony/security-csrf", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/security-csrf.git", @@ -5081,20 +5571,34 @@ ], "description": "Symfony Security Component - CSRF Library", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/security-guard", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/security-guard.git", - "reference": "ebdb461f5ca98027c21899049fa4b01a58256b67" + "reference": "9e9ebbd005ca5af051e57a47d46394357cdff1d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-guard/zipball/ebdb461f5ca98027c21899049fa4b01a58256b67", - "reference": "ebdb461f5ca98027c21899049fa4b01a58256b67", + "url": "https://api.github.com/repos/symfony/security-guard/zipball/9e9ebbd005ca5af051e57a47d46394357cdff1d8", + "reference": "9e9ebbd005ca5af051e57a47d46394357cdff1d8", "shasum": "" }, "require": { @@ -5135,20 +5639,34 @@ ], "description": "Symfony Security Component - Guard", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-15T15:59:10+00:00" }, { "name": "symfony/security-http", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "af7315dafa9e402969f1cc433a8f719a4b9bcd98" + "reference": "052d81213d007c07e61c9c4407cfd34e67b9ed17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/af7315dafa9e402969f1cc433a8f719a4b9bcd98", - "reference": "af7315dafa9e402969f1cc433a8f719a4b9bcd98", + "url": "https://api.github.com/repos/symfony/security-http/zipball/052d81213d007c07e61c9c4407cfd34e67b9ed17", + "reference": "052d81213d007c07e61c9c4407cfd34e67b9ed17", "shasum": "" }, "require": { @@ -5156,7 +5674,7 @@ "symfony/http-foundation": "^4.4.7|^5.0.7", "symfony/http-kernel": "^4.4|^5.0", "symfony/property-access": "^4.4|^5.0", - "symfony/security-core": "^4.4.7|^5.0.7" + "symfony/security-core": "^4.4.8|^5.0.8" }, "conflict": { "symfony/security-csrf": "<4.4" @@ -5200,20 +5718,34 @@ ], "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", - "time": "2020-03-30T14:14:32+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-06T10:40:56+00:00" }, { "name": "symfony/serializer", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "5f9e12db25c6f993b4999159957b75d32a3f4ade" + "reference": "aa5d99bb179b5166cfe15d79dc067f516f3f4343" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/5f9e12db25c6f993b4999159957b75d32a3f4ade", - "reference": "5f9e12db25c6f993b4999159957b75d32a3f4ade", + "url": "https://api.github.com/repos/symfony/serializer/zipball/aa5d99bb179b5166cfe15d79dc067f516f3f4343", + "reference": "aa5d99bb179b5166cfe15d79dc067f516f3f4343", "shasum": "" }, "require": { @@ -5282,7 +5814,21 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T16:45:47+00:00" }, { "name": "symfony/serializer-pack", @@ -5374,7 +5920,7 @@ }, { "name": "symfony/stopwatch", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -5420,11 +5966,25 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/string", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", @@ -5484,20 +6044,34 @@ "utf-8", "utf8" ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-16T13:02:39+00:00" }, { "name": "symfony/translation", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "99b831770e10807dca0979518e2c89edffef5978" + "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/99b831770e10807dca0979518e2c89edffef5978", - "reference": "99b831770e10807dca0979518e2c89edffef5978", + "url": "https://api.github.com/repos/symfony/translation/zipball/c3879db7a68fe3e12b41263b05879412c87b27fd", + "reference": "c3879db7a68fe3e12b41263b05879412c87b27fd", "shasum": "" }, "require": { @@ -5561,7 +6135,21 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T16:45:47+00:00" }, { "name": "symfony/translation-contracts", @@ -5622,16 +6210,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "3a1ef6e7d25b040c9925e3507a7a9cd92d36d71b" + "reference": "5962eb3be6591cc985f32be1632e7b096d0979e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/3a1ef6e7d25b040c9925e3507a7a9cd92d36d71b", - "reference": "3a1ef6e7d25b040c9925e3507a7a9cd92d36d71b", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/5962eb3be6591cc985f32be1632e7b096d0979e3", + "reference": "5962eb3be6591cc985f32be1632e7b096d0979e3", "shasum": "" }, "require": { @@ -5719,11 +6307,25 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-15T15:59:10+00:00" }, { "name": "symfony/twig-bundle", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", @@ -5794,6 +6396,20 @@ ], "description": "Symfony TwigBundle", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -5826,16 +6442,16 @@ }, { "name": "symfony/validator", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "fc459a3d66bda9c0f8231a4d44dddd6daf23db92" + "reference": "909c45839d32f9e4c09d4f155a7d761201e7e47e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/fc459a3d66bda9c0f8231a4d44dddd6daf23db92", - "reference": "fc459a3d66bda9c0f8231a4d44dddd6daf23db92", + "url": "https://api.github.com/repos/symfony/validator/zipball/909c45839d32f9e4c09d4f155a7d761201e7e47e", + "reference": "909c45839d32f9e4c09d4f155a7d761201e7e47e", "shasum": "" }, "require": { @@ -5915,20 +6531,34 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2020-03-30T11:42:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T18:26:18+00:00" }, { "name": "symfony/var-dumper", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f74a126acd701392eef2492a17228d42552c86b5" + "reference": "09de28632f16f81058a85fcf318397218272a07b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f74a126acd701392eef2492a17228d42552c86b5", - "reference": "f74a126acd701392eef2492a17228d42552c86b5", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/09de28632f16f81058a85fcf318397218272a07b", + "reference": "09de28632f16f81058a85fcf318397218272a07b", "shasum": "" }, "require": { @@ -5990,20 +6620,34 @@ "debug", "dump" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-12T16:45:47+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "ffd29a70370e466343e33154b5df197a07a13afa" + "reference": "5d18811da9e1ae2bb86b0a97fb2d784e27ffd59f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/ffd29a70370e466343e33154b5df197a07a13afa", - "reference": "ffd29a70370e466343e33154b5df197a07a13afa", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5d18811da9e1ae2bb86b0a97fb2d784e27ffd59f", + "reference": "5d18811da9e1ae2bb86b0a97fb2d784e27ffd59f", "shasum": "" }, "require": { @@ -6050,7 +6694,21 @@ "instantiate", "serialize" ], - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-15T15:59:10+00:00" }, { "name": "symfony/webpack-encore-bundle", @@ -6107,16 +6765,16 @@ }, { "name": "symfony/yaml", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "ad5e9c83ade5bbb3a96a3f30588a0622708caefd" + "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/ad5e9c83ade5bbb3a96a3f30588a0622708caefd", - "reference": "ad5e9c83ade5bbb3a96a3f30588a0622708caefd", + "url": "https://api.github.com/repos/symfony/yaml/zipball/482fb4e710e5af3e0e78015f19aa716ad953392f", + "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f", "shasum": "" }, "require": { @@ -6162,7 +6820,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2020-03-30T11:42:42+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T17:58:55+00:00" }, { "name": "twig/cache-extension", @@ -7175,16 +7847,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.1", + "version": "v2.16.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "c8afb599858876e95e8ebfcd97812d383fa23f02" + "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c8afb599858876e95e8ebfcd97812d383fa23f02", - "reference": "c8afb599858876e95e8ebfcd97812d383fa23f02", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0", + "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0", "shasum": "" }, "require": { @@ -7220,6 +7892,7 @@ "symfony/yaml": "^3.0 || ^4.0 || ^5.0" }, "suggest": { + "ext-dom": "For handling output formats in XML", "ext-mbstring": "For handling non-UTF8 characters in cache signature.", "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", @@ -7242,6 +7915,7 @@ "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", "tests/Test/InternalIntegrationCaseFactory.php", + "tests/Test/IsIdenticalConstraint.php", "tests/TestCase.php" ] }, @@ -7260,7 +7934,13 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2019-11-25T22:10:32+00:00" + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2020-04-15T18:51:10+00:00" }, { "name": "fzaninotto/faker", @@ -7314,16 +7994,16 @@ }, { "name": "guikingone/panther-extension", - "version": "0.3.0", + "version": "0.4.1", "source": { "type": "git", "url": "https://github.com/Guikingone/panther-extension.git", - "reference": "bdb5cdcaa95459969e7c9b0a9315ea01b740228b" + "reference": "849fd2c87ed7ecd760c99784cf83984f376058dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Guikingone/panther-extension/zipball/bdb5cdcaa95459969e7c9b0a9315ea01b740228b", - "reference": "bdb5cdcaa95459969e7c9b0a9315ea01b740228b", + "url": "https://api.github.com/repos/Guikingone/panther-extension/zipball/849fd2c87ed7ecd760c99784cf83984f376058dc", + "reference": "849fd2c87ed7ecd760c99784cf83984f376058dc", "shasum": "" }, "require": { @@ -7332,12 +8012,13 @@ "behat/mink-extension": "^2.0", "ext-zip": "*", "php": ">=7.1", - "symfony/config": "^2.7|^3.0|^4.0|^5.0", + "symfony/config": "^3.0|^4.0|^5.0", "symfony/panther": "^0.7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.16", "infection/infection": "^0.13.6", + "phpstan/phpstan": "^0.12.23", "phpunit/phpunit": "^7.5" }, "type": "library", @@ -7348,6 +8029,7 @@ "PantherExtension\\Driver\\": "src/Driver/", "PantherExtension\\Driver\\Element\\": "src/Driver/Element/", "PantherExtension\\Driver\\Exception\\": "src/Driver/Exception/", + "PantherExtension\\Driver\\Helper\\": "src/Driver/Helper/", "PantherExtension\\Extension\\": "src/Extension/" } }, @@ -7370,7 +8052,7 @@ "extension", "web" ], - "time": "2020-04-29T12:31:06+00:00" + "time": "2020-05-06T19:31:23+00:00" }, { "name": "hautelook/alice-bundle", @@ -7607,16 +8289,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.3.0", + "version": "v4.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", - "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", + "reference": "bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120", "shasum": "" }, "require": { @@ -7655,7 +8337,7 @@ "parser", "php" ], - "time": "2019-11-08T13:50:10+00:00" + "time": "2020-04-10T16:34:50+00:00" }, { "name": "phar-io/manifest", @@ -7940,21 +8622,24 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.18", + "version": "0.12.23", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286" + "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286", - "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75", + "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75", "shasum": "" }, "require": { "php": "^7.1" }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, "bin": [ "phpstan", "phpstan.phar" @@ -7975,20 +8660,34 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2020-03-22T16:51:47+00:00" + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://www.patreon.com/phpstan", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2020-05-05T12:55:44+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "0.12.10", + "version": "0.12.12", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "601f343b05875074454ca72702204592f8844f7d" + "reference": "842047b2496a46dca2c826d9d6ae37ed08593677" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/601f343b05875074454ca72702204592f8844f7d", - "reference": "601f343b05875074454ca72702204592f8844f7d", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/842047b2496a46dca2c826d9d6ae37ed08593677", + "reference": "842047b2496a46dca2c826d9d6ae37ed08593677", "shasum": "" }, "require": { @@ -8039,20 +8738,20 @@ "MIT" ], "description": "Doctrine extensions for PHPStan", - "time": "2020-03-13T13:03:08+00:00" + "time": "2020-05-08T08:31:05+00:00" }, { "name": "phpstan/phpstan-symfony", - "version": "0.12.4", + "version": "0.12.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "5e4b7ba02f2235271a069deeb88340a210d6c87c" + "reference": "ba69dcd8e57c1a8580bf190e0554bea0fc37fe2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/5e4b7ba02f2235271a069deeb88340a210d6c87c", - "reference": "5e4b7ba02f2235271a069deeb88340a210d6c87c", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/ba69dcd8e57c1a8580bf190e0554bea0fc37fe2f", + "reference": "ba69dcd8e57c1a8580bf190e0554bea0fc37fe2f", "shasum": "" }, "require": { @@ -8109,7 +8808,7 @@ } ], "description": "Symfony Framework extensions and rules for PHPStan", - "time": "2020-01-22T10:19:41+00:00" + "time": "2020-04-15T20:26:41+00:00" }, { "name": "phpunit/php-code-coverage", @@ -8365,16 +9064,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.5.3", + "version": "8.5.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "67750516bc02f300e2742fed2f50177f8f37bedf" + "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67750516bc02f300e2742fed2f50177f8f37bedf", - "reference": "67750516bc02f300e2742fed2f50177f8f37bedf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23", + "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23", "shasum": "" }, "require": { @@ -8444,7 +9143,17 @@ "testing", "xunit" ], - "time": "2020-03-31T08:52:04+00:00" + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-04-23T04:39:42+00:00" }, { "name": "roave/security-advisories", @@ -8452,12 +9161,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "0f73cf4b4b9227eb8845723bc2a8869bc4dd6e8f" + "reference": "ec1a75b10126327b351fdea7c2b9bfb94e2f6f35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0f73cf4b4b9227eb8845723bc2a8869bc4dd6e8f", - "reference": "0f73cf4b4b9227eb8845723bc2a8869bc4dd6e8f", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ec1a75b10126327b351fdea7c2b9bfb94e2f6f35", + "reference": "ec1a75b10126327b351fdea7c2b9bfb94e2f6f35", "shasum": "" }, "conflict": { @@ -8470,6 +9179,7 @@ "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "aws/aws-sdk-php": ">=3,<3.2.1", "bagisto/bagisto": "<0.1.5", + "barrelstrength/sprout-base-email": "<3.9", "bolt/bolt": "<3.6.10", "brightlocal/phpwhois": "<=4.2.5", "buddypress/buddypress": "<5.1.2", @@ -8503,6 +9213,8 @@ "endroid/qr-code-bundle": "<3.4.2", "enshrined/svg-sanitize": "<0.13.1", "erusev/parsedown": "<1.7.2", + "ezsystems/demobundle": ">=5.4,<5.4.6.1", + "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1", "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1|>=5.4,<5.4.11.1|>=2017.12,<2017.12.0.1", "ezsystems/ezplatform": ">=1.7,<1.7.9.1|>=1.13,<1.13.5.1|>=2.5,<2.5.4", "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6", @@ -8545,6 +9257,7 @@ "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2", "monolog/monolog": ">=1.8,<1.12", "namshi/jose": "<2.2", + "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "openid/php-openid": "<2.3", @@ -8578,7 +9291,7 @@ "serluck/phpwhois": "<=4.2.6", "shopware/shopware": "<5.3.7", "silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1", - "silverstripe/assets": ">=1,<1.3.5|>=1.4,<1.4.4", + "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", @@ -8591,7 +9304,7 @@ "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", - "simplesamlphp/simplesamlphp": "<1.18.4", + "simplesamlphp/simplesamlphp": "<1.18.6", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", @@ -8599,7 +9312,7 @@ "socalnick/scn-social-auth": "<1.15.2", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", - "ssddanbrown/bookstack": "<0.25.3", + "ssddanbrown/bookstack": "<0.29.2", "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.49", "swiftmailer/swiftmailer": ">=4,<5.4.5", @@ -8708,7 +9421,17 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2020-03-31T14:30:16+00:00" + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", + "type": "tidelift" + } + ], + "time": "2020-05-09T00:00:21+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -9327,16 +10050,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.4", + "version": "3.5.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", - "reference": "dceec07328401de6211037abbb18bda423677e26", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -9374,7 +10097,7 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/browser-kit", @@ -9437,7 +10160,7 @@ }, { "name": "symfony/css-selector", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -9486,6 +10209,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -9676,22 +10413,22 @@ }, { "name": "symfony/maker-bundle", - "version": "v1.14.6", + "version": "v1.17.0", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "bc4df88792fbaaeb275167101dc714218475db5f" + "reference": "0b5fd0e13eedc88727b47a11edbcf68bc6b797ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/bc4df88792fbaaeb275167101dc714218475db5f", - "reference": "bc4df88792fbaaeb275167101dc714218475db5f", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/0b5fd0e13eedc88727b47a11edbcf68bc6b797ed", + "reference": "0b5fd0e13eedc88727b47a11edbcf68bc6b797ed", "shasum": "" }, "require": { - "doctrine/inflector": "^1.2", + "doctrine/inflector": "^1.2 || ^2.0", "nikic/php-parser": "^4.0", - "php": "^7.0.8", + "php": "^7.1.3", "symfony/config": "^3.4|^4.0|^5.0", "symfony/console": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", @@ -9740,7 +10477,21 @@ "scaffold", "scaffolding" ], - "time": "2020-03-04T13:57:29+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-08T13:53:05+00:00" }, { "name": "symfony/panther", @@ -9816,23 +10567,23 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "0258b43a94972abf1ee99ce2221359f8ac2a17fd" + "reference": "00b8da18a52fa842b7a39613fb0a63720a354e74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/0258b43a94972abf1ee99ce2221359f8ac2a17fd", - "reference": "0258b43a94972abf1ee99ce2221359f8ac2a17fd", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/00b8da18a52fa842b7a39613fb0a63720a354e74", + "reference": "00b8da18a52fa842b7a39613fb0a63720a354e74", "shasum": "" }, "require": { "php": ">=5.5.9" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0|<6.4,>=6.0|9.1.2" }, "suggest": { "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" @@ -9877,7 +10628,21 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T17:58:55+00:00" }, { "name": "symfony/process", @@ -9958,7 +10723,7 @@ }, { "name": "symfony/proxy-manager-bridge", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", @@ -10011,6 +10776,20 @@ ], "description": "Symfony ProxyManager Bridge", "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-03-27T16:56:45+00:00" }, { @@ -10043,16 +10822,16 @@ }, { "name": "symfony/web-profiler-bundle", - "version": "v5.0.7", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "635bf7fe86b67b0d3903a3013709fe028ac43b59" + "reference": "67fc2302ba7ca3d917decea6d3accdbd055398d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/635bf7fe86b67b0d3903a3013709fe028ac43b59", - "reference": "635bf7fe86b67b0d3903a3013709fe028ac43b59", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/67fc2302ba7ca3d917decea6d3accdbd055398d1", + "reference": "67fc2302ba7ca3d917decea6d3accdbd055398d1", "shasum": "" }, "require": { @@ -10105,7 +10884,21 @@ ], "description": "Symfony WebProfilerBundle", "homepage": "https://symfony.com", - "time": "2020-03-27T16:56:45+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-04-28T17:58:55+00:00" }, { "name": "theofidry/alice-data-fixtures", @@ -10240,5 +11033,6 @@ "ext-iconv": "*", "ext-json": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } From 7b19b70de703dc89946a183e6ec85f0b35e18394 Mon Sep 17 00:00:00 2001 From: Olivier Mairet Date: Sat, 9 May 2020 15:29:23 +0200 Subject: [PATCH 4/6] fix(pagination): add boolean pagination parameter to included _list --- .../Organization/Mission/MissionController.php | 10 ++++++++-- src/Repository/MissionRepository.php | 11 +++++++++-- .../organization/commissionable_asset/list.html.twig | 2 +- templates/organization/mission/_list.html.twig | 6 ++++++ templates/organization/mission/_show.html.twig | 4 ++-- templates/organization/mission/index.html.twig | 2 +- templates/organization/search.html.twig | 2 +- templates/organization/user/_list.html.twig | 10 ++++++---- templates/organization/user/list.html.twig | 2 +- 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/Controller/Organization/Mission/MissionController.php b/src/Controller/Organization/Mission/MissionController.php index 044e8b34..d924509d 100644 --- a/src/Controller/Organization/Mission/MissionController.php +++ b/src/Controller/Organization/Mission/MissionController.php @@ -10,6 +10,7 @@ use App\Form\Type\MissionsSearchType; use App\Form\Type\MissionType; use App\Repository\MissionRepository; +use Knp\Component\Pager\PaginatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -35,15 +36,20 @@ public function __construct(MissionRepository $missionRepository, PlanningDomain /** * @Route("/", name="app_organization_mission_index", methods={"GET"}) */ - public function index(): Response + public function index(Request $request, PaginatorInterface $paginator): Response { $form = $this->planningDomain->generateForm(MissionsSearchType::class); $filters = $form->getData(); + $missions = $paginator->paginate( + $this->missionRepository->findByFiltersQb($filters), + $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), + $this->getParameter('app.pagination_default_limit') + ); return $this->render('organization/mission/index.html.twig', [ 'filters' => $filters, 'form' => $form->createView(), - 'missions' => $this->missionRepository->findByFilters($filters), + 'missions' => $missions, ]); } diff --git a/src/Repository/MissionRepository.php b/src/Repository/MissionRepository.php index 5971fc08..70f54a64 100644 --- a/src/Repository/MissionRepository.php +++ b/src/Repository/MissionRepository.php @@ -42,6 +42,14 @@ public function findByOrganizationQb(Organization $organization): QueryBuilder } public function findByFilters(array $filters): array + { + $qb = $this->findByFiltersQb($filters); + $qb->setMaxResults(50); // TODO Paginate + + return $qb->getQuery()->getResult(); + } + + public function findByFiltersQb(array $filters): QueryBuilder { $qb = $this->findByOrganizationQb($filters['organization']); $qb = $this->addFromToFilter($qb, $filters); @@ -52,9 +60,8 @@ public function findByFilters(array $filters): array } $qb->orderBy('m.startTime', 'DESC'); - $qb->setMaxResults(50); // TODO Paginate - return $qb->getQuery()->getResult(); + return $qb; } /** diff --git a/templates/organization/commissionable_asset/list.html.twig b/templates/organization/commissionable_asset/list.html.twig index 2948fed0..3053f6e1 100644 --- a/templates/organization/commissionable_asset/list.html.twig +++ b/templates/organization/commissionable_asset/list.html.twig @@ -20,5 +20,5 @@ - {{ include('organization/commissionable_asset/_list.html.twig', {withDelete: true}) }} + {{ include('organization/commissionable_asset/_list.html.twig', {withDelete: true, pagination: true}) }} {% endblock %} diff --git a/templates/organization/mission/_list.html.twig b/templates/organization/mission/_list.html.twig index 9a114372..c8e00c14 100644 --- a/templates/organization/mission/_list.html.twig +++ b/templates/organization/mission/_list.html.twig @@ -72,3 +72,9 @@ +{% if pagination is defined and pagination %} + {# display pagination #} +
+ {{ knp_pagination_render(missions) }} +
+{% endif %} diff --git a/templates/organization/mission/_show.html.twig b/templates/organization/mission/_show.html.twig index e38793e9..5a3fafd3 100644 --- a/templates/organization/mission/_show.html.twig +++ b/templates/organization/mission/_show.html.twig @@ -21,8 +21,8 @@ {% endif %}

{{ 'organization.users' | trans }}

-{{ include('organization/user/_list.html.twig', {users: mission.users | sortBySkills, organization: mission.organization, showActions: false}) }} +{{ include('organization/user/_list.html.twig', {users: mission.users | sortBySkills, organization: mission.organization, showActions: false, pagination: false}) }}

{{ 'organization.assets' | trans }}

-{{ include('organization/commissionable_asset/_list.html.twig', {assets: mission.assets, organization: mission.organization, showActions: false}) }} +{{ include('organization/commissionable_asset/_list.html.twig', {assets: mission.assets, organization: mission.organization, showActions: false, pagination: false}) }} diff --git a/templates/organization/mission/index.html.twig b/templates/organization/mission/index.html.twig index b1cc7f8e..d7860758 100644 --- a/templates/organization/mission/index.html.twig +++ b/templates/organization/mission/index.html.twig @@ -29,5 +29,5 @@ - {% include('organization/mission/_list.html.twig') %} + {% include 'organization/mission/_list.html.twig' with {pagination: true} %} {% endblock %} diff --git a/templates/organization/search.html.twig b/templates/organization/search.html.twig index 87cd27aa..77efcc23 100644 --- a/templates/organization/search.html.twig +++ b/templates/organization/search.html.twig @@ -15,7 +15,7 @@

Bénévoles

{% if users|length %} - {% include 'organization/user/_list.html.twig' with {organization: app.user} %} + {% include 'organization/user/_list.html.twig' with {organization: app.user, pagination: false} %} {% else %}

{{ 'organization.search.noUsers' | trans }}

{% endif %} diff --git a/templates/organization/user/_list.html.twig b/templates/organization/user/_list.html.twig index ce4461fe..338bfcad 100644 --- a/templates/organization/user/_list.html.twig +++ b/templates/organization/user/_list.html.twig @@ -56,8 +56,10 @@ {% endfor %} - {# display pagination #} -
- {{ knp_pagination_render(users) }} -
+ {% if pagination is defined and pagination %} + {# display pagination #} +
+ {{ knp_pagination_render(users) }} +
+ {% endif %} diff --git a/templates/organization/user/list.html.twig b/templates/organization/user/list.html.twig index 559efd98..9185ad6b 100644 --- a/templates/organization/user/list.html.twig +++ b/templates/organization/user/list.html.twig @@ -12,5 +12,5 @@ {{ form(organization_selector_form) }} - {{ include('organization/user/_list.html.twig', {withDelete: true}) }} + {{ include('organization/user/_list.html.twig', {withDelete: true, pagination: true}) }} {% endblock %} From 96e2ea52242ef967c1762676c10ec46eb46ff4a2 Mon Sep 17 00:00:00 2001 From: Olivier Mairet Date: Sat, 9 May 2020 15:59:29 +0200 Subject: [PATCH 5/6] fix(pagination): add missing pagination parameter in search assets list include --- .../organization/commissionable_asset/_list.html.twig | 10 ++++++---- templates/organization/search.html.twig | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/templates/organization/commissionable_asset/_list.html.twig b/templates/organization/commissionable_asset/_list.html.twig index f730a1cc..08f99fd3 100644 --- a/templates/organization/commissionable_asset/_list.html.twig +++ b/templates/organization/commissionable_asset/_list.html.twig @@ -50,8 +50,10 @@ - {# display pagination #} -
- {{ knp_pagination_render(assets) }} -
+ {% if pagination is defined and pagination %} + {# display pagination #} +
+ {{ knp_pagination_render(assets) }} +
+ {% endif %} diff --git a/templates/organization/search.html.twig b/templates/organization/search.html.twig index 77efcc23..c4bfa9ec 100644 --- a/templates/organization/search.html.twig +++ b/templates/organization/search.html.twig @@ -24,7 +24,7 @@

Véhicules

{% if assets|length %} - {% include'organization/commissionable_asset/_list.html.twig' %} + {% include 'organization/commissionable_asset/_list.html.twig' with {pagination: false} %} {% else %}

{{ 'organization.search.noAssets' | trans }}

{% endif %} From 7774441aec292410308b342cae9a93c81f2dd43e Mon Sep 17 00:00:00 2001 From: Olivier Mairet Date: Sun, 10 May 2020 11:59:27 +0200 Subject: [PATCH 6/6] fix(pagination): change query to get children organization list --- .../CommissionableAsset/AssetsListController.php | 2 +- .../Organization/OrganizationListController.php | 2 +- src/Repository/OrganizationRepository.php | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Controller/Organization/CommissionableAsset/AssetsListController.php b/src/Controller/Organization/CommissionableAsset/AssetsListController.php index a9098bc8..c5e430fc 100644 --- a/src/Controller/Organization/CommissionableAsset/AssetsListController.php +++ b/src/Controller/Organization/CommissionableAsset/AssetsListController.php @@ -37,7 +37,7 @@ public function __invoke(Request $request, Organization $organization): Response /** @var Organization $currentOrganization */ $currentOrganization = $this->getUser(); $assets = $this->paginator->paginate( - $this->assetRepository->findByOrganization($organization), + $this->assetRepository->findByOrganizationAndChildrenQb($organization), $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), $this->getParameter('app.pagination_default_limit') ); diff --git a/src/Controller/Organization/OrganizationListController.php b/src/Controller/Organization/OrganizationListController.php index db6d4db7..c11d4622 100644 --- a/src/Controller/Organization/OrganizationListController.php +++ b/src/Controller/Organization/OrganizationListController.php @@ -35,7 +35,7 @@ public function __invoke(Request $request): Response } $organizations = $this->paginator->paginate( - $this->organizationRepository->findByParentQueryBuilder($organization), + $this->organizationRepository->findChildrenQueryBuilder($organization), $request->query->getInt('page', $this->getParameter('app.pagination_default_start')), $this->getParameter('app.pagination_default_limit') ); diff --git a/src/Repository/OrganizationRepository.php b/src/Repository/OrganizationRepository.php index dfe791d5..327fe568 100644 --- a/src/Repository/OrganizationRepository.php +++ b/src/Repository/OrganizationRepository.php @@ -106,6 +106,18 @@ public function findByParentQueryBuilder(Organization $organization): QueryBuild return $qb; } + public function findChildrenQueryBuilder(Organization $organization): QueryBuilder + { + $qb = $this->createQueryBuilder('o'); + + $qb + ->where('o.parent = :orga') + ->setParameter('orga', $organization) + ->addOrderBy('o.name', 'ASC'); + + return $qb; + } + public function findByIdOrParentIdQueryBuilder(int $organizationId, QueryBuilder $qb = null): QueryBuilder { $alias = 'o';