diff --git a/.gitignore b/.gitignore index a0dbcb0..70bb45b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,8 @@ /var/ /vendor/ ###< symfony/framework-bundle ### + +###> symfony/phpunit-bridge ### +.phpunit +/phpunit.xml +###< symfony/phpunit-bridge ### diff --git a/composer.json b/composer.json index 37edba9..46ee390 100644 --- a/composer.json +++ b/composer.json @@ -7,9 +7,11 @@ "doctrine/orm": "^2.5", "sensio/framework-extra-bundle": "^5.1", "symfony/console": "^4.0", + "symfony/debug-bundle": "^4.0", + "symfony/debug-pack": "^1.0", "symfony/form": "^4.0", "symfony/framework-bundle": "^4.0", - "symfony/monolog-bundle": "^3.1.0", + "symfony/monolog-bundle": "^3.1", "symfony/twig-bundle": "^4.0", "symfony/yaml": "^4.0", "twig/twig": "^2.0 || ^3.0" diff --git a/composer.lock b/composer.lock index 1bce4ee..40365df 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "6482be0ffe59121ae2411b59741cbe77", + "content-hash": "44811497a38d5f50ce281de61bee69d1", "packages": [ { "name": "doctrine/annotations", - "version": "v1.5.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f" + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f", - "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", "shasum": "" }, "require": { @@ -26,12 +26,12 @@ }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -72,7 +72,7 @@ "docblock", "parser" ], - "time": "2017-07-22T10:58:02+00:00" + "time": "2017-12-06T07:11:42+00:00" }, { "name": "doctrine/cache", @@ -711,38 +711,40 @@ }, { "name": "doctrine/orm", - "version": "v2.5.13", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "93103f44a3e36e7b48165b6e6b736833f33b18ef" + "reference": "374e7ace49d864dad8cddbc55346447c8a6a2083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/93103f44a3e36e7b48165b6e6b736833f33b18ef", - "reference": "93103f44a3e36e7b48165b6e6b736833f33b18ef", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/374e7ace49d864dad8cddbc55346447c8a6a2083", + "reference": "374e7ace49d864dad8cddbc55346447c8a6a2083", "shasum": "" }, "require": { - "doctrine/cache": "~1.4", - "doctrine/collections": "~1.2", - "doctrine/common": ">=2.5-dev,<2.9-dev", - "doctrine/dbal": ">=2.5-dev,<2.7-dev", - "doctrine/instantiator": "^1.0.1", + "doctrine/annotations": "~1.5", + "doctrine/cache": "~1.6", + "doctrine/collections": "^1.4", + "doctrine/common": "^2.7.1", + "doctrine/dbal": "^2.6", + "doctrine/instantiator": "~1.1", "ext-pdo": "*", - "php": ">=5.4", - "symfony/console": "~2.5|~3.0|~4.0" + "php": "^7.1", + "symfony/console": "~3.0|~4.0" }, "require-dev": { - "phpunit/phpunit": "~4.0", - "symfony/yaml": "~2.3|~3.0|~4.0" + "doctrine/coding-standard": "^1.0", + "phpunit/phpunit": "^6.5", + "squizlabs/php_codesniffer": "^3.2", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "bin": [ - "bin/doctrine", - "bin/doctrine.php" + "bin/doctrine" ], "type": "library", "extra": { @@ -751,8 +753,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\ORM\\": "lib/" + "psr-4": { + "Doctrine\\ORM\\": "lib/Doctrine/ORM" } }, "notification-url": "https://packagist.org/downloads/", @@ -775,6 +777,10 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], "description": "Object-Relational-Mapper for PHP", @@ -783,7 +789,57 @@ "database", "orm" ], - "time": "2017-11-27T23:25:55+00:00" + "time": "2017-12-20T00:38:15+00:00" + }, + { + "name": "easycorp/easy-log-handler", + "version": "v1.0.3", + "source": { + "type": "git", + "url": "https://github.com/EasyCorp/easy-log-handler.git", + "reference": "79104f113f562ab6c677d482457d4474204d34a5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/EasyCorp/easy-log-handler/zipball/79104f113f562ab6c677d482457d4474204d34a5", + "reference": "79104f113f562ab6c677d482457d4474204d34a5", + "shasum": "" + }, + "require": { + "monolog/monolog": "~1.6", + "php": ">=5.3.0", + "symfony/yaml": "~2.3|~3.0|~4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "EasyCorp\\EasyLog\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Javier Eguiluz", + "email": "javiereguiluz@gmail.com" + }, + { + "name": "Project Contributors", + "homepage": "https://github.com/EasyCorp/easy-log-handler" + } + ], + "description": "A handler for Monolog that optimizes log messages to be processed by humans instead of software. Improve your productivity with logs that are easy to understand.", + "homepage": "https://github.com/EasyCorp/easy-log-handler", + "keywords": [ + "easy", + "log", + "logging", + "monolog", + "productivity" + ], + "time": "2017-10-20T08:47:57+00:00" }, { "name": "jdorn/sql-formatter", @@ -1105,16 +1161,16 @@ }, { "name": "sensio/framework-extra-bundle", - "version": "v5.1.1", + "version": "v5.1.3", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "4fc5d5ba02eee8bb02cc00548dfc5a98f6151fe8" + "reference": "0696496cb3e2d23add645d424699e5c723238aad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/4fc5d5ba02eee8bb02cc00548dfc5a98f6151fe8", - "reference": "4fc5d5ba02eee8bb02cc00548dfc5a98f6151fe8", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/0696496cb3e2d23add645d424699e5c723238aad", + "reference": "0696496cb3e2d23add645d424699e5c723238aad", "shasum": "" }, "require": { @@ -1170,20 +1226,20 @@ "annotations", "controllers" ], - "time": "2017-11-30T14:53:48+00:00" + "time": "2017-12-04T18:33:55+00:00" }, { "name": "symfony/cache", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "3691cb27e436c55af10ee06de30732623fa2f33e" + "reference": "d00351f230ca037ca13f6fec3411e002043f7421" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/3691cb27e436c55af10ee06de30732623fa2f33e", - "reference": "3691cb27e436c55af10ee06de30732623fa2f33e", + "url": "https://api.github.com/repos/symfony/cache/zipball/d00351f230ca037ca13f6fec3411e002043f7421", + "reference": "d00351f230ca037ca13f6fec3411e002043f7421", "shasum": "" }, "require": { @@ -1239,20 +1295,20 @@ "caching", "psr6" ], - "time": "2017-11-20T21:12:12+00:00" + "time": "2017-12-08T16:11:45+00:00" }, { "name": "symfony/config", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "6e6dbc6d2beff8117b974d74274bff02e43c32a6" + "reference": "0356e6d5298e9e72212c0bad65c2f1b49e42d622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/6e6dbc6d2beff8117b974d74274bff02e43c32a6", - "reference": "6e6dbc6d2beff8117b974d74274bff02e43c32a6", + "url": "https://api.github.com/repos/symfony/config/zipball/0356e6d5298e9e72212c0bad65c2f1b49e42d622", + "reference": "0356e6d5298e9e72212c0bad65c2f1b49e42d622", "shasum": "" }, "require": { @@ -1299,20 +1355,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2017-11-20T18:22:57+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/console", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5cd0dd461dfc72f59c8405cac32d31e82c7348e8" + "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5cd0dd461dfc72f59c8405cac32d31e82c7348e8", - "reference": "5cd0dd461dfc72f59c8405cac32d31e82c7348e8", + "url": "https://api.github.com/repos/symfony/console/zipball/de8cf039eacdec59d83f7def67e3b8ff5ed46714", + "reference": "de8cf039eacdec59d83f7def67e3b8ff5ed46714", "shasum": "" }, "require": { @@ -1367,20 +1423,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-11-29T13:42:03+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/debug", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "26a15dab86c3820473716be4f846eac774ad4ad9" + "reference": "8c3e709209ce3b952a31c0f4a31ac7703c3d0226" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/26a15dab86c3820473716be4f846eac774ad4ad9", - "reference": "26a15dab86c3820473716be4f846eac774ad4ad9", + "url": "https://api.github.com/repos/symfony/debug/zipball/8c3e709209ce3b952a31c0f4a31ac7703c3d0226", + "reference": "8c3e709209ce3b952a31c0f4a31ac7703c3d0226", "shasum": "" }, "require": { @@ -1423,20 +1479,116 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-11-21T09:27:49+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { - "name": "symfony/dependency-injection", - "version": "v4.0.0", + "name": "symfony/debug-bundle", + "version": "v4.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/dependency-injection.git", - "reference": "761403523081846099f2f84bf098854aabc64b58" + "url": "https://github.com/symfony/debug-bundle.git", + "reference": "81eac72b030c08c9dcd85f60e873fc356f21f436" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/761403523081846099f2f84bf098854aabc64b58", - "reference": "761403523081846099f2f84bf098854aabc64b58", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/81eac72b030c08c9dcd85f60e873fc356f21f436", + "reference": "81eac72b030c08c9dcd85f60e873fc356f21f436", + "shasum": "" + }, + "require": { + "ext-xml": "*", + "php": "^7.1.3", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/twig-bridge": "~3.4|~4.0", + "symfony/var-dumper": "~3.4|~4.0" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" + }, + "require-dev": { + "symfony/config": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/web-profiler-bundle": "~3.4|~4.0" + }, + "suggest": { + "symfony/config": "For service container configuration", + "symfony/dependency-injection": "For using as a service from the container" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\DebugBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DebugBundle", + "homepage": "https://symfony.com", + "time": "2017-11-24T14:34:08+00:00" + }, + { + "name": "symfony/debug-pack", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug-pack.git", + "reference": "2da9b0ea7a733fc29ec3e72139751fd8d2582887" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug-pack/zipball/2da9b0ea7a733fc29ec3e72139751fd8d2582887", + "reference": "2da9b0ea7a733fc29ec3e72139751fd8d2582887", + "shasum": "" + }, + "require": { + "easycorp/easy-log-handler": "^1.0.2", + "php": "^7.0", + "symfony/debug-bundle": "^3.3|^4.0", + "symfony/monolog-bundle": "^3.0", + "symfony/phpunit-bridge": "^3.3|^4.0", + "symfony/profiler-pack": "^1.0", + "symfony/var-dumper": "^3.3|^4.0" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A debug pack for Symfony projects", + "time": "2017-12-12T01:47:04+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v4.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "d2fa088b5fd7d429974a36bf1a9846b912d9d124" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d2fa088b5fd7d429974a36bf1a9846b912d9d124", + "reference": "d2fa088b5fd7d429974a36bf1a9846b912d9d124", "shasum": "" }, "require": { @@ -1494,20 +1646,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2017-11-30T14:32:51+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/doctrine-bridge", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "496f1ec1a5d288020f83aebcb70bf0571d92a517" + "reference": "d14c17af9290634eb1588b75ed64a64ee286ba3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/496f1ec1a5d288020f83aebcb70bf0571d92a517", - "reference": "496f1ec1a5d288020f83aebcb70bf0571d92a517", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/d14c17af9290634eb1588b75ed64a64ee286ba3e", + "reference": "d14c17af9290634eb1588b75ed64a64ee286ba3e", "shasum": "" }, "require": { @@ -1573,20 +1725,20 @@ ], "description": "Symfony Doctrine Bridge", "homepage": "https://symfony.com", - "time": "2017-11-07T14:45:01+00:00" + "time": "2017-12-09T12:13:31+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "6223fb2b68e7059e8d5843c0103999a84e7275cf" + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6223fb2b68e7059e8d5843c0103999a84e7275cf", - "reference": "6223fb2b68e7059e8d5843c0103999a84e7275cf", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d4face19ed8002eec8280bc1c5ec18130472bf43", + "reference": "d4face19ed8002eec8280bc1c5ec18130472bf43", "shasum": "" }, "require": { @@ -1636,20 +1788,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-11-09T17:30:28+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/filesystem", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "c9d4a26759ff75a077e4e334315cb632739b661a" + "reference": "8c2868641d0c4885eee9c12a89c2b695eb1985cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c9d4a26759ff75a077e4e334315cb632739b661a", - "reference": "c9d4a26759ff75a077e4e334315cb632739b661a", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/8c2868641d0c4885eee9c12a89c2b695eb1985cd", + "reference": "8c2868641d0c4885eee9c12a89c2b695eb1985cd", "shasum": "" }, "require": { @@ -1685,11 +1837,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2017-11-21T14:14:53+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/finder", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -1738,16 +1890,16 @@ }, { "name": "symfony/form", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "a08c50c730d22a951ed1e8e8b30ab93d0e9e3c15" + "reference": "8c8cf3d9981a5ceb841ecef65570a422f3ecff71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/a08c50c730d22a951ed1e8e8b30ab93d0e9e3c15", - "reference": "a08c50c730d22a951ed1e8e8b30ab93d0e9e3c15", + "url": "https://api.github.com/repos/symfony/form/zipball/8c8cf3d9981a5ceb841ecef65570a422f3ecff71", + "reference": "8c8cf3d9981a5ceb841ecef65570a422f3ecff71", "shasum": "" }, "require": { @@ -1776,7 +1928,7 @@ "symfony/security-csrf": "~3.4|~4.0", "symfony/translation": "~3.4|~4.0", "symfony/validator": "~3.4|~4.0", - "symfony/var-dumper": "~3.4-beta3|~4.0-beta3" + "symfony/var-dumper": "~3.4|~4.0" }, "suggest": { "symfony/framework-bundle": "For templating with PHP.", @@ -1814,20 +1966,20 @@ ], "description": "Symfony Form Component", "homepage": "https://symfony.com", - "time": "2017-11-29T13:42:03+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/framework-bundle", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "62277d37abf3c451e5b367557a5fde37d3bf058f" + "reference": "82e45a486a2cbdab5d43512bea10af1681dcd8e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/62277d37abf3c451e5b367557a5fde37d3bf058f", - "reference": "62277d37abf3c451e5b367557a5fde37d3bf058f", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/82e45a486a2cbdab5d43512bea10af1681dcd8e2", + "reference": "82e45a486a2cbdab5d43512bea10af1681dcd8e2", "shasum": "" }, "require": { @@ -1836,7 +1988,7 @@ "symfony/cache": "~3.4|~4.0", "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4-beta4|~4.0-beta4", + "symfony/event-dispatcher": "~3.4|~4.0", "symfony/filesystem": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", "symfony/http-foundation": "~3.4|~4.0", @@ -1928,20 +2080,20 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "time": "2017-11-29T13:42:03+00:00" + "time": "2017-12-15T01:44:28+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "40a9400633675adafbc94302004f9ec04589210f" + "reference": "aba96bd07be7796c81ca0ceafa7d48a6fef036c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/40a9400633675adafbc94302004f9ec04589210f", - "reference": "40a9400633675adafbc94302004f9ec04589210f", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/aba96bd07be7796c81ca0ceafa7d48a6fef036c8", + "reference": "aba96bd07be7796c81ca0ceafa7d48a6fef036c8", "shasum": "" }, "require": { @@ -1981,20 +2133,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2017-11-30T15:11:43+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "3359c489cc03754f0ada3715d080da81cf865779" + "reference": "f2ea7461cdcad837b8bc6022b59d5eb8c9618aa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3359c489cc03754f0ada3715d080da81cf865779", - "reference": "3359c489cc03754f0ada3715d080da81cf865779", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f2ea7461cdcad837b8bc6022b59d5eb8c9618aa5", + "reference": "f2ea7461cdcad837b8bc6022b59d5eb8c9618aa5", "shasum": "" }, "require": { @@ -2067,11 +2219,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-11-30T17:43:40+00:00" + "time": "2017-12-15T03:06:17+00:00" }, { "name": "symfony/inflector", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", @@ -2128,16 +2280,16 @@ }, { "name": "symfony/intl", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "2d6908f6ee80451ef754b39faa6307eae8884590" + "reference": "9ee9ded0b3902239172811c2b2526cb81165a74f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/2d6908f6ee80451ef754b39faa6307eae8884590", - "reference": "2d6908f6ee80451ef754b39faa6307eae8884590", + "url": "https://api.github.com/repos/symfony/intl/zipball/9ee9ded0b3902239172811c2b2526cb81165a74f", + "reference": "9ee9ded0b3902239172811c2b2526cb81165a74f", "shasum": "" }, "require": { @@ -2199,20 +2351,20 @@ "l10n", "localization" ], - "time": "2017-11-19T18:43:46+00:00" + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/monolog-bridge", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "55fead8897d6c17c4491b775c527421f10271bbb" + "reference": "da8c15357bcf114a319105524648940faf03fd77" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/55fead8897d6c17c4491b775c527421f10271bbb", - "reference": "55fead8897d6c17c4491b775c527421f10271bbb", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/da8c15357bcf114a319105524648940faf03fd77", + "reference": "da8c15357bcf114a319105524648940faf03fd77", "shasum": "" }, "require": { @@ -2232,7 +2384,8 @@ "suggest": { "symfony/console": "For the possibility to show log messages in console commands depending on verbosity settings. You need version ~2.3 of the console for it.", "symfony/event-dispatcher": "Needed when using log messages in console commands.", - "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel." + "symfony/http-kernel": "For using the debugging handlers together with the response life cycle of the HTTP kernel.", + "symfony/var-dumper": "For using the debugging handlers like the console handler or the log server handler." }, "type": "symfony-bridge", "extra": { @@ -2264,7 +2417,7 @@ ], "description": "Symfony Monolog Bridge", "homepage": "https://symfony.com", - "time": "2017-11-07T14:45:01+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "symfony/monolog-bundle", @@ -2331,16 +2484,16 @@ }, { "name": "symfony/options-resolver", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "ef617a2867c7d889d4ecee3c29595698d87474a4" + "reference": "75fdda335eb0adbd464089e8a0184c61097808e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ef617a2867c7d889d4ecee3c29595698d87474a4", - "reference": "ef617a2867c7d889d4ecee3c29595698d87474a4", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/75fdda335eb0adbd464089e8a0184c61097808e0", + "reference": "75fdda335eb0adbd464089e8a0184c61097808e0", "shasum": "" }, "require": { @@ -2381,7 +2534,69 @@ "configuration", "options" ], - "time": "2017-11-07T14:45:01+00:00" + "time": "2017-12-14T19:48:22+00:00" + }, + { + "name": "symfony/phpunit-bridge", + "version": "v4.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "61c84ebdce0d4c289413a222ee545f0114e60120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/61c84ebdce0d4c289413a222ee545f0114e60120", + "reference": "61c84ebdce0d4c289413a222ee545f0114e60120", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, + "suggest": { + "ext-zip": "Zip support is required when using bin/simple-phpunit", + "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" + }, + "bin": [ + "bin/simple-phpunit" + ], + "type": "symfony-bridge", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Bridge\\PhpUnit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony PHPUnit Bridge", + "homepage": "https://symfony.com", + "time": "2017-12-14T19:48:22+00:00" }, { "name": "symfony/polyfill-intl-icu", @@ -2501,17 +2716,100 @@ "time": "2017-10-11T12:05:26+00:00" }, { - "name": "symfony/property-access", - "version": "v4.0.0", + "name": "symfony/polyfill-php72", + "version": "v1.6.0", "source": { "type": "git", - "url": "https://github.com/symfony/property-access.git", - "reference": "220f386247615af26b23f81398f8e152e213af0c" + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/220f386247615af26b23f81398f8e152e213af0c", - "reference": "220f386247615af26b23f81398f8e152e213af0c", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/6de4f4884b97abbbed9f0a84a95ff2ff77254254", + "reference": "6de4f4884b97abbbed9f0a84a95ff2ff77254254", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2017-10-11T12:05:26+00:00" + }, + { + "name": "symfony/profiler-pack", + "version": "v1.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/profiler-pack.git", + "reference": "fa2e2dad522a3bef322196abad28ffce6d0fdbc5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/profiler-pack/zipball/fa2e2dad522a3bef322196abad28ffce6d0fdbc5", + "reference": "fa2e2dad522a3bef322196abad28ffce6d0fdbc5", + "shasum": "" + }, + "require": { + "php": "^7.0", + "symfony/stopwatch": "^3.3|^4.0", + "symfony/twig-bundle": "^3.3|^4.0", + "symfony/web-profiler-bundle": "^3.3|^4.0" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for the Symfony web profiler", + "time": "2017-12-12T01:48:24+00:00" + }, + { + "name": "symfony/property-access", + "version": "v4.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/property-access.git", + "reference": "8dc059852b7bdd8b871eb3ca95b8d70be3b39488" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/property-access/zipball/8dc059852b7bdd8b871eb3ca95b8d70be3b39488", + "reference": "8dc059852b7bdd8b871eb3ca95b8d70be3b39488", "shasum": "" }, "require": { @@ -2565,20 +2863,20 @@ "property path", "reflection" ], - "time": "2017-11-19T18:43:46+00:00" + "time": "2017-12-14T00:19:09+00:00" }, { "name": "symfony/routing", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "82c0de9bfc4b295e11a172d5f98b60b88611e0e7" + "reference": "972810def5cae044d19195045f7eb418141bf37b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/82c0de9bfc4b295e11a172d5f98b60b88611e0e7", - "reference": "82c0de9bfc4b295e11a172d5f98b60b88611e0e7", + "url": "https://api.github.com/repos/symfony/routing/zipball/972810def5cae044d19195045f7eb418141bf37b", + "reference": "972810def5cae044d19195045f7eb418141bf37b", "shasum": "" }, "require": { @@ -2643,20 +2941,69 @@ "uri", "url" ], - "time": "2017-11-24T14:34:08+00:00" + "time": "2017-12-14T22:39:22+00:00" }, { - "name": "symfony/twig-bridge", - "version": "v4.0.0", + "name": "symfony/stopwatch", + "version": "v4.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/twig-bridge.git", - "reference": "3513e775dfca0e25e8f908f3fc9a0a7aa3417c06" + "url": "https://github.com/symfony/stopwatch.git", + "reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/3513e775dfca0e25e8f908f3fc9a0a7aa3417c06", - "reference": "3513e775dfca0e25e8f908f3fc9a0a7aa3417c06", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/ac0e49150555c703fef6b696d8eaba1db7a3ca03", + "reference": "ac0e49150555c703fef6b696d8eaba1db7a3ca03", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Stopwatch Component", + "homepage": "https://symfony.com", + "time": "2017-11-09T12:45:29+00:00" + }, + { + "name": "symfony/twig-bridge", + "version": "v4.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/twig-bridge.git", + "reference": "aeb221936ad39c579b7e002dfd4e7544a5d666f6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/aeb221936ad39c579b7e002dfd4e7544a5d666f6", + "reference": "aeb221936ad39c579b7e002dfd4e7544a5d666f6", "shasum": "" }, "require": { @@ -2668,13 +3015,12 @@ "symfony/form": "<3.4" }, "require-dev": { - "fig/link-util": "^1.0", "symfony/asset": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", - "symfony/form": "~3.4-beta4|~4.0-beta4", + "symfony/form": "~3.4|~4.0", "symfony/http-foundation": "~3.4|~4.0", "symfony/http-kernel": "~3.4|~4.0", "symfony/polyfill-intl-icu": "~1.0", @@ -2686,6 +3032,7 @@ "symfony/translation": "~3.4|~4.0", "symfony/var-dumper": "~3.4|~4.0", "symfony/web-link": "~3.4|~4.0", + "symfony/workflow": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -2733,20 +3080,20 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2017-11-21T17:21:10+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "symfony/twig-bundle", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "6e9cfceb5a3f5fc810dd66f70454de34405a9356" + "reference": "77381f8b99b319dc83e609c66942eb3a0a5b066d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/6e9cfceb5a3f5fc810dd66f70454de34405a9356", - "reference": "6e9cfceb5a3f5fc810dd66f70454de34405a9356", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/77381f8b99b319dc83e609c66942eb3a0a5b066d", + "reference": "77381f8b99b319dc83e609c66942eb3a0a5b066d", "shasum": "" }, "require": { @@ -2806,20 +3153,155 @@ ], "description": "Symfony TwigBundle", "homepage": "https://symfony.com", - "time": "2017-11-24T14:34:08+00:00" + "time": "2017-12-04T12:31:58+00:00" }, { - "name": "symfony/yaml", - "version": "v4.0.0", + "name": "symfony/var-dumper", + "version": "v4.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "7be8741ce5dce9943f41a9269f6828b66e726776" + "url": "https://github.com/symfony/var-dumper.git", + "reference": "0991597a40f062bab7203efc2cc6cee9b3d44ed6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/7be8741ce5dce9943f41a9269f6828b66e726776", - "reference": "7be8741ce5dce9943f41a9269f6828b66e726776", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0991597a40f062bab7203efc2cc6cee9b3d44ed6", + "reference": "0991597a40f062bab7203efc2cc6cee9b3d44ed6", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php72": "~1.5" + }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, + "require-dev": { + "ext-iconv": "*", + "twig/twig": "~1.34|~2.4" + }, + "suggest": { + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony mechanism for exploring and dumping PHP variables", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "time": "2017-12-12T08:41:51+00:00" + }, + { + "name": "symfony/web-profiler-bundle", + "version": "v4.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/web-profiler-bundle.git", + "reference": "81e20cbc7b998918a413fbf84a6f2cc770837e10" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/81e20cbc7b998918a413fbf84a6f2cc770837e10", + "reference": "81e20cbc7b998918a413fbf84a6f2cc770837e10", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/routing": "~3.4|~4.0", + "symfony/twig-bridge": "~3.4|~4.0", + "symfony/var-dumper": "~3.4|~4.0", + "twig/twig": "~1.34|~2.4" + }, + "conflict": { + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<3.4", + "symfony/var-dumper": "<3.4" + }, + "require-dev": { + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/stopwatch": "~3.4|~4.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\WebProfilerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony WebProfilerBundle", + "homepage": "https://symfony.com", + "time": "2017-12-12T08:41:51+00:00" + }, + { + "name": "symfony/yaml", + "version": "v4.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/a5ee52d155f06ad23b19eb63c31228ff56ad1116", + "reference": "a5ee52d155f06ad23b19eb63c31228ff56ad1116", "shasum": "" }, "require": { @@ -2864,7 +3346,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2017-11-29T13:42:03+00:00" + "time": "2017-12-12T08:41:51+00:00" }, { "name": "twig/twig", @@ -2936,16 +3418,16 @@ "packages-dev": [ { "name": "symfony/dotenv", - "version": "v4.0.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "60586c549ffe7d8a6a898f9959736776604a6b84" + "reference": "ffcaeab01e42b0c40669add2aa8e77f79ddb9389" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/60586c549ffe7d8a6a898f9959736776604a6b84", - "reference": "60586c549ffe7d8a6a898f9959736776604a6b84", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/ffcaeab01e42b0c40669add2aa8e77f79ddb9389", + "reference": "ffcaeab01e42b0c40669add2aa8e77f79ddb9389", "shasum": "" }, "require": { @@ -2989,20 +3471,20 @@ "env", "environment" ], - "time": "2017-11-30T15:11:43+00:00" + "time": "2017-12-08T15:46:13+00:00" }, { "name": "symfony/flex", - "version": "v1.0.42", + "version": "v1.0.53", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "a1117ae366eae895a449db63eda58035b112dda9" + "reference": "cc4b1bac464597ce220d4f8208c38c75195e80c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/a1117ae366eae895a449db63eda58035b112dda9", - "reference": "a1117ae366eae895a449db63eda58035b112dda9", + "url": "https://api.github.com/repos/symfony/flex/zipball/cc4b1bac464597ce220d4f8208c38c75195e80c2", + "reference": "cc4b1bac464597ce220d4f8208c38c75195e80c2", "shasum": "" }, "require": { @@ -3035,7 +3517,7 @@ "email": "fabien.potencier@gmail.com" } ], - "time": "2017-11-29T02:36:07+00:00" + "time": "2017-12-27T16:06:01+00:00" } ], "aliases": [], diff --git a/config/bundles.php b/config/bundles.php index 2fd7387..97839e7 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -8,4 +8,6 @@ return [ Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], + Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], + Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], ]; diff --git a/config/packages/dev/easy_log_handler.yaml b/config/packages/dev/easy_log_handler.yaml new file mode 100644 index 0000000..27bfc60 --- /dev/null +++ b/config/packages/dev/easy_log_handler.yaml @@ -0,0 +1,16 @@ +services: + EasyCorp\EasyLog\EasyLogHandler: + public: false + arguments: ['%kernel.logs_dir%/%kernel.environment%.log'] + +#// FIXME: How to add this configuration automatically without messing up with the monolog configuration? +#monolog: +# handlers: +# buffered: +# type: buffer +# handler: easylog +# channels: ['!event'] +# level: debug +# easylog: +# type: service +# id: EasyCorp\EasyLog\EasyLogHandler diff --git a/config/packages/dev/web_profiler.yaml b/config/packages/dev/web_profiler.yaml new file mode 100644 index 0000000..e92166a --- /dev/null +++ b/config/packages/dev/web_profiler.yaml @@ -0,0 +1,6 @@ +web_profiler: + toolbar: true + intercept_redirects: false + +framework: + profiler: { only_exceptions: false } diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 07b2b59..e1e0c6f 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -9,6 +9,7 @@ doctrine: dbal: # configure these for your database server driver: 'pdo_pgsql' + types: money: CameraBundle\Types\MoneyType mapping_types: diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index bc68ab7..69ed4d7 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -1,6 +1,6 @@ framework: secret: '%env(APP_SECRET)%' - #default_locale: en + default_locale: en #csrf_protection: ~ #http_method_override: true #trusted_hosts: ~ diff --git a/config/packages/test/web_profiler.yaml b/config/packages/test/web_profiler.yaml new file mode 100644 index 0000000..03752de --- /dev/null +++ b/config/packages/test/web_profiler.yaml @@ -0,0 +1,6 @@ +web_profiler: + toolbar: false + intercept_redirects: false + +framework: + profiler: { collect: false } diff --git a/config/routes.yaml b/config/routes.yaml index 23648e7..9694e08 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -1,3 +1,3 @@ -app: - resource: '@CameraBundle/Controller/' - type: annotation +#index: +# path: / +# defaults: { _controller: 'App\Controller\DefaultController::index' } \ No newline at end of file diff --git a/config/routes/dev/web_profiler.yaml b/config/routes/dev/web_profiler.yaml new file mode 100644 index 0000000..c82beff --- /dev/null +++ b/config/routes/dev/web_profiler.yaml @@ -0,0 +1,7 @@ +web_profiler_wdt: + resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' + prefix: /_wdt + +web_profiler_profiler: + resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' + prefix: /_profiler diff --git a/config/services-orig.yaml b/config/services-orig.yaml new file mode 100644 index 0000000..06ef161 --- /dev/null +++ b/config/services-orig.yaml @@ -0,0 +1,35 @@ +# Learn more about services, parameters and containers at +# https://symfony.com/doc/current/service_container.html +parameters: + #parameter_name: value + +services: + # default configuration for services in *this* file + _defaults: + # automatically injects dependencies in your services + autowire: true + # automatically registers your services as commands, event subscribers, etc. + autoconfigure: true + # this means you cannot fetch services directly from the container via $container->get() + # if you need to do this, you can override this setting on individual services + public: false + + # makes classes in src/CameraBundle available to be used as services + # this creates a service per class whose id is the fully-qualified class name + CameraBundle\: + resource: '../src/*' + # you can exclude directories or files + # but if a service is unused, it's removed anyway + exclude: '../src/{Entity,Repository,Tests}' + + # controllers are imported separately to make sure they're public + # and have a tag that allows actions to type-hint services + CameraBundle\Controller\: + resource: '../src/Controller' + public: true + tags: ['controller.service_arguments'] + + # add more services, or override services that need manual wiring + # CameraBundle\Service\ExampleService: + # arguments: + # $someArgument: 'some_value' diff --git a/config/services.yaml b/config/services.yaml index 06ef161..feba3d6 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -1,7 +1,7 @@ # Learn more about services, parameters and containers at # https://symfony.com/doc/current/service_container.html parameters: - #parameter_name: value + locale: en services: # default configuration for services in *this* file diff --git a/public/index.php b/public/index.php index 3c32a97..805452d 100644 --- a/public/index.php +++ b/public/index.php @@ -1,29 +1,29 @@ -load(__DIR__ . '/../.env'); + +// Set environment +$_SERVER['APP_ENV'] = 'dev'; +$_SERVER['APP_DEBUG'] = true; -// The check is to ensure we don't use .env in production -if (!isset($_SERVER['APP_ENV'])) { - if (!class_exists(Dotenv::class)) { - throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.'); - } - (new Dotenv())->load(__DIR__.'/../.env'); -} if ($_SERVER['APP_DEBUG'] ?? ('prod' !== ($_SERVER['APP_ENV'] ?? 'dev'))) { - umask(0000); + umask(0000); - Debug::enable(); + Debug::enable(); } // Request::setTrustedProxies(['0.0.0.0/0'], Request::HEADER_FORWARDED); -$kernel = new Kernel($_SERVER['APP_ENV'] ?? 'dev', $_SERVER['APP_DEBUG'] ?? ('prod' !== ($_SERVER['APP_ENV'] ?? 'dev'))); +$kernel = new Kernel($_SERVER['APP_ENV'], $_SERVER['APP_DEBUG']); $request = Request::createFromGlobals(); $response = $kernel->handle($request); $response->send(); diff --git a/src/Controller/CameraController.php b/src/Controller/CameraController.php index 3f148ca..26f9edc 100644 --- a/src/Controller/CameraController.php +++ b/src/Controller/CameraController.php @@ -3,10 +3,14 @@ namespace CameraBundle\Controller; use CameraBundle\Entity\Camera; +use CameraBundle\Form\CameraType; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * Camera controller. @@ -46,7 +50,7 @@ class CameraController extends Controller public function newAction(Request $request) { $camera = new Camera(); - $form = $this->createForm('CameraBundle\Form\CameraType', $camera); + $form = $this->createForm(CameraType::class, $camera); $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { @@ -84,11 +88,14 @@ class CameraController extends Controller * * @Route("/{id}/edit", name="camera_edit") * @Method({"GET", "POST"}) + * @throws \LogicException */ public function editAction(Request $request, Camera $camera) { $deleteForm = $this->createDeleteForm($camera); - $editForm = $this->createForm('CameraBundle\Form\CameraType', $camera); + $deacquireForm = $this->createDeacquireForm($camera); + + $editForm = $this->createForm(CameraType::class, $camera); $editForm->handleRequest($request); if ($editForm->isSubmitted() && $editForm->isValid()) { @@ -100,6 +107,7 @@ class CameraController extends Controller return $this->render('camera/edit.html.twig', array( 'camera' => $camera, 'edit_form' => $editForm->createView(), + 'deacquire_form' => $deacquireForm->createView(), 'delete_form' => $deleteForm->createView(), )); } @@ -109,17 +117,36 @@ class CameraController extends Controller * * @Route("/{id}", name="camera_delete") * @Method("DELETE") + * @throws \LogicException */ public function deleteAction(Request $request, Camera $camera) { $form = $this->createDeleteForm($camera); $form->handleRequest($request); - if ($form->isSubmitted() && $form->isValid()) { - $em = $this->getDoctrine()->getManager(); - $em->remove($camera); - $em->flush(); - } + $em = $this->getDoctrine()->getManager(); + $em->remove($camera); + $em->flush(); + + return $this->redirectToRoute('camera_index'); + } + + /** + * Moves a camera to the previouslyOwned table + * + * @Route("/{id}/deacquire", name="camera_deacquire") + * @Method("POST") + * @param Request $request + * @param Camera $camera + * @return RedirectResponse + */ + public function deacquireAction(Request $request, Camera $camera) + { + $form = $this->createDeacquireForm($camera); + $form->handleRequest($request); + + $repository = $this->getDoctrine()->getRepository(Camera::class); + $repository->deacquire($camera); return $this->redirectToRoute('camera_index'); } @@ -129,13 +156,28 @@ class CameraController extends Controller * * @param Camera $camera The camera entity * - * @return \Symfony\Component\Form\Form The form + * @return \Symfony\Component\Form\FormInterface The form */ - private function createDeleteForm(Camera $camera) + private function createDeleteForm(Camera $camera): FormInterface { return $this->createFormBuilder() - ->setAction($this->generateUrl('camera_delete', array('id' => $camera->getId()))) + ->setAction($this->generateUrl('camera_delete', ['id' => $camera->getId()])) ->setMethod('DELETE') ->getForm(); } + + /** + * Creates a form to move + * + * @param Camera $camera The camera entity + * + * @return FormInterface + */ + private function createDeacquireForm(Camera $camera): FormInterface + { + return $this->createFormBuilder() + ->setAction($this->generateUrl('camera_deacquire', ['id' => $camera->getId()])) + ->setMethod('POST') + ->getForm(); + } } diff --git a/src/Entity/.gitignore b/src/Entity/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/src/Entity/Camera.php b/src/Entity/Camera.php index d160df9..bdf346a 100644 --- a/src/Entity/Camera.php +++ b/src/Entity/Camera.php @@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM; * @ORM\Table(name="camera", schema="camera", indexes={ @ORM\Index(name="IDX_747C826FC54C8C93", columns={"type_id"}) }) - * @ORM\Entity + * @ORM\Entity(repositoryClass="CameraBundle\Repository\CameraRepository") */ class Camera { @@ -22,7 +22,6 @@ class Camera * @ORM\Column(name="id", type="integer", nullable=false) * @ORM\Id * @ORM\GeneratedValue(strategy="SEQUENCE") - * @ORM\SequenceGenerator(sequenceName="camera_id_seq", allocationSize=1, initialValue=1) */ private $id; diff --git a/src/Entity/PreviouslyOwnedCamera.php b/src/Entity/PreviouslyOwnedCamera.php index aebf5fe..590cd20 100644 --- a/src/Entity/PreviouslyOwnedCamera.php +++ b/src/Entity/PreviouslyOwnedCamera.php @@ -20,7 +20,6 @@ class PreviouslyOwnedCamera * @ORM\Column(name="id", type="integer", nullable=false) * @ORM\Id * @ORM\GeneratedValue(strategy="SEQUENCE") - * @ORM\SequenceGenerator(sequenceName="camera.previously_owned_camera_id_seq", allocationSize=1, initialValue=1) */ private $id; } diff --git a/src/Form/CameraType.php b/src/Form/CameraType.php index bfe161d..7145cd3 100644 --- a/src/Form/CameraType.php +++ b/src/Form/CameraType.php @@ -2,50 +2,51 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; +use Symfony\Component\OptionsResolver\Exception\AccessException; use Symfony\Component\OptionsResolver\OptionsResolver; +use CameraBundle\Entity\Camera; + class CameraType extends AbstractType { - /** - * {@inheritdoc} - */ - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder->add('brand') - ->add('type') - ->add('isDigital') - ->add('mount') - ->add('model') - ->add('filmFormat') - ->add('cropFactor') - ->add('serial') - ->add('purchasePrice') - ->add('batteryType') - ->add('received') - ->add('isWorking') - ->add('formerlyOwned') - ->add('notes'); - } - - /** - * {@inheritdoc} - */ - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\Camera' - )); - } - - /** - * {@inheritdoc} - */ - public function getBlockPrefix() - { - return 'camerabundle_camera'; - } + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options): void + { + $builder->add('brand') + ->add('type') + ->add('isDigital') + ->add('mount') + ->add('model') + ->add('filmFormat') + ->add('cropFactor') + ->add('serial') + ->add('purchasePrice') + ->add('batteryType') + ->add('received') + ->add('isWorking') + ->add('formerlyOwned') + ->add('notes'); + } + /** + * {@inheritdoc} + * @throws AccessException + */ + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults(array( + 'data_class' => Camera::class + )); + } + /** + * {@inheritdoc} + */ + public function getBlockPrefix(): string + { + return 'camerabundle_camera'; + } } diff --git a/src/Form/CameraTypeType.php b/src/Form/CameraTypeType.php index d9fe281..e0a896d 100644 --- a/src/Form/CameraTypeType.php +++ b/src/Form/CameraTypeType.php @@ -2,37 +2,39 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; use Symfony\Component\OptionsResolver\OptionsResolver; +use Symfony\Component\OptionsResolver\Exception\AccessException; + +use CameraBundle\Entity\CameraType; class CameraTypeType extends AbstractType { /** * {@inheritdoc} */ - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { - $builder->add('type'); + $builder->add('type') + ->add('description'); } - + /** * {@inheritdoc} + * @throws AccessException */ - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\CameraType' + 'data_class' => CameraType::class )); } /** * {@inheritdoc} */ - public function getBlockPrefix() + public function getBlockPrefix(): string { return 'camerabundle_cameratype'; } - - } diff --git a/src/Form/FlashType.php b/src/Form/FlashType.php index 5c58106..6189d02 100644 --- a/src/Form/FlashType.php +++ b/src/Form/FlashType.php @@ -2,16 +2,18 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; +use Symfony\Component\OptionsResolver\Exception\AccessException; use Symfony\Component\OptionsResolver\OptionsResolver; +use CameraBundle\Entity\Flash; + class FlashType extends AbstractType { /** * {@inheritdoc} */ - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { $builder->add('brand') ->add('model') @@ -31,21 +33,20 @@ class FlashType extends AbstractType /** * {@inheritdoc} + * @throws AccessException */ - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\Flash' + 'data_class' => Flash::class )); } /** * {@inheritdoc} */ - public function getBlockPrefix() + public function getBlockPrefix(): string { return 'camerabundle_flash'; } - - } diff --git a/src/Form/LensesType.php b/src/Form/LensesType.php index 4759ab7..c5a46ed 100644 --- a/src/Form/LensesType.php +++ b/src/Form/LensesType.php @@ -2,37 +2,57 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; +use Symfony\Component\OptionsResolver\Exception\AccessException; use Symfony\Component\OptionsResolver\OptionsResolver; +use CameraBundle\Entity\Lenses; + class LensesType extends AbstractType { /** * {@inheritdoc} */ - public function buildForm(FormBuilderInterface $builder, array $options) + public function buildForm(FormBuilderInterface $builder, array $options): void { - $builder->add('brand')->add('coatings')->add('productLine')->add('model')->add('minFStop')->add('maxFStop')->add('minFocalLength')->add('maxFocalLength')->add('serial')->add('purchasePrice')->add('notes')->add('mount')->add('received')->add('formerlyOwned')->add('frontFilterSize')->add('rearFilterSize')->add('isTeleconverter')->add('designElements')->add('designGroups')->add('apertureBlades'); + $builder->add('brand') + ->add('coatings') + ->add('productLine') + ->add('model') + ->add('mount') + ->add('minFStop') + ->add('maxFStop') + ->add('minFocalLength') + ->add('maxFocalLength') + ->add('serial') + ->add('purchasePrice') + ->add('notes') + ->add('received') + ->add('formerlyOwned') + ->add('frontFilterSize') + ->add('rearFilterSize') + ->add('isTeleconverter') + ->add('designElements') + ->add('designGroups') + ->add('apertureBlades'); } - + /** * {@inheritdoc} + * @throws AccessException */ - public function configureOptions(OptionsResolver $resolver) + public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\Lenses' + 'data_class' => Lenses::class )); } /** * {@inheritdoc} */ - public function getBlockPrefix() + public function getBlockPrefix(): string { return 'camerabundle_lenses'; } - - } diff --git a/src/Form/PreviouslyOwnedCameraType.php b/src/Form/PreviouslyOwnedCameraType.php index b6eb51d..7da9f6b 100644 --- a/src/Form/PreviouslyOwnedCameraType.php +++ b/src/Form/PreviouslyOwnedCameraType.php @@ -2,37 +2,51 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; +use Symfony\Component\OptionsResolver\Exception\AccessException; use Symfony\Component\OptionsResolver\OptionsResolver; +use CameraBundle\Entity\PreviouslyOwnedCamera; + class PreviouslyOwnedCameraType extends AbstractType { - /** - * {@inheritdoc} - */ - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder->add('brand')->add('mount')->add('model')->add('isDigital')->add('cropFactor')->add('isWorking')->add('notes')->add('serial')->add('formerlyOwned')->add('purchasePrice')->add('batteryType')->add('filmFormat')->add('received')->add('type'); - } - - /** - * {@inheritdoc} - */ - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\PreviouslyOwnedCamera' - )); - } - - /** - * {@inheritdoc} - */ - public function getBlockPrefix() - { - return 'camerabundle_previouslyownedcamera'; - } + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options): void + { + $builder->add('brand') + ->add('mount') + ->add('model') + ->add('isDigital') + ->add('cropFactor') + ->add('isWorking') + ->add('notes') + ->add('serial') + ->add('formerlyOwned') + ->add('purchasePrice') + ->add('batteryType') + ->add('filmFormat') + ->add('received') + ->add('type'); + } + /** + * {@inheritdoc} + * @throws AccessException + */ + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults(array( + 'data_class' => PreviouslyOwnedCamera::class + )); + } + /** + * {@inheritdoc} + */ + public function getBlockPrefix(): string + { + return 'camerabundle_previouslyownedcamera'; + } } diff --git a/src/Form/PreviouslyOwnedFlashType.php b/src/Form/PreviouslyOwnedFlashType.php index 963d09f..fe6deb6 100644 --- a/src/Form/PreviouslyOwnedFlashType.php +++ b/src/Form/PreviouslyOwnedFlashType.php @@ -2,51 +2,52 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; +use Symfony\Component\OptionsResolver\Exception\AccessException; use Symfony\Component\OptionsResolver\OptionsResolver; +use CameraBundle\Entity\PreviouslyOwnedFlash; + class PreviouslyOwnedFlashType extends AbstractType { - /** - * {@inheritdoc} - */ - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder - ->add('brand') - ->add('model') - ->add('isAutoFlash') - ->add('isTtl') - ->add('ttlType') - ->add('isPTtl') - ->add('pTtlType') - ->add('guideNumber') - ->add('purchasePrice') - ->add('batteries') - ->add('notes') - ->add('serial') - ->add('received') - ->add('formerlyOwned'); - } - - /** - * {@inheritdoc} - */ - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\PreviouslyOwnedFlash' - )); - } - - /** - * {@inheritdoc} - */ - public function getBlockPrefix() - { - return 'camerabundle_previouslyownedflash'; - } + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options): void + { + $builder + ->add('brand') + ->add('model') + ->add('isAutoFlash') + ->add('isTtl') + ->add('ttlType') + ->add('isPTtl') + ->add('pTtlType') + ->add('guideNumber') + ->add('purchasePrice') + ->add('batteries') + ->add('notes') + ->add('serial') + ->add('received') + ->add('formerlyOwned'); + } + /** + * {@inheritdoc} + * @throws AccessException + */ + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults(array( + 'data_class' => PreviouslyOwnedFlash::class + )); + } + /** + * {@inheritdoc} + */ + public function getBlockPrefix(): string + { + return 'camerabundle_previouslyownedflash'; + } } diff --git a/src/Form/PreviouslyOwnedLensesType.php b/src/Form/PreviouslyOwnedLensesType.php index 5113e4f..fde8566 100644 --- a/src/Form/PreviouslyOwnedLensesType.php +++ b/src/Form/PreviouslyOwnedLensesType.php @@ -2,37 +2,57 @@ namespace CameraBundle\Form; -use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\{AbstractType, FormBuilderInterface}; +use Symfony\Component\OptionsResolver\Exception\AccessException; use Symfony\Component\OptionsResolver\OptionsResolver; +use CameraBundle\Entity\PreviouslyOwnedLenses; + class PreviouslyOwnedLensesType extends AbstractType { - /** - * {@inheritdoc} - */ - public function buildForm(FormBuilderInterface $builder, array $options) - { - $builder->add('brand')->add('coatings')->add('productLine')->add('model')->add('minFStop')->add('maxFStop')->add('minFocalLength')->add('maxFocalLength')->add('serial')->add('purchasePrice')->add('notes')->add('mount')->add('received')->add('formerlyOwned')->add('frontFilterSize')->add('rearFilterSize')->add('isTeleconverter')->add('designElements')->add('designGroups')->add('apertureBlades'); - } - - /** - * {@inheritdoc} - */ - public function configureOptions(OptionsResolver $resolver) - { - $resolver->setDefaults(array( - 'data_class' => 'CameraBundle\Entity\PreviouslyOwnedLenses' - )); - } - - /** - * {@inheritdoc} - */ - public function getBlockPrefix() - { - return 'camerabundle_previouslyownedlenses'; - } + /** + * {@inheritdoc} + */ + public function buildForm(FormBuilderInterface $builder, array $options): void + { + $builder->add('brand') + ->add('coatings') + ->add('productLine') + ->add('model') + ->add('minFStop') + ->add('maxFStop') + ->add('minFocalLength') + ->add('maxFocalLength') + ->add('serial') + ->add('purchasePrice') + ->add('notes') + ->add('mount') + ->add('received') + ->add('formerlyOwned') + ->add('frontFilterSize') + ->add('rearFilterSize') + ->add('isTeleconverter') + ->add('designElements') + ->add('designGroups') + ->add('apertureBlades'); + } + /** + * {@inheritdoc} + * @throws AccessException + */ + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults(array( + 'data_class' => PreviouslyOwnedLenses::class + )); + } + /** + * {@inheritdoc} + */ + public function getBlockPrefix(): string + { + return 'camerabundle_previouslyownedlenses'; + } } diff --git a/src/Repository/CameraRepository.php b/src/Repository/CameraRepository.php new file mode 100644 index 0000000..57acf7c --- /dev/null +++ b/src/Repository/CameraRepository.php @@ -0,0 +1,41 @@ +getEntityManager(); + + $currentRecord->setFormerlyOwned(true); + + $newRecord = new PreviouslyOwnedCamera(); + + $old = new \ReflectionObject($currentRecord); + $new = new \ReflectionObject($newRecord); + + foreach ($old->getProperties() as $property) { + $propertyName = $property->getName(); + if ($new->hasProperty($propertyName)) { + $newProperty = $new->getProperty($propertyName); + $newProperty->setAccessible(true); + $property->setAccessible(true); + $newProperty->setValue($newRecord, $property->getValue($currentRecord)); + } + } + + // dump($newRecord); + + $em->persist($newRecord); + //$em->remove($currentRecord); + $em->flush(); + } +} diff --git a/symfony.lock b/symfony.lock index 355de7b..744bc7f 100644 --- a/symfony.lock +++ b/symfony.lock @@ -184,5 +184,56 @@ }, "symfony/form": { "version": "v4.0.0" + }, + "symfony/polyfill-php72": { + "version": "v1.6.0" + }, + "symfony/var-dumper": { + "version": "v4.0.0" + }, + "symfony/phpunit-bridge": { + "version": "3.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "3.3", + "ref": "55a81726745b54cc6f8d845f1a094ed7d9ed2e32" + } + }, + "symfony/web-profiler-bundle": { + "version": "3.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "3.3", + "ref": "6bdfa1a95f6b2e677ab985cd1af2eae35d62e0f6" + } + }, + "symfony/stopwatch": { + "version": "v4.0.0" + }, + "symfony/profiler-pack": { + "version": "v1.0.2" + }, + "easycorp/easy-log-handler": { + "version": "1.0", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "1.0", + "ref": "70062abc2cd58794d2a90274502f81b55cd9951b" + } + }, + "symfony/debug-bundle": { + "version": "3.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "3.3", + "ref": "de31e687f3964939abd1f66817bd96ed34bc2eee" + } + }, + "symfony/debug-pack": { + "version": "v1.0.3" } } diff --git a/templates/camera/edit.html.twig b/templates/camera/edit.html.twig index 700d850..2c3c665 100644 --- a/templates/camera/edit.html.twig +++ b/templates/camera/edit.html.twig @@ -19,6 +19,13 @@
+ {{ form_start(deacquire_form) }} + {{ form_widget(deacquire_form) }} + + {{ form_end(deacquire_form) }} + +
+ {{ form_start(delete_form) }} {{ form_end(delete_form) }}