From 55b7e192aa78c0361764597dcf5339a05a146de4 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 1 Sep 2018 14:23:38 +0200 Subject: [PATCH] Symfony update 4.1.4 (#290) --- composer.json | 2 +- composer.lock | 447 +++++++++--------- config/packages/sensio_framework_extra.yaml | 3 + phpunit.xml.dist | 2 + src/Controller/Admin/ActivityController.php | 19 +- src/Controller/Admin/CustomerController.php | 19 +- src/Controller/Admin/ProjectController.php | 19 +- src/Controller/Admin/TimesheetController.php | 22 +- src/Controller/Admin/UserController.php | 20 +- src/Controller/CalendarController.php | 11 +- src/Controller/DashboardController.php | 8 +- src/Controller/HelpController.php | 10 +- src/Controller/InvoiceController.php | 19 +- src/Controller/ProfileController.php | 23 +- src/Controller/TimesheetController.php | 25 +- tests/API/ActivityControllerTest.php | 1 - tests/API/ApiDocControllerTest.php | 1 - tests/API/CustomerControllerTest.php | 1 - tests/API/HealthcheckControllerTest.php | 1 - tests/API/ProjectControllerTest.php | 1 - tests/API/UserControllerTest.php | 1 - tests/Command/CreateUserCommandTest.php | 1 - .../Admin/ActivityControllerTest.php | 1 - .../Admin/CustomerControllerTest.php | 1 - .../Admin/ProjectControllerTest.php | 1 - tests/Controller/Admin/UserControllerTest.php | 1 - tests/Controller/CalendarControllerTest.php | 1 - tests/Controller/ProfileControllerTest.php | 1 - tests/Controller/TimesheetControllerTest.php | 1 - 29 files changed, 307 insertions(+), 356 deletions(-) create mode 100644 config/packages/sensio_framework_extra.yaml diff --git a/composer.json b/composer.json index 7c36f62d..86f5696e 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "kevinpapst/adminlte-bundle": "^2.0", "nelmio/api-doc-bundle": "^3.2", "ocramius/proxy-manager": "2.1.1", - "sensio/framework-extra-bundle": "^5.1", + "sensio/framework-extra-bundle": "^5.2", "symfony/asset": "^4.0", "symfony/console": "^4.0", "symfony/dotenv": "^4.0", diff --git a/composer.lock b/composer.lock index dc4eda12..0037a75f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "916334cc4252096cbe9d328a38ba81a5", + "content-hash": "18295409680ef770e346af640c2c76d9", "packages": [ { "name": "beberlei/DoctrineExtensions", - "version": "v1.1.3", + "version": "v1.1.4", "source": { "type": "git", "url": "https://github.com/beberlei/DoctrineExtensions.git", - "reference": "51d93393ddced649da6066db233bc8e285a6588c" + "reference": "1d02c580cb59f10500871ed35651cb3a9408132e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/51d93393ddced649da6066db233bc8e285a6588c", - "reference": "51d93393ddced649da6066db233bc8e285a6588c", + "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/1d02c580cb59f10500871ed35651cb3a9408132e", + "reference": "1d02c580cb59f10500871ed35651cb3a9408132e", "shasum": "" }, "require": { @@ -58,7 +58,7 @@ "doctrine", "orm" ], - "time": "2018-07-14T09:31:10+00:00" + "time": "2018-08-13T18:18:04+00:00" }, { "name": "doctrine/annotations", @@ -130,16 +130,16 @@ }, { "name": "doctrine/cache", - "version": "v1.7.1", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a" + "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a", - "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a", + "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", + "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", "shasum": "" }, "require": { @@ -150,8 +150,9 @@ }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", + "doctrine/coding-standard": "^4.0", "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^5.7", + "phpunit/phpunit": "^7.0", "predis/predis": "~1.0" }, "suggest": { @@ -160,7 +161,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { @@ -195,12 +196,12 @@ } ], "description": "Caching library offering an object-oriented API for many cache backends", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2017-08-25T07:02:50+00:00" + "time": "2018-08-21T18:01:43+00:00" }, { "name": "doctrine/collections", @@ -1072,16 +1073,16 @@ }, { "name": "doctrine/persistence", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5" + "reference": "af1ec238659a83e320f03e0e454e200f689b4b97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/17896f6d56a2794a1619e019596ae627aabd8fd5", - "reference": "17896f6d56a2794a1619e019596ae627aabd8fd5", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/af1ec238659a83e320f03e0e454e200f689b4b97", + "reference": "af1ec238659a83e320f03e0e454e200f689b4b97", "shasum": "" }, "require": { @@ -1146,7 +1147,7 @@ "keywords": [ "persistence" ], - "time": "2018-06-14T18:57:48+00:00" + "time": "2018-07-12T12:37:50+00:00" }, { "name": "doctrine/reflection", @@ -1225,16 +1226,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "8790f594151ca6a2010c6218e09d96df67173ad3" + "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3", - "reference": "8790f594151ca6a2010c6218e09d96df67173ad3", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/54859fabea8b3beecbb1a282888d5c990036b9e3", + "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3", "shasum": "" }, "require": { @@ -1278,7 +1279,7 @@ "validation", "validator" ], - "time": "2018-04-10T10:11:19+00:00" + "time": "2018-08-16T20:49:45+00:00" }, { "name": "erusev/parsedown", @@ -1367,16 +1368,16 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "2.3.1", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "1abdf3d82502ac67b93c7f84c844fa147f0ec70e" + "reference": "3725279a6554c1d894eee0b377f49d3f69e3c217" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/1abdf3d82502ac67b93c7f84c844fa147f0ec70e", - "reference": "1abdf3d82502ac67b93c7f84c844fa147f0ec70e", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/3725279a6554c1d894eee0b377f49d3f69e3c217", + "reference": "3725279a6554c1d894eee0b377f49d3f69e3c217", "shasum": "" }, "require": { @@ -1410,10 +1411,10 @@ "symfony/asset": "^2.7|^3.0|^4.0", "symfony/browser-kit": "^2.7|^3.0|^4.0", "symfony/css-selector": "^2.7|^3.0|^4.0", - "symfony/dependency-injection": "^2.7|^3.0|^4.0", + "symfony/dependency-injection": "^2.7.20|^3.0|^4.0", "symfony/expression-language": "~2.7|^3.0|^4.0", "symfony/form": "^2.7|^3.0|^4.0", - "symfony/phpunit-bridge": "^3.2|^4.0", + "symfony/phpunit-bridge": "^4.0", "symfony/security-bundle": "^2.7|^3.0|^4.0", "symfony/serializer": "^2.7.11|^3.0.4|^4.0", "symfony/twig-bundle": "^2.7|^3.0|^4.0", @@ -1423,7 +1424,7 @@ }, "suggest": { "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ^1.0", - "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener, requires ^3.0", + "sensio/framework-extra-bundle": "Add support for the request body converter and the view response listener, requires ^3.0", "symfony/expression-language": "Add support for using the expression language in the routing, requires ^2.7|^3.0", "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ^2.7|^3.0", "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ^2.7|^3.0" @@ -1431,7 +1432,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.4-dev" } }, "autoload": { @@ -1465,7 +1466,7 @@ "keywords": [ "rest" ], - "time": "2018-02-28T13:57:04+00:00" + "time": "2018-08-21T16:54:14+00:00" }, { "name": "friendsofsymfony/user-bundle", @@ -2865,7 +2866,7 @@ }, { "name": "symfony/asset", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", @@ -2921,16 +2922,16 @@ }, { "name": "symfony/cache", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "c666a5bbfeb1fe05c7b91d46810f405c8bea14cf" + "reference": "b8440ff4635c6631aca21a09ab72e0b7e3a6cb7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/c666a5bbfeb1fe05c7b91d46810f405c8bea14cf", - "reference": "c666a5bbfeb1fe05c7b91d46810f405c8bea14cf", + "url": "https://api.github.com/repos/symfony/cache/zipball/b8440ff4635c6631aca21a09ab72e0b7e3a6cb7a", + "reference": "b8440ff4635c6631aca21a09ab72e0b7e3a6cb7a", "shasum": "" }, "require": { @@ -2986,20 +2987,20 @@ "caching", "psr6" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-27T09:36:56+00:00" }, { "name": "symfony/config", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "c868972ac26e4e19860ce11b300bb74145246ff9" + "reference": "76015a3cc372b14d00040ff58e18e29f69eba717" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/c868972ac26e4e19860ce11b300bb74145246ff9", - "reference": "c868972ac26e4e19860ce11b300bb74145246ff9", + "url": "https://api.github.com/repos/symfony/config/zipball/76015a3cc372b14d00040ff58e18e29f69eba717", + "reference": "76015a3cc372b14d00040ff58e18e29f69eba717", "shasum": "" }, "require": { @@ -3049,11 +3050,11 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-08T06:37:38+00:00" }, { "name": "symfony/console", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", @@ -3121,16 +3122,16 @@ }, { "name": "symfony/debug", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "9316545571f079c4dd183e674721d9dc783ce196" + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9316545571f079c4dd183e674721d9dc783ce196", - "reference": "9316545571f079c4dd183e674721d9dc783ce196", + "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052", + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052", "shasum": "" }, "require": { @@ -3173,20 +3174,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "f4f401fc2766eb8d766fc6043d9e6489b37a41e4" + "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f4f401fc2766eb8d766fc6043d9e6489b37a41e4", - "reference": "f4f401fc2766eb8d766fc6043d9e6489b37a41e4", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bae4983003c9d451e278504d7d9b9d7fc1846873", + "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873", "shasum": "" }, "require": { @@ -3244,24 +3245,24 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-08-01T08:24:03+00:00" + "time": "2018-08-08T11:48:58+00:00" }, { "name": "symfony/doctrine-bridge", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "3ecf9bddd49f6cd3a1088babf5db5c67aa05f27e" + "reference": "58e331b3f6bbbd0beeb41cc924455bf85f660f50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/3ecf9bddd49f6cd3a1088babf5db5c67aa05f27e", - "reference": "3ecf9bddd49f6cd3a1088babf5db5c67aa05f27e", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/58e331b3f6bbbd0beeb41cc924455bf85f660f50", + "reference": "58e331b3f6bbbd0beeb41cc924455bf85f660f50", "shasum": "" }, "require": { - "doctrine/common": "~2.4@stable", + "doctrine/common": "~2.4", "php": "^7.1.3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" @@ -3324,11 +3325,11 @@ ], "description": "Symfony Doctrine Bridge", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-24T10:22:26+00:00" }, { "name": "symfony/dotenv", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", @@ -3385,7 +3386,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -3448,7 +3449,7 @@ }, { "name": "symfony/expression-language", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", @@ -3498,16 +3499,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2e30335e0aafeaa86645555959572fe7cea22b43" + "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/2e30335e0aafeaa86645555959572fe7cea22b43", - "reference": "2e30335e0aafeaa86645555959572fe7cea22b43", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", + "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", "shasum": "" }, "require": { @@ -3544,11 +3545,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "symfony/finder", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3597,16 +3598,16 @@ }, { "name": "symfony/flex", - "version": "v1.0.89", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "26be754f42c3c3f21139af2bdd74118ef8f82757" + "reference": "d6f5fed47ddad2eb25d5cc19316692203a2898eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/26be754f42c3c3f21139af2bdd74118ef8f82757", - "reference": "26be754f42c3c3f21139af2bdd74118ef8f82757", + "url": "https://api.github.com/repos/symfony/flex/zipball/d6f5fed47ddad2eb25d5cc19316692203a2898eb", + "reference": "d6f5fed47ddad2eb25d5cc19316692203a2898eb", "shasum": "" }, "require": { @@ -3620,7 +3621,7 @@ "type": "composer-plugin", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" }, "class": "Symfony\\Flex\\Flex" }, @@ -3640,20 +3641,20 @@ } ], "description": "Composer plugin for Symfony", - "time": "2018-07-29T16:20:30+00:00" + "time": "2018-08-21T07:51:18+00:00" }, { "name": "symfony/form", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "424e9b89c20ef9255d58efd9519c01f1572a1587" + "reference": "f9b2156c881dd881bacb0a953055a28f1a517536" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/424e9b89c20ef9255d58efd9519c01f1572a1587", - "reference": "424e9b89c20ef9255d58efd9519c01f1572a1587", + "url": "https://api.github.com/repos/symfony/form/zipball/f9b2156c881dd881bacb0a953055a28f1a517536", + "reference": "f9b2156c881dd881bacb0a953055a28f1a517536", "shasum": "" }, "require": { @@ -3721,20 +3722,20 @@ ], "description": "Symfony Form Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-08-24T10:22:26+00:00" }, { "name": "symfony/framework-bundle", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "ad1ac510d8c89557b8afa2dd838e2f34b4c2529c" + "reference": "f62dc69959253acf717c3d89cd509975daf10e02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/ad1ac510d8c89557b8afa2dd838e2f34b4c2529c", - "reference": "ad1ac510d8c89557b8afa2dd838e2f34b4c2529c", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/f62dc69959253acf717c3d89cd509975daf10e02", + "reference": "f62dc69959253acf717c3d89cd509975daf10e02", "shasum": "" }, "require": { @@ -3837,20 +3838,20 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "time": "2018-08-01T08:24:03+00:00" + "time": "2018-08-17T12:07:19+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1" + "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7d93e3547660ec7ee3dad1428ba42e8076a0e5f1", - "reference": "7d93e3547660ec7ee3dad1428ba42e8076a0e5f1", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3a5c91e133b220bb882b3cd773ba91bf39989345", + "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345", "shasum": "" }, "require": { @@ -3891,20 +3892,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-08-01T14:07:44+00:00" + "time": "2018-08-27T17:47:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6347be5110efb27fe45ea04bf213078b67a05036" + "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6347be5110efb27fe45ea04bf213078b67a05036", - "reference": "6347be5110efb27fe45ea04bf213078b67a05036", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33de0a1ff2e1720096189e3ced682d7a4e8f5e35", + "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35", "shasum": "" }, "require": { @@ -3978,11 +3979,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-08-01T15:30:34+00:00" + "time": "2018-08-28T06:17:42+00:00" }, { "name": "symfony/inflector", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", @@ -4040,7 +4041,7 @@ }, { "name": "symfony/intl", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", @@ -4197,7 +4198,7 @@ }, { "name": "symfony/monolog-bridge", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", @@ -4326,7 +4327,7 @@ }, { "name": "symfony/options-resolver", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -4666,16 +4667,16 @@ }, { "name": "symfony/property-access", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "e97a399cb40333fc79724ddee952aa926a30c743" + "reference": "ae8561ba08af38e12dc5e21582ddb4baf66719ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/e97a399cb40333fc79724ddee952aa926a30c743", - "reference": "e97a399cb40333fc79724ddee952aa926a30c743", + "url": "https://api.github.com/repos/symfony/property-access/zipball/ae8561ba08af38e12dc5e21582ddb4baf66719ca", + "reference": "ae8561ba08af38e12dc5e21582ddb4baf66719ca", "shasum": "" }, "require": { @@ -4729,20 +4730,20 @@ "property path", "reflection" ], - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-08-24T10:22:26+00:00" }, { "name": "symfony/property-info", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "807e103da26f1ea0256e587fe918fe2ba68989fb" + "reference": "a3a785d23b4fe1d1cea02be14011d654432aeb89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/807e103da26f1ea0256e587fe918fe2ba68989fb", - "reference": "807e103da26f1ea0256e587fe918fe2ba68989fb", + "url": "https://api.github.com/repos/symfony/property-info/zipball/a3a785d23b4fe1d1cea02be14011d654432aeb89", + "reference": "a3a785d23b4fe1d1cea02be14011d654432aeb89", "shasum": "" }, "require": { @@ -4805,20 +4806,20 @@ "type", "validator" ], - "time": "2018-07-26T08:55:25+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/routing", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b" + "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b", - "reference": "6912cfebc0ea4e7a46fdd15c9bd1f427dd39ff1b", + "url": "https://api.github.com/repos/symfony/routing/zipball/a5784c2ec4168018c87b38f0e4f39d2278499f51", + "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51", "shasum": "" }, "require": { @@ -4882,20 +4883,20 @@ "uri", "url" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T07:58:40+00:00" }, { "name": "symfony/security", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/security.git", - "reference": "cc0e6ca4185d77a96e000f7f546fdcfb8aae5fb2" + "reference": "64c830b4dddbcbeacfe678b0b98e28d6c2870e42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security/zipball/cc0e6ca4185d77a96e000f7f546fdcfb8aae5fb2", - "reference": "cc0e6ca4185d77a96e000f7f546fdcfb8aae5fb2", + "url": "https://api.github.com/repos/symfony/security/zipball/64c830b4dddbcbeacfe678b0b98e28d6c2870e42", + "reference": "64c830b4dddbcbeacfe678b0b98e28d6c2870e42", "shasum": "" }, "require": { @@ -4959,20 +4960,20 @@ ], "description": "Symfony Security Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-08-19T08:16:41+00:00" }, { "name": "symfony/security-bundle", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "4e71975b267c0223152b12d402d3ff3ff1fa81e1" + "reference": "03f68de271c2a5fdddf9f41b25ef80bc1ddf303b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/4e71975b267c0223152b12d402d3ff3ff1fa81e1", - "reference": "4e71975b267c0223152b12d402d3ff3ff1fa81e1", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/03f68de271c2a5fdddf9f41b25ef80bc1ddf303b", + "reference": "03f68de271c2a5fdddf9f41b25ef80bc1ddf303b", "shasum": "" }, "require": { @@ -4980,7 +4981,7 @@ "php": "^7.1.3", "symfony/dependency-injection": "^3.4.3|^4.0.3", "symfony/http-kernel": "^4.1", - "symfony/security": "^4.1.1" + "symfony/security": "^4.1.4" }, "conflict": { "symfony/console": "<3.4", @@ -5039,11 +5040,11 @@ ], "description": "Symfony SecurityBundle", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "symfony/serializer", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", @@ -5123,7 +5124,7 @@ }, { "name": "symfony/stopwatch", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -5172,16 +5173,16 @@ }, { "name": "symfony/swiftmailer-bundle", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "f1ba0552a9cd4df0191a58845fbd5541cf9eda2d" + "reference": "7bd5de67552ee3f7e04df89d662d41eba346dc83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/f1ba0552a9cd4df0191a58845fbd5541cf9eda2d", - "reference": "f1ba0552a9cd4df0191a58845fbd5541cf9eda2d", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/7bd5de67552ee3f7e04df89d662d41eba346dc83", + "reference": "7bd5de67552ee3f7e04df89d662d41eba346dc83", "shasum": "" }, "require": { @@ -5230,11 +5231,11 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2018-04-03T16:29:41+00:00" + "time": "2018-08-29T08:49:17+00:00" }, { "name": "symfony/templating", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/templating.git", @@ -5290,16 +5291,16 @@ }, { "name": "symfony/translation", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65" + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65", - "reference": "6fcd1bd44fd6d7181e6ea57a6f4e08a09b29ef65", + "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f", + "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f", "shasum": "" }, "require": { @@ -5355,20 +5356,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-07T12:45:11+00:00" }, { "name": "symfony/twig-bridge", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "0fdf6b2e69c514e1b178ee823dd6bc9950db4a2f" + "reference": "550cd9cd3a106a3426bdb2bd9d2914a4937656d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/0fdf6b2e69c514e1b178ee823dd6bc9950db4a2f", - "reference": "0fdf6b2e69c514e1b178ee823dd6bc9950db4a2f", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/550cd9cd3a106a3426bdb2bd9d2914a4937656d1", + "reference": "550cd9cd3a106a3426bdb2bd9d2914a4937656d1", "shasum": "" }, "require": { @@ -5445,11 +5446,11 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-14T15:48:59+00:00" }, { "name": "symfony/twig-bundle", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", @@ -5523,16 +5524,16 @@ }, { "name": "symfony/validator", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "ee2e90b940dd0293062b39edb88ec717d6e493e7" + "reference": "92646dd2c781f2a8926f9bf57a9333a1e5a628c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/ee2e90b940dd0293062b39edb88ec717d6e493e7", - "reference": "ee2e90b940dd0293062b39edb88ec717d6e493e7", + "url": "https://api.github.com/repos/symfony/validator/zipball/92646dd2c781f2a8926f9bf57a9333a1e5a628c5", + "reference": "92646dd2c781f2a8926f9bf57a9333a1e5a628c5", "shasum": "" }, "require": { @@ -5605,20 +5606,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-07T09:35:05+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "69e174f4c02ec43919380171c6f7550753299316" + "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/69e174f4c02ec43919380171c6f7550753299316", - "reference": "69e174f4c02ec43919380171c6f7550753299316", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a05426e27294bba7b0226ffc17dd01a3c6ef9777", + "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777", "shasum": "" }, "require": { @@ -5680,20 +5681,20 @@ "debug", "dump" ], - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-02T09:24:26+00:00" }, { "name": "symfony/web-profiler-bundle", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "b599234072688d2939ba29258589d92047d0a4c9" + "reference": "085fe3d8b7841b156cc1dc5aa7df9bdc81316edb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/b599234072688d2939ba29258589d92047d0a4c9", - "reference": "b599234072688d2939ba29258589d92047d0a4c9", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/085fe3d8b7841b156cc1dc5aa7df9bdc81316edb", + "reference": "085fe3d8b7841b156cc1dc5aa7df9bdc81316edb", "shasum": "" }, "require": { @@ -5746,7 +5747,7 @@ ], "description": "Symfony WebProfilerBundle", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-09T19:58:21+00:00" }, { "name": "symfony/webpack-encore-pack", @@ -5781,16 +5782,16 @@ }, { "name": "symfony/yaml", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c" + "reference": "b832cc289608b6d305f62149df91529a2ab3c314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/46bc69aa91fc4ab78a96ce67873a6b0c148fd48c", - "reference": "46bc69aa91fc4ab78a96ce67873a6b0c148fd48c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", + "reference": "b832cc289608b6d305f62149df91529a2ab3c314", "shasum": "" }, "require": { @@ -5836,7 +5837,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-18T16:52:46+00:00" }, { "name": "twig/extensions", @@ -6163,16 +6164,16 @@ }, { "name": "zendframework/zend-code", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" + "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", - "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c21db169075c6ec4b342149f446e7b7b724f95eb", + "reference": "c21db169075c6ec4b342149f446e7b7b724f95eb", "shasum": "" }, "require": { @@ -6193,8 +6194,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev", - "dev-develop": "3.3-dev" + "dev-master": "3.3.x-dev", + "dev-develop": "3.4.x-dev" } }, "autoload": { @@ -6212,7 +6213,7 @@ "code", "zf2" ], - "time": "2017-10-20T15:21:32+00:00" + "time": "2018-08-13T20:36:59+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -6396,16 +6397,16 @@ }, { "name": "composer/xdebug-handler", - "version": "1.1.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08" + "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/c919dc6c62e221fc6406f861ea13433c0aa24f08", - "reference": "c919dc6c62e221fc6406f861ea13433c0aa24f08", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c", + "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c", "shasum": "" }, "require": { @@ -6436,7 +6437,7 @@ "Xdebug", "performance" ], - "time": "2018-04-11T15:42:36+00:00" + "time": "2018-08-31T19:07:57+00:00" }, { "name": "dama/doctrine-test-bundle", @@ -6668,21 +6669,21 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.12.2", + "version": "v2.13.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "dcc87d5414e9d0bd316fce81a5bedb9ce720b183" + "reference": "7136aa4e0c5f912e8af82383775460d906168a10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/dcc87d5414e9d0bd316fce81a5bedb9ce720b183", - "reference": "dcc87d5414e9d0bd316fce81a5bedb9ce720b183", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7136aa4e0c5f912e8af82383775460d906168a10", + "reference": "7136aa4e0c5f912e8af82383775460d906168a10", "shasum": "" }, "require": { "composer/semver": "^1.4", - "composer/xdebug-handler": "^1.0", + "composer/xdebug-handler": "^1.2", "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", @@ -6724,6 +6725,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.13-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -6755,7 +6761,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2018-07-06T10:37:40+00:00" + "time": "2018-08-23T13:15:44+00:00" }, { "name": "fzaninotto/faker", @@ -7373,16 +7379,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.3.1", + "version": "7.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f9b14c17860eccb440a0352a117a81eb754cff5a" + "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f9b14c17860eccb440a0352a117a81eb754cff5a", - "reference": "f9b14c17860eccb440a0352a117a81eb754cff5a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34705f81bddc3f505b9599a2ef96e2b4315ba9b8", + "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8", "shasum": "" }, "require": { @@ -7453,7 +7459,7 @@ "testing", "xunit" ], - "time": "2018-08-07T06:44:28+00:00" + "time": "2018-08-22T06:39:21+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -8071,7 +8077,7 @@ }, { "name": "symfony/browser-kit", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -8128,7 +8134,7 @@ }, { "name": "symfony/css-selector", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -8181,7 +8187,7 @@ }, { "name": "symfony/debug-bundle", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/debug-bundle.git", @@ -8246,20 +8252,20 @@ }, { "name": "symfony/debug-pack", - "version": "v1.0.5", + "version": "v1.0.6", "source": { "type": "git", "url": "https://github.com/symfony/debug-pack.git", - "reference": "ae4b15596788f9592f67f8615398671bf3f796e4" + "reference": "630548c117a5f9e27d3385787641629945b6de50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-pack/zipball/ae4b15596788f9592f67f8615398671bf3f796e4", - "reference": "ae4b15596788f9592f67f8615398671bf3f796e4", + "url": "https://api.github.com/repos/symfony/debug-pack/zipball/630548c117a5f9e27d3385787641629945b6de50", + "reference": "630548c117a5f9e27d3385787641629945b6de50", "shasum": "" }, "require": { - "easycorp/easy-log-handler": "^1.0.2", + "easycorp/easy-log-handler": "^1.0.7", "php": "^7.0", "symfony/debug-bundle": "^3.3|^4.0", "symfony/monolog-bundle": "^3.0", @@ -8272,11 +8278,11 @@ "MIT" ], "description": "A debug pack for Symfony projects", - "time": "2018-03-29T13:53:44+00:00" + "time": "2018-08-10T15:18:32+00:00" }, { "name": "symfony/dom-crawler", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -8333,16 +8339,16 @@ }, { "name": "symfony/maker-bundle", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "a1b0d9ff35219ec36c44fcc6213056cc339a1cf8" + "reference": "22a9bf33868f0fed6cab013fe5231e8485d15e20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/a1b0d9ff35219ec36c44fcc6213056cc339a1cf8", - "reference": "a1b0d9ff35219ec36c44fcc6213056cc339a1cf8", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/22a9bf33868f0fed6cab013fe5231e8485d15e20", + "reference": "22a9bf33868f0fed6cab013fe5231e8485d15e20", "shasum": "" }, "require": { @@ -8363,7 +8369,8 @@ "doctrine/orm": "^2.3", "friendsofphp/php-cs-fixer": "^2.8", "symfony/phpunit-bridge": "^3.4|^4.0", - "symfony/process": "^3.4|^4.0" + "symfony/process": "^3.4|^4.0", + "symfony/yaml": "^3.4|^4.0" }, "type": "symfony-bundle", "extra": { @@ -8394,20 +8401,20 @@ "scaffold", "scaffolding" ], - "time": "2018-08-07T16:05:09+00:00" + "time": "2018-08-30T01:08:06+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "3c30714807f34b7de710cc33eb612cd42cf683b0" + "reference": "d5f433034543bbe3b0dfa2f34e6cc85bf839846f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/3c30714807f34b7de710cc33eb612cd42cf683b0", - "reference": "3c30714807f34b7de710cc33eb612cd42cf683b0", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d5f433034543bbe3b0dfa2f34e6cc85bf839846f", + "reference": "d5f433034543bbe3b0dfa2f34e6cc85bf839846f", "shasum": "" }, "require": { @@ -8460,20 +8467,20 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2018-07-26T08:55:25+00:00" + "time": "2018-08-27T17:47:02+00:00" }, { "name": "symfony/process", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56" + "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/f01fc7a4493572f7f506c49dcb50ad01fb3a2f56", - "reference": "f01fc7a4493572f7f506c49dcb50ad01fb3a2f56", + "url": "https://api.github.com/repos/symfony/process/zipball/86cdb930a6a855b0ab35fb60c1504cb36184f843", + "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843", "shasum": "" }, "require": { @@ -8509,20 +8516,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/thanks", - "version": "v1.0.8", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/symfony/thanks.git", - "reference": "ca74c76a2a43aaa491e7a524fd235e094b1129b5" + "reference": "9474a631b52737c623b6aeba22f00bbc003251da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/thanks/zipball/ca74c76a2a43aaa491e7a524fd235e094b1129b5", - "reference": "ca74c76a2a43aaa491e7a524fd235e094b1129b5", + "url": "https://api.github.com/repos/symfony/thanks/zipball/9474a631b52737c623b6aeba22f00bbc003251da", + "reference": "9474a631b52737c623b6aeba22f00bbc003251da", "shasum": "" }, "require": { @@ -8552,11 +8559,11 @@ } ], "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!", - "time": "2018-08-05T16:46:52+00:00" + "time": "2018-08-24T14:08:13+00:00" }, { "name": "symfony/web-server-bundle", - "version": "v4.1.3", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/web-server-bundle.git", diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml new file mode 100644 index 00000000..1821ccc0 --- /dev/null +++ b/config/packages/sensio_framework_extra.yaml @@ -0,0 +1,3 @@ +sensio_framework_extra: + router: + annotations: false diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3d8cf787..e910ad88 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,6 +17,8 @@ + + diff --git a/src/Controller/Admin/ActivityController.php b/src/Controller/Admin/ActivityController.php index 8afc5902..e2466857 100644 --- a/src/Controller/Admin/ActivityController.php +++ b/src/Controller/Admin/ActivityController.php @@ -16,15 +16,14 @@ use App\Form\Toolbar\ActivityToolbarForm; use App\Repository\Query\ActivityQuery; use Pagerfanta\Pagerfanta; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used to manage activities in the admin part of the site. * - * @Route("/admin/activity") + * @Route(path="/admin/activity") * @Security("is_granted('ROLE_ADMIN')") * @Security("is_granted('IS_AUTHENTICATED_FULLY')") */ @@ -39,9 +38,8 @@ class ActivityController extends AbstractController } /** - * @Route("/", defaults={"page": 1}, name="admin_activity") - * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_activity_paginated") - * @Method("GET") + * @Route(path="/", defaults={"page": 1}, name="admin_activity", methods={"GET"}) + * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_activity_paginated", methods={"GET"}) * @Cache(smaxage="10") */ public function indexAction($page, Request $request) @@ -68,8 +66,7 @@ class ActivityController extends AbstractController } /** - * @Route("/create", name="admin_activity_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="admin_activity_create", methods={"GET", "POST"}) * * @param Request $request * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response @@ -80,8 +77,7 @@ class ActivityController extends AbstractController } /** - * @Route("/{id}/edit", name="admin_activity_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/edit", name="admin_activity_edit", methods={"GET", "POST"}) * @Security("is_granted('edit', activity)") * * @param Activity $activity @@ -96,8 +92,7 @@ class ActivityController extends AbstractController /** * The route to delete an existing entry. * - * @Route("/{id}/delete", name="admin_activity_delete") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/delete", name="admin_activity_delete", methods={"GET", "POST"}) * @Security("is_granted('delete', activity)") * * @param Activity $activity diff --git a/src/Controller/Admin/CustomerController.php b/src/Controller/Admin/CustomerController.php index c3931695..a6b36b2b 100644 --- a/src/Controller/Admin/CustomerController.php +++ b/src/Controller/Admin/CustomerController.php @@ -15,15 +15,14 @@ use App\Form\CustomerEditForm; use App\Form\Toolbar\CustomerToolbarForm; use App\Repository\Query\CustomerQuery; use Pagerfanta\Pagerfanta; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used to manage activities in the admin part of the site. * - * @Route("/admin/customer") + * @Route(path="/admin/customer") * @Security("is_granted('ROLE_ADMIN')") * @Security("is_granted('IS_AUTHENTICATED_FULLY')") */ @@ -38,9 +37,8 @@ class CustomerController extends AbstractController } /** - * @Route("/", defaults={"page": 1}, name="admin_customer") - * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_customer_paginated") - * @Method("GET") + * @Route(path="/", defaults={"page": 1}, name="admin_customer", methods={"GET"}) + * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_customer_paginated", methods={"GET"}) */ public function indexAction($page, Request $request) { @@ -65,8 +63,7 @@ class CustomerController extends AbstractController } /** - * @Route("/create", name="admin_customer_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="admin_customer_create", methods={"GET", "POST"}) */ public function createAction(Request $request) { @@ -74,8 +71,7 @@ class CustomerController extends AbstractController } /** - * @Route("/{id}/edit", name="admin_customer_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/edit", name="admin_customer_edit", methods={"GET", "POST"}) * @Security("is_granted('edit', customer)") */ public function editAction(Customer $customer, Request $request) @@ -113,8 +109,7 @@ class CustomerController extends AbstractController /** * The route to delete an existing entry. * - * @Route("/{id}/delete", name="admin_customer_delete") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/delete", name="admin_customer_delete", methods={"GET", "POST"}) * @Security("is_granted('delete', customer)") * * @param Customer $customer diff --git a/src/Controller/Admin/ProjectController.php b/src/Controller/Admin/ProjectController.php index 6b272676..fd5bbeb3 100644 --- a/src/Controller/Admin/ProjectController.php +++ b/src/Controller/Admin/ProjectController.php @@ -17,15 +17,14 @@ use App\Form\Toolbar\ProjectToolbarForm; use App\Repository\Query\ProjectQuery; use Pagerfanta\Pagerfanta; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used to manage projects in the admin part of the site. * - * @Route("/admin/project") + * @Route(path="/admin/project") * @Security("is_granted('ROLE_ADMIN')") * @Security("is_granted('IS_AUTHENTICATED_FULLY')") */ @@ -40,9 +39,8 @@ class ProjectController extends AbstractController } /** - * @Route("/", defaults={"page": 1}, name="admin_project") - * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated") - * @Method("GET") + * @Route(path="/", defaults={"page": 1}, name="admin_project", methods={"GET"}) + * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_project_paginated", methods={"GET"}) * @Cache(smaxage="10") */ public function indexAction($page, Request $request) @@ -69,8 +67,7 @@ class ProjectController extends AbstractController } /** - * @Route("/create", name="admin_project_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="admin_project_create", methods={"GET", "POST"}) */ public function createAction(Request $request) { @@ -78,8 +75,7 @@ class ProjectController extends AbstractController } /** - * @Route("/{id}/edit", name="admin_project_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/edit", name="admin_project_edit", methods={"GET", "POST"}) * @Security("is_granted('edit', project)") */ public function editAction(Project $project, Request $request) @@ -90,8 +86,7 @@ class ProjectController extends AbstractController /** * The route to delete an existing entry. * - * @Route("/{id}/delete", name="admin_project_delete") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/delete", name="admin_project_delete", methods={"GET", "POST"}) * @Security("is_granted('delete', project)") * * @param Project $project diff --git a/src/Controller/Admin/TimesheetController.php b/src/Controller/Admin/TimesheetController.php index 6c94c1af..308a77a9 100644 --- a/src/Controller/Admin/TimesheetController.php +++ b/src/Controller/Admin/TimesheetController.php @@ -16,15 +16,14 @@ use App\Form\TimesheetEditForm; use App\Form\Toolbar\TimesheetAdminToolbarForm; use App\Repository\Query\TimesheetQuery; use Pagerfanta\Pagerfanta; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used for manage timesheet entries in the admin part of the site. * - * @Route("/team/timesheet") + * @Route(path="/team/timesheet") * @Security("is_granted('ROLE_TEAMLEAD')") * @Security("is_granted('IS_AUTHENTICATED_FULLY')") */ @@ -44,9 +43,8 @@ class TimesheetController extends AbstractController /** * This route shows all users timesheet entries. * - * @Route("/", defaults={"page": 1}, name="admin_timesheet") - * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_timesheet_paginated") - * @Method("GET") + * @Route(path="/", defaults={"page": 1}, name="admin_timesheet", methods={"GET"}) + * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_timesheet_paginated", methods={"GET"}) * * @param $page * @param Request $request @@ -78,8 +76,7 @@ class TimesheetController extends AbstractController /** * The route to stop a running entry. * - * @Route("/{id}/stop", name="admin_timesheet_stop") - * @Method({"GET"}) + * @Route(path="/{id}/stop", name="admin_timesheet_stop", methods={"GET"}) * @Security("is_granted('stop', entry)") * * @param Timesheet $entry @@ -93,8 +90,7 @@ class TimesheetController extends AbstractController /** * The route to edit an existing entry. * - * @Route("/{id}/edit", name="admin_timesheet_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/edit", name="admin_timesheet_edit", methods={"GET", "POST"}) * @Security("is_granted('edit', entry)") * * @param Timesheet $entry @@ -109,8 +105,7 @@ class TimesheetController extends AbstractController /** * The route to create a new entry by form. * - * @Route("/create", name="admin_timesheet_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="admin_timesheet_create", methods={"GET", "POST"}) * * @param Request $request * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response @@ -123,8 +118,7 @@ class TimesheetController extends AbstractController /** * The route to delete an existing entry. * - * @Route("/{id}/delete", name="admin_timesheet_delete") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/delete", name="admin_timesheet_delete", methods={"GET", "POST"}) * @Security("is_granted('delete', entry)") * * @param Timesheet $entry diff --git a/src/Controller/Admin/UserController.php b/src/Controller/Admin/UserController.php index 7403917f..45694538 100644 --- a/src/Controller/Admin/UserController.php +++ b/src/Controller/Admin/UserController.php @@ -16,16 +16,15 @@ use App\Form\Toolbar\UserToolbarForm; use App\Form\UserCreateType; use App\Repository\Query\UserQuery; use Pagerfanta\Pagerfanta; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; /** * Controller used to manage users in the admin part of the site. * - * @Route("/admin/user") + * @Route(path="/admin/user") * @Security("is_granted('ROLE_SUPER_ADMIN')") * @Security("is_granted('IS_AUTHENTICATED_FULLY')") */ @@ -53,9 +52,12 @@ class UserController extends AbstractController } /** - * @Route("/", defaults={"page": 1}, name="admin_user") - * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_user_paginated") - * @Method("GET") + * @Route(path="/", defaults={"page": 1}, name="admin_user", methods={"GET"}) + * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_user_paginated", methods={"GET"}) + + * @param int $page + * @param Request $request + * @return \Symfony\Component\HttpFoundation\Response */ public function indexAction($page, Request $request) { @@ -80,8 +82,7 @@ class UserController extends AbstractController } /** - * @Route("/create", name="admin_user_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="admin_user_create", methods={"GET", "POST"}) * @Security("is_granted('create', user)") */ public function createAction(Request $request) @@ -124,8 +125,7 @@ class UserController extends AbstractController /** * The route to delete an existing user. * - * @Route("/{id}/delete", name="admin_user_delete") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/delete", name="admin_user_delete", methods={"GET", "POST"}) * @Security("is_granted('delete', userToDelete)") * * @param User $userToDelete diff --git a/src/Controller/CalendarController.php b/src/Controller/CalendarController.php index 3b83d381..85c6da25 100644 --- a/src/Controller/CalendarController.php +++ b/src/Controller/CalendarController.php @@ -14,15 +14,14 @@ use App\Calendar\TimesheetEntity; use App\Entity\Timesheet; use App\Repository\Query\TimesheetQuery; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used to display calendars. * - * @Route("/calendar") + * @Route(path="/calendar") * @Security("is_granted('ROLE_USER')") */ class CalendarController extends AbstractController @@ -41,8 +40,7 @@ class CalendarController extends AbstractController } /** - * @Route("/", name="calendar") - * @Method("GET") + * @Route(path="/", name="calendar", methods={"GET"}) * @Cache(smaxage="10") */ public function userCalendar() @@ -54,8 +52,7 @@ class CalendarController extends AbstractController } /** - * @Route("/user", name="calendar_entries") - * @Method("GET") + * @Route(path="/user", name="calendar_entries", methods={"GET"}) * @Cache(smaxage="10") */ public function calendarEntries(Request $request) diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php index 082a7438..4328e73f 100644 --- a/src/Controller/DashboardController.php +++ b/src/Controller/DashboardController.php @@ -12,16 +12,15 @@ namespace App\Controller; use App\Event\DashboardEvent; use App\Model\DashboardSection; use App\Repository\WidgetRepository; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Routing\Annotation\Route; /** * Dashboard controller for the admin area. * - * @Route("/dashboard") + * @Route(path="/dashboard") * @Security("is_granted('ROLE_USER')") */ class DashboardController extends Controller @@ -52,8 +51,7 @@ class DashboardController extends Controller } /** - * @Route("/", defaults={}, name="dashboard") - * @Method("GET") + * @Route(path="/", defaults={}, name="dashboard", methods={"GET"}) */ public function indexAction() { diff --git a/src/Controller/HelpController.php b/src/Controller/HelpController.php index 0189ffb5..f5664f35 100644 --- a/src/Controller/HelpController.php +++ b/src/Controller/HelpController.php @@ -10,15 +10,14 @@ namespace App\Controller; use App\Constants; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\Routing\Annotation\Route; /** * This controller can render the markdown documentation from /var/docs/ * - * @Route("/help") + * @Route(path="/help") * @Security("is_granted('ROLE_USER')") */ class HelpController extends Controller @@ -41,9 +40,8 @@ class HelpController extends Controller } /** - * @Route("/", defaults={"chapter": "README"}, name="help") - * @Route("/{chapter}", requirements={"chapter": "[a-zA-Z]*"}, name="help_chapter") - * @Method("GET") + * @Route(path="/", defaults={"chapter": "README"}, name="help", methods={"GET"}) + * @Route(path="/{chapter}", requirements={"chapter": "[a-zA-Z]*"}, name="help_chapter", methods={"GET"}) * * @param string $chapter * @return \Symfony\Component\HttpFoundation\Response diff --git a/src/Controller/InvoiceController.php b/src/Controller/InvoiceController.php index ed7c24e0..b352825d 100644 --- a/src/Controller/InvoiceController.php +++ b/src/Controller/InvoiceController.php @@ -19,15 +19,14 @@ use App\Repository\Query\BaseQuery; use App\Repository\Query\InvoiceQuery; use App\Repository\Query\TimesheetQuery; use App\Repository\TimesheetRepository; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used to manage invoices. * - * @Route("/invoice") + * @Route(path="/invoice") * @Security("is_granted('ROLE_TEAMLEAD')") */ class InvoiceController extends AbstractController @@ -38,7 +37,6 @@ class InvoiceController extends AbstractController protected $service; /** - * InvoiceController constructor. * @param ServiceInvoice $service */ public function __construct(ServiceInvoice $service) @@ -73,7 +71,7 @@ class InvoiceController extends AbstractController } /** - * @Route("/", name="invoice") + * @Route(path="/", name="invoice", methods={"GET", "POST"}) * * @param Request $request * @return \Symfony\Component\HttpFoundation\Response @@ -139,9 +137,8 @@ class InvoiceController extends AbstractController } /** - * @Route("/template", defaults={"page": 1}, name="admin_invoice_template") - * @Route("/template/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_invoice_template_paginated") - * @Method({"GET", "POST"}) + * @Route(path="/template", defaults={"page": 1}, name="admin_invoice_template", methods={"GET", "POST"}) + * @Route(path="/template/page/{page}", requirements={"page": "[1-9]\d*"}, name="admin_invoice_template_paginated", methods={"GET", "POST"}) * * TODO permission * @@ -159,8 +156,7 @@ class InvoiceController extends AbstractController } /** - * @Route("/{id}/edit", name="admin_invoice_template_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/edit", name="admin_invoice_template_edit", methods={"GET", "POST"}) * * TODO permission * @@ -174,8 +170,7 @@ class InvoiceController extends AbstractController } /** - * @Route("/create", name="admin_invoice_template_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="admin_invoice_template_create", methods={"GET", "POST"}) * * TODO permission * diff --git a/src/Controller/ProfileController.php b/src/Controller/ProfileController.php index 79b1472a..58c1feb4 100644 --- a/src/Controller/ProfileController.php +++ b/src/Controller/ProfileController.php @@ -18,17 +18,16 @@ use App\Form\UserPreferencesForm; use App\Form\UserRolesType; use App\Repository\TimesheetRepository; use App\Voter\UserVoter; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\Form\Form; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; /** * User profile controller * - * @Route("/profile") + * @Route(path="/profile") * @Security("is_granted('ROLE_USER')") */ class ProfileController extends AbstractController @@ -47,8 +46,7 @@ class ProfileController extends AbstractController } /** - * @Route("/{username}", name="user_profile") - * @Method("GET") + * @Route(path="/{username}", name="user_profile", methods={"GET"}) * @Security("is_granted('view', profile)") */ public function indexAction(User $profile) @@ -57,8 +55,7 @@ class ProfileController extends AbstractController } /** - * @Route("/{username}/edit", name="user_profile_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{username}/edit", name="user_profile_edit", methods={"GET", "POST"}) * @Security("is_granted('edit', profile)") */ public function editAction(User $profile, Request $request) @@ -80,8 +77,7 @@ class ProfileController extends AbstractController } /** - * @Route("/{username}/password", name="user_profile_password") - * @Method({"GET", "POST"}) + * @Route(path="/{username}/password", name="user_profile_password", methods={"GET", "POST"}) * @Security("is_granted('password', profile)") */ public function passwordAction(User $profile, Request $request) @@ -106,8 +102,7 @@ class ProfileController extends AbstractController } /** - * @Route("/{username}/api-token", name="user_profile_api_token") - * @Method({"GET", "POST"}) + * @Route(path="/{username}/api-token", name="user_profile_api_token", methods={"GET", "POST"}) * @Security("is_granted('api-token', profile)") */ public function apiTokenAction(User $profile, Request $request) @@ -132,8 +127,7 @@ class ProfileController extends AbstractController } /** - * @Route("/{username}/roles", name="user_profile_roles") - * @Method({"GET", "POST"}) + * @Route(path="/{username}/roles", name="user_profile_roles", methods={"GET", "POST"}) * @Security("is_granted('roles', profile)") */ public function rolesAction(User $profile, Request $request) @@ -155,8 +149,7 @@ class ProfileController extends AbstractController } /** - * @Route("/{username}/prefs", name="user_profile_preferences") - * @Method({"GET", "POST"}) + * @Route(path="/{username}/prefs", name="user_profile_preferences", methods={"GET", "POST"}) * @Security("is_granted('preferences', profile)") */ public function savePreferencesAction(User $profile, Request $request) diff --git a/src/Controller/TimesheetController.php b/src/Controller/TimesheetController.php index f3352cb3..ad95505e 100644 --- a/src/Controller/TimesheetController.php +++ b/src/Controller/TimesheetController.php @@ -16,15 +16,14 @@ use App\Form\Toolbar\TimesheetToolbarForm; use App\Repository\Query\TimesheetQuery; use Pagerfanta\Pagerfanta; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\Annotation\Route; /** * Controller used to manage timesheets. * - * @Route("/timesheet") + * @Route(path="/timesheet") * @Security("is_granted('ROLE_USER')") */ class TimesheetController extends AbstractController @@ -40,9 +39,8 @@ class TimesheetController extends AbstractController } /** - * @Route("/", defaults={"page": 1}, name="timesheet") - * @Route("/page/{page}", requirements={"page": "[1-9]\d*"}, name="timesheet_paginated") - * @Method("GET") + * @Route(path="/", defaults={"page": 1}, name="timesheet", methods={"GET"}) + * @Route(path="/page/{page}", requirements={"page": "[1-9]\d*"}, name="timesheet_paginated", methods={"GET"}) * @Cache(smaxage="10") */ public function indexAction($page, Request $request) @@ -89,8 +87,7 @@ class TimesheetController extends AbstractController /** * The route to stop a running entry. * - * @Route("/{id}/stop", name="timesheet_stop") - * @Method({"GET"}) + * @Route(path="/{id}/stop", name="timesheet_stop", methods={"GET"}) * @Security("is_granted('stop', entry)") * * @param Timesheet $entry @@ -104,8 +101,7 @@ class TimesheetController extends AbstractController /** * The route to stop a running entry. * - * @Route("/start/{id}", name="timesheet_start", requirements={"id" = "\d+"}) - * @Method({"GET", "POST"}) + * @Route(path="/start/{id}", name="timesheet_start", requirements={"id" = "\d+"}, methods={"GET", "POST"}) * @Security("is_granted('start', activity)") * * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response @@ -127,8 +123,7 @@ class TimesheetController extends AbstractController /** * The route to edit an existing entry. * - * @Route("/{id}/edit", name="timesheet_edit") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/edit", name="timesheet_edit", methods={"GET", "POST"}) * @Security("is_granted('edit', entry)") * * @param Timesheet $entry @@ -147,8 +142,7 @@ class TimesheetController extends AbstractController /** * The route to create a new entry by form. * - * @Route("/create", name="timesheet_create") - * @Method({"GET", "POST"}) + * @Route(path="/create", name="timesheet_create", methods={"GET", "POST"}) * * @param Request $request * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response @@ -161,8 +155,7 @@ class TimesheetController extends AbstractController /** * The route to delete an existing entry. * - * @Route("/{id}/delete", name="timesheet_delete") - * @Method({"GET", "POST"}) + * @Route(path="/{id}/delete", name="timesheet_delete", methods={"GET", "POST"}) * @Security("is_granted('delete', entry)") * * @param Timesheet $entry diff --git a/tests/API/ActivityControllerTest.php b/tests/API/ActivityControllerTest.php index 54613a85..14b9fb0a 100644 --- a/tests/API/ActivityControllerTest.php +++ b/tests/API/ActivityControllerTest.php @@ -14,7 +14,6 @@ use App\Entity\User; /** * @coversDefaultClass \App\API\ActivityController * @group integration - * @group legacy */ class ActivityControllerTest extends APIControllerBaseTest { diff --git a/tests/API/ApiDocControllerTest.php b/tests/API/ApiDocControllerTest.php index dff04e9d..66a77e63 100644 --- a/tests/API/ApiDocControllerTest.php +++ b/tests/API/ApiDocControllerTest.php @@ -14,7 +14,6 @@ use App\Tests\Controller\ControllerBaseTest; /** * @group integration - * @group legacy */ class ApiDocControllerTest extends ControllerBaseTest { diff --git a/tests/API/CustomerControllerTest.php b/tests/API/CustomerControllerTest.php index df7e7cd9..5e4384a9 100644 --- a/tests/API/CustomerControllerTest.php +++ b/tests/API/CustomerControllerTest.php @@ -14,7 +14,6 @@ use App\Entity\User; /** * @coversDefaultClass \App\API\CustomerController * @group integration - * @group legacy */ class CustomerControllerTest extends APIControllerBaseTest { diff --git a/tests/API/HealthcheckControllerTest.php b/tests/API/HealthcheckControllerTest.php index 10740bee..851bf62e 100644 --- a/tests/API/HealthcheckControllerTest.php +++ b/tests/API/HealthcheckControllerTest.php @@ -14,7 +14,6 @@ use App\Entity\User; /** * @coversDefaultClass \App\API\HealthcheckController * @group integration - * @group legacy */ class HealthcheckControllerTest extends APIControllerBaseTest { diff --git a/tests/API/ProjectControllerTest.php b/tests/API/ProjectControllerTest.php index 00d7b26b..79c86427 100644 --- a/tests/API/ProjectControllerTest.php +++ b/tests/API/ProjectControllerTest.php @@ -14,7 +14,6 @@ use App\Entity\User; /** * @coversDefaultClass \App\API\ProjectController * @group integration - * @group legacy */ class ProjectControllerTest extends APIControllerBaseTest { diff --git a/tests/API/UserControllerTest.php b/tests/API/UserControllerTest.php index 3e839024..72899c4c 100644 --- a/tests/API/UserControllerTest.php +++ b/tests/API/UserControllerTest.php @@ -14,7 +14,6 @@ use App\Entity\User; /** * @coversDefaultClass \App\API\UserController * @group integration - * @group legacy */ class UserControllerTest extends APIControllerBaseTest { diff --git a/tests/Command/CreateUserCommandTest.php b/tests/Command/CreateUserCommandTest.php index 98acfb2a..d0a38f94 100644 --- a/tests/Command/CreateUserCommandTest.php +++ b/tests/Command/CreateUserCommandTest.php @@ -20,7 +20,6 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; /** * @coversDefaultClass \App\Command\CreateUserCommand * @group integration - * @group legacy */ class CreateUserCommandTest extends KernelTestCase { diff --git a/tests/Controller/Admin/ActivityControllerTest.php b/tests/Controller/Admin/ActivityControllerTest.php index 9497c244..f9fa4994 100644 --- a/tests/Controller/Admin/ActivityControllerTest.php +++ b/tests/Controller/Admin/ActivityControllerTest.php @@ -17,7 +17,6 @@ use App\Tests\DataFixtures\TimesheetFixtures; /** * @coversDefaultClass \App\Controller\Admin\ActivityController * @group integration - * @group legacy */ class ActivityControllerTest extends ControllerBaseTest { diff --git a/tests/Controller/Admin/CustomerControllerTest.php b/tests/Controller/Admin/CustomerControllerTest.php index 5228e47c..912ee638 100644 --- a/tests/Controller/Admin/CustomerControllerTest.php +++ b/tests/Controller/Admin/CustomerControllerTest.php @@ -17,7 +17,6 @@ use App\Tests\DataFixtures\TimesheetFixtures; /** * @coversDefaultClass \App\Controller\Admin\CustomerController * @group integration - * @group legacy */ class CustomerControllerTest extends ControllerBaseTest { diff --git a/tests/Controller/Admin/ProjectControllerTest.php b/tests/Controller/Admin/ProjectControllerTest.php index 3e93e008..f065abc5 100644 --- a/tests/Controller/Admin/ProjectControllerTest.php +++ b/tests/Controller/Admin/ProjectControllerTest.php @@ -18,7 +18,6 @@ use App\Tests\DataFixtures\TimesheetFixtures; /** * @coversDefaultClass \App\Controller\Admin\ProjectController * @group integration - * @group legacy */ class ProjectControllerTest extends ControllerBaseTest { diff --git a/tests/Controller/Admin/UserControllerTest.php b/tests/Controller/Admin/UserControllerTest.php index b479ccbc..c5d285c8 100644 --- a/tests/Controller/Admin/UserControllerTest.php +++ b/tests/Controller/Admin/UserControllerTest.php @@ -15,7 +15,6 @@ use App\Tests\Controller\ControllerBaseTest; /** * @coversDefaultClass \App\Controller\Admin\UserController * @group integration - * @group legacy */ class UserControllerTest extends ControllerBaseTest { diff --git a/tests/Controller/CalendarControllerTest.php b/tests/Controller/CalendarControllerTest.php index e6d718e7..cf8ab906 100644 --- a/tests/Controller/CalendarControllerTest.php +++ b/tests/Controller/CalendarControllerTest.php @@ -15,7 +15,6 @@ use App\Tests\DataFixtures\TimesheetFixtures; /** * @coversDefaultClass \App\Controller\CalendarController * @group integration - * @group legacy */ class CalendarControllerTest extends ControllerBaseTest { diff --git a/tests/Controller/ProfileControllerTest.php b/tests/Controller/ProfileControllerTest.php index c5f5fd3e..9bbaf885 100644 --- a/tests/Controller/ProfileControllerTest.php +++ b/tests/Controller/ProfileControllerTest.php @@ -16,7 +16,6 @@ use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; /** * @coversDefaultClass \App\Controller\InvoiceController * @group integration - * @group legacy */ class ProfileControllerTest extends ControllerBaseTest { diff --git a/tests/Controller/TimesheetControllerTest.php b/tests/Controller/TimesheetControllerTest.php index 68c031fe..0731a428 100644 --- a/tests/Controller/TimesheetControllerTest.php +++ b/tests/Controller/TimesheetControllerTest.php @@ -15,7 +15,6 @@ use App\Tests\DataFixtures\TimesheetFixtures; /** * @coversDefaultClass \App\Controller\TimesheetController * @group integration - * @group legacy */ class TimesheetControllerTest extends ControllerBaseTest {