From edcd640d1a7750401e4d9c0f4d6af5251a2b8847 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Wed, 19 May 2021 15:06:05 +0200 Subject: [PATCH 01/16] Use 5.4 --- composer.json | 2 +- symfony.lock | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 6cab427..d292108 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "extra": { "symfony": { "allow-contrib": false, - "require": "5.3.*" + "require": "5.4.*" } }, "minimum-stability": "dev", diff --git a/symfony.lock b/symfony.lock index 05c8314..07e1e76 100644 --- a/symfony.lock +++ b/symfony.lock @@ -364,9 +364,6 @@ "symfony/orm-pack": { "version": "v2.1.0" }, - "symfony/password-hasher": { - "version": "v5.3.0-beta1" - }, "symfony/phpunit-bridge": { "version": "5.1", "recipe": { From 279a4cf541c8aa0a069a5ed453ff41d5457aab0a Mon Sep 17 00:00:00 2001 From: Nyholm Date: Wed, 19 May 2021 15:06:57 +0200 Subject: [PATCH 02/16] Use 6.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d292108..0a79534 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "extra": { "symfony": { "allow-contrib": false, - "require": "5.4.*" + "require": "6.0.*" } }, "minimum-stability": "dev", From dc9bba40134e4edb7919851f4a606767fa0b8130 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sun, 5 Sep 2021 22:05:00 -0700 Subject: [PATCH 03/16] Use SensioFrameworkExtraBundle v6 (#6) * Use SensioFrameworkExtraBundle v6 * Trigger CI --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 53e9fcb..5fa9a38 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "doctrine/doctrine-bundle": "^2.3", "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", - "sensio/framework-extra-bundle": "^5.1", + "sensio/framework-extra-bundle": "^6.1", "symfony/asset": "*", "symfony/console": "*", "symfony/dotenv": "*", From 0cfefeb60381a356051987cfa0ca9148c21f2342 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Wed, 8 Dec 2021 08:15:36 +0100 Subject: [PATCH 04/16] Add 6.0.* for all symfony deps --- composer.json | 61 +++++++++++++++---------------- config/bundles.php | 1 - config/packages/api_platform.yaml | 7 ---- config/packages/lock.yaml | 2 + config/packages/notifier.yaml | 16 ++++++++ config/routes/api_platform.yaml | 4 -- src/Kernel.php | 38 ------------------- symfony.lock | 39 ++++++++++++++++++++ 8 files changed, 87 insertions(+), 81 deletions(-) delete mode 100644 config/packages/api_platform.yaml create mode 100644 config/packages/lock.yaml create mode 100644 config/packages/notifier.yaml delete mode 100644 config/routes/api_platform.yaml diff --git a/composer.json b/composer.json index e5a3971..e9e553e 100644 --- a/composer.json +++ b/composer.json @@ -5,53 +5,52 @@ "php": ">=7.1.3", "ext-ctype": "*", "ext-iconv": "*", - "api-platform/core": "^2.6", "composer/package-versions-deprecated": "1.11.99.1", "doctrine/annotations": "^1.0", "doctrine/doctrine-bundle": "^2.3", "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", - "symfony/asset": "5.4.*", - "symfony/console": "5.4.*", - "symfony/dotenv": "5.4.*", - "symfony/expression-language": "5.4.*", + "symfony/asset": "6.0.*", + "symfony/console": "6.0.*", + "symfony/dotenv": "6.0.*", + "symfony/expression-language": "6.0.*", "symfony/flex": "^1.3.1", - "symfony/form": "5.4.*", - "symfony/framework-bundle": "5.4.*", - "symfony/http-client": "5.4.*", - "symfony/intl": "5.4.*", - "symfony/mailer": "5.4.*", + "symfony/form": "6.0.*", + "symfony/framework-bundle": "6.0.*", + "symfony/http-client": "6.0.*", + "symfony/intl": "6.0.*", + "symfony/mailer": "6.0.*", "symfony/mercure-bundle": "^0.3.2", - "symfony/messenger": "5.4.*", + "symfony/messenger": "6.0.*", "symfony/monolog-bundle": "^3.1", - "symfony/notifier": "5.4.*", - "symfony/process": "5.4.*", - "symfony/property-access": "5.4.*", - "symfony/property-info": "5.4.*", - "symfony/proxy-manager-bridge": "5.4.*", - "symfony/rate-limiter": "5.4.*", - "symfony/security-bundle": "5.4.*", - "symfony/serializer": "5.4.*", - "symfony/translation": "5.4.*", - "symfony/twig-bundle": "5.4.*", - "symfony/uid": "5.4.*", - "symfony/validator": "5.4.*", - "symfony/web-link": "5.4.*", + "symfony/notifier": "6.0.*", + "symfony/process": "6.0.*", + "symfony/property-access": "6.0.*", + "symfony/property-info": "6.0.*", + "symfony/proxy-manager-bridge": "6.0.*", + "symfony/rate-limiter": "6.0.*", + "symfony/security-bundle": "6.0.*", + "symfony/serializer": "6.0.*", + "symfony/translation": "6.0.*", + "symfony/twig-bundle": "6.0.*", + "symfony/uid": "6.0.*", + "symfony/validator": "6.0.*", + "symfony/web-link": "6.0.*", "symfony/webpack-encore-bundle": "^1.11", - "symfony/yaml": "5.4.*", + "symfony/yaml": "6.0.*", "twig/extra-bundle": "^3.0", "twig/twig": "^3.0" }, "require-dev": { - "symfony/browser-kit": "5.4.*", - "symfony/css-selector": "5.4.*", - "symfony/debug-bundle": "5.4.*", + "symfony/browser-kit": "6.0.*", + "symfony/css-selector": "6.0.*", + "symfony/debug-bundle": "6.0.*", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^5.2", - "symfony/stopwatch": "5.4.*", - "symfony/var-dumper": "5.4.*", - "symfony/web-profiler-bundle": "5.4.*" + "symfony/stopwatch": "6.0.*", + "symfony/var-dumper": "6.0.*", + "symfony/web-profiler-bundle": "6.0.*" }, "config": { "preferred-install": { diff --git a/config/bundles.php b/config/bundles.php index 87a56e8..a065b7d 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -13,5 +13,4 @@ Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true], Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], - ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true], ]; diff --git a/config/packages/api_platform.yaml b/config/packages/api_platform.yaml deleted file mode 100644 index 2eb7b4c..0000000 --- a/config/packages/api_platform.yaml +++ /dev/null @@ -1,7 +0,0 @@ -api_platform: - mapping: - paths: ['%kernel.project_dir%/src/Entity'] - patch_formats: - json: ['application/merge-patch+json'] - swagger: - versions: [3] diff --git a/config/packages/lock.yaml b/config/packages/lock.yaml new file mode 100644 index 0000000..574879f --- /dev/null +++ b/config/packages/lock.yaml @@ -0,0 +1,2 @@ +framework: + lock: '%env(LOCK_DSN)%' diff --git a/config/packages/notifier.yaml b/config/packages/notifier.yaml new file mode 100644 index 0000000..3984a48 --- /dev/null +++ b/config/packages/notifier.yaml @@ -0,0 +1,16 @@ +framework: + notifier: + #chatter_transports: + # slack: '%env(SLACK_DSN)%' + # telegram: '%env(TELEGRAM_DSN)%' + #texter_transports: + # twilio: '%env(TWILIO_DSN)%' + # nexmo: '%env(NEXMO_DSN)%' + channel_policy: + # use chat/slack, chat/telegram, sms/twilio or sms/nexmo + urgent: ['email'] + high: ['email'] + medium: ['email'] + low: ['email'] + admin_recipients: + - { email: admin@example.com } diff --git a/config/routes/api_platform.yaml b/config/routes/api_platform.yaml deleted file mode 100644 index 38f11cb..0000000 --- a/config/routes/api_platform.yaml +++ /dev/null @@ -1,4 +0,0 @@ -api_platform: - resource: . - type: api_platform - prefix: /api diff --git a/src/Kernel.php b/src/Kernel.php index 1cd0572..b06fc79 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -3,52 +3,14 @@ namespace App; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; -use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\Config\Resource\FileResource; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel as BaseKernel; -use Symfony\Component\Routing\RouteCollectionBuilder; class Kernel extends BaseKernel { use MicroKernelTrait; - private const CONFIG_EXTS = '.{php,xml,yaml,yml}'; - - public function registerBundles(): iterable - { - $contents = require $this->getProjectDir().'/config/bundles.php'; - foreach ($contents as $class => $envs) { - if ($envs[$this->environment] ?? $envs['all'] ?? false) { - yield new $class(); - } - } - } - public function getProjectDir(): string { return \dirname(__DIR__); } - - protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void - { - $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php')); - $container->setParameter('container.dumper.inline_class_loader', \PHP_VERSION_ID < 70400 || $this->debug); - $container->setParameter('container.dumper.inline_factories', true); - $confDir = $this->getProjectDir().'/config'; - - $loader->load($confDir.'/{packages}/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{packages}/'.$this->environment.'/*'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}'.self::CONFIG_EXTS, 'glob'); - $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob'); - } - - protected function configureRoutes(RouteCollectionBuilder $routes): void - { - $confDir = $this->getProjectDir().'/config'; - - $routes->import($confDir.'/{routes}/'.$this->environment.'/*'.self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob'); - $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob'); - } } diff --git a/symfony.lock b/symfony.lock index 8ae698a..c0af849 100644 --- a/symfony.lock +++ b/symfony.lock @@ -125,6 +125,9 @@ "psr/container": { "version": "1.1.1" }, + "psr/event-dispatcher": { + "version": "1.0.0" + }, "psr/link": { "version": "1.1.1" }, @@ -285,6 +288,18 @@ "symfony/intl": { "version": "v4.4.20" }, + "symfony/lock": { + "version": "6.0", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "5.2", + "ref": "a1c8800e40ae735206bb14586fdd6c4630a51b8d" + }, + "files": [ + "config/packages/lock.yaml" + ] + }, "symfony/mailer": { "version": "4.3", "recipe": { @@ -354,12 +369,27 @@ "config/packages/test/monolog.yaml" ] }, + "symfony/notifier": { + "version": "6.0", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "5.0", + "ref": "c31585e252b32fe0e1f30b1f256af553f4a06eb9" + }, + "files": [ + "config/packages/notifier.yaml" + ] + }, "symfony/options-resolver": { "version": "v4.4.20" }, "symfony/orm-pack": { "version": "v2.1.0" }, + "symfony/password-hasher": { + "version": "v6.0.0" + }, "symfony/phpunit-bridge": { "version": "5.1", "recipe": { @@ -402,6 +432,9 @@ "symfony/polyfill-php81": { "version": "v1.23.0" }, + "symfony/polyfill-uuid": { + "version": "v1.23.0" + }, "symfony/process": { "version": "v4.4.20" }, @@ -417,6 +450,9 @@ "symfony/proxy-manager-bridge": { "version": "v4.4.20" }, + "symfony/rate-limiter": { + "version": "v6.0.0" + }, "symfony/redis-messenger": { "version": "v5.3.10" }, @@ -512,6 +548,9 @@ "symfony/twig-pack": { "version": "v1.0.1" }, + "symfony/uid": { + "version": "v6.0.0" + }, "symfony/validator": { "version": "4.3", "recipe": { From 697646e2c0657bce10ce29bf90bf8d5086aacda1 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Wed, 8 Dec 2021 08:17:50 +0100 Subject: [PATCH 05/16] Init Symfony 6.1 --- composer.json | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index e9e553e..17fa93e 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "type": "project", "license": "proprietary", "require": { - "php": ">=7.1.3", + "php": ">=8.0", "ext-ctype": "*", "ext-iconv": "*", "composer/package-versions-deprecated": "1.11.99.1", @@ -11,46 +11,46 @@ "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", - "symfony/asset": "6.0.*", - "symfony/console": "6.0.*", - "symfony/dotenv": "6.0.*", - "symfony/expression-language": "6.0.*", + "symfony/asset": "6.1.*", + "symfony/console": "6.1.*", + "symfony/dotenv": "6.1.*", + "symfony/expression-language": "6.1.*", "symfony/flex": "^1.3.1", - "symfony/form": "6.0.*", - "symfony/framework-bundle": "6.0.*", - "symfony/http-client": "6.0.*", - "symfony/intl": "6.0.*", - "symfony/mailer": "6.0.*", + "symfony/form": "6.1.*", + "symfony/framework-bundle": "6.1.*", + "symfony/http-client": "6.1.*", + "symfony/intl": "6.1.*", + "symfony/mailer": "6.1.*", "symfony/mercure-bundle": "^0.3.2", - "symfony/messenger": "6.0.*", + "symfony/messenger": "6.1.*", "symfony/monolog-bundle": "^3.1", - "symfony/notifier": "6.0.*", - "symfony/process": "6.0.*", - "symfony/property-access": "6.0.*", - "symfony/property-info": "6.0.*", - "symfony/proxy-manager-bridge": "6.0.*", - "symfony/rate-limiter": "6.0.*", - "symfony/security-bundle": "6.0.*", - "symfony/serializer": "6.0.*", - "symfony/translation": "6.0.*", - "symfony/twig-bundle": "6.0.*", - "symfony/uid": "6.0.*", - "symfony/validator": "6.0.*", - "symfony/web-link": "6.0.*", + "symfony/notifier": "6.1.*", + "symfony/process": "6.1.*", + "symfony/property-access": "6.1.*", + "symfony/property-info": "6.1.*", + "symfony/proxy-manager-bridge": "6.1.*", + "symfony/rate-limiter": "6.1.*", + "symfony/security-bundle": "6.1.*", + "symfony/serializer": "6.1.*", + "symfony/translation": "6.1.*", + "symfony/twig-bundle": "6.1.*", + "symfony/uid": "6.1.*", + "symfony/validator": "6.1.*", + "symfony/web-link": "6.1.*", "symfony/webpack-encore-bundle": "^1.11", - "symfony/yaml": "6.0.*", + "symfony/yaml": "6.1.*", "twig/extra-bundle": "^3.0", "twig/twig": "^3.0" }, "require-dev": { - "symfony/browser-kit": "6.0.*", - "symfony/css-selector": "6.0.*", - "symfony/debug-bundle": "6.0.*", + "symfony/browser-kit": "6.1.*", + "symfony/css-selector": "6.1.*", + "symfony/debug-bundle": "6.1.*", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^5.2", - "symfony/stopwatch": "6.0.*", - "symfony/var-dumper": "6.0.*", - "symfony/web-profiler-bundle": "6.0.*" + "symfony/stopwatch": "6.1.*", + "symfony/var-dumper": "6.1.*", + "symfony/web-profiler-bundle": "6.1.*" }, "config": { "preferred-install": { @@ -94,7 +94,7 @@ "extra": { "symfony": { "allow-contrib": false, - "require": "6.0.*" + "require": "6.*" } }, "minimum-stability": "dev", From 8e6479810f3dced9135617f4056b607d7697aed9 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 10 Jun 2022 22:31:00 +0200 Subject: [PATCH 06/16] Update PHP requirement of Symfony 6.1 branch (#11) * Update PHP requirement of Symfony 6.1 branch * Update CI and ran composer update Co-authored-by: Nyholm --- .github/workflows/ci.yml | 2 +- composer.json | 7 +++++-- symfony.lock | 15 --------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9e64c4..92ba61e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.1 coverage: none - name: Download dependencies diff --git a/composer.json b/composer.json index 17fa93e..c4b4560 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "type": "project", "license": "proprietary", "require": { - "php": ">=8.0", + "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", "composer/package-versions-deprecated": "1.11.99.1", @@ -56,7 +56,10 @@ "preferred-install": { "*": "dist" }, - "sort-packages": true + "sort-packages": true, + "allow-plugins": { + "symfony/flex": true + } }, "autoload": { "psr-4": { diff --git a/symfony.lock b/symfony.lock index c0af849..b3ae037 100644 --- a/symfony.lock +++ b/symfony.lock @@ -180,9 +180,6 @@ "symfony/css-selector": { "version": "v4.4.20" }, - "symfony/debug": { - "version": "v4.4.20" - }, "symfony/debug-bundle": { "version": "4.1", "recipe": { @@ -282,9 +279,6 @@ "symfony/http-kernel": { "version": "v4.4.21" }, - "symfony/inflector": { - "version": "v4.4.21" - }, "symfony/intl": { "version": "v4.4.20" }, @@ -423,15 +417,9 @@ "symfony/polyfill-php72": { "version": "v1.22.1" }, - "symfony/polyfill-php73": { - "version": "v1.22.1" - }, "symfony/polyfill-php80": { "version": "v1.22.1" }, - "symfony/polyfill-php81": { - "version": "v1.23.0" - }, "symfony/polyfill-uuid": { "version": "v1.23.0" }, @@ -488,9 +476,6 @@ "symfony/security-csrf": { "version": "v4.4.20" }, - "symfony/security-guard": { - "version": "v4.4.20" - }, "symfony/security-http": { "version": "v4.4.21" }, From 042a9482b0305f2c6a9e1244c3e869bc3e820645 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Fri, 10 Jun 2022 22:32:52 +0200 Subject: [PATCH 07/16] Update reqs --- composer.json | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index c4b4560..282438e 100644 --- a/composer.json +++ b/composer.json @@ -11,46 +11,46 @@ "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", - "symfony/asset": "6.1.*", - "symfony/console": "6.1.*", - "symfony/dotenv": "6.1.*", - "symfony/expression-language": "6.1.*", + "symfony/asset": "6.2.*", + "symfony/console": "6.2.*", + "symfony/dotenv": "6.2.*", + "symfony/expression-language": "6.2.*", "symfony/flex": "^1.3.1", - "symfony/form": "6.1.*", - "symfony/framework-bundle": "6.1.*", - "symfony/http-client": "6.1.*", - "symfony/intl": "6.1.*", - "symfony/mailer": "6.1.*", + "symfony/form": "6.2.*", + "symfony/framework-bundle": "6.2.*", + "symfony/http-client": "6.2.*", + "symfony/intl": "6.2.*", + "symfony/mailer": "6.2.*", "symfony/mercure-bundle": "^0.3.2", - "symfony/messenger": "6.1.*", + "symfony/messenger": "6.2.*", "symfony/monolog-bundle": "^3.1", - "symfony/notifier": "6.1.*", - "symfony/process": "6.1.*", - "symfony/property-access": "6.1.*", - "symfony/property-info": "6.1.*", - "symfony/proxy-manager-bridge": "6.1.*", - "symfony/rate-limiter": "6.1.*", - "symfony/security-bundle": "6.1.*", - "symfony/serializer": "6.1.*", - "symfony/translation": "6.1.*", - "symfony/twig-bundle": "6.1.*", - "symfony/uid": "6.1.*", - "symfony/validator": "6.1.*", - "symfony/web-link": "6.1.*", + "symfony/notifier": "6.2.*", + "symfony/process": "6.2.*", + "symfony/property-access": "6.2.*", + "symfony/property-info": "6.2.*", + "symfony/proxy-manager-bridge": "6.2.*", + "symfony/rate-limiter": "6.2.*", + "symfony/security-bundle": "6.2.*", + "symfony/serializer": "6.2.*", + "symfony/translation": "6.2.*", + "symfony/twig-bundle": "6.2.*", + "symfony/uid": "6.2.*", + "symfony/validator": "6.2.*", + "symfony/web-link": "6.2.*", "symfony/webpack-encore-bundle": "^1.11", - "symfony/yaml": "6.1.*", + "symfony/yaml": "6.2.*", "twig/extra-bundle": "^3.0", "twig/twig": "^3.0" }, "require-dev": { - "symfony/browser-kit": "6.1.*", - "symfony/css-selector": "6.1.*", - "symfony/debug-bundle": "6.1.*", + "symfony/browser-kit": "6.2.*", + "symfony/css-selector": "6.2.*", + "symfony/debug-bundle": "6.2.*", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^5.2", - "symfony/stopwatch": "6.1.*", - "symfony/var-dumper": "6.1.*", - "symfony/web-profiler-bundle": "6.1.*" + "symfony/stopwatch": "6.2.*", + "symfony/var-dumper": "6.2.*", + "symfony/web-profiler-bundle": "6.2.*" }, "config": { "preferred-install": { From 4b9247e0f6dc8ac14badc0ab5d097df82c7107c3 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sun, 4 Dec 2022 21:39:55 +0100 Subject: [PATCH 08/16] Support Symfony 6.3 --- composer.json | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index a8f9ed5..6d3c55b 100644 --- a/composer.json +++ b/composer.json @@ -11,47 +11,47 @@ "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", - "symfony/asset": "6.2.*", - "symfony/console": "6.2.*", - "symfony/dotenv": "6.2.*", - "symfony/expression-language": "6.2.*", + "symfony/asset": "6.3.*", + "symfony/console": "6.3.*", + "symfony/dotenv": "6.3.*", + "symfony/expression-language": "6.3.*", "symfony/flex": "^1.3.1", - "symfony/form": "6.2.*", - "symfony/framework-bundle": "6.2.*", - "symfony/http-client": "6.2.*", - "symfony/intl": "6.2.*", - "symfony/mailer": "6.2.*", + "symfony/form": "6.3.*", + "symfony/framework-bundle": "6.3.*", + "symfony/http-client": "6.3.*", + "symfony/intl": "6.3.*", + "symfony/mailer": "6.3.*", "symfony/mercure-bundle": "^0.3.2", - "symfony/messenger": "6.2.*", + "symfony/messenger": "6.3.*", "symfony/monolog-bundle": "^3.1", - "symfony/notifier": "6.2.*", - "symfony/process": "6.2.*", - "symfony/property-access": "6.2.*", - "symfony/property-info": "6.2.*", - "symfony/proxy-manager-bridge": "6.2.*", - "symfony/rate-limiter": "6.2.*", - "symfony/routing": "6.2.*", - "symfony/security-bundle": "6.2.*", - "symfony/serializer": "6.2.*", - "symfony/translation": "6.2.*", - "symfony/twig-bundle": "6.2.*", - "symfony/uid": "6.2.*", - "symfony/validator": "6.2.*", - "symfony/web-link": "6.2.*", + "symfony/notifier": "6.3.*", + "symfony/process": "6.3.*", + "symfony/property-access": "6.3.*", + "symfony/property-info": "6.3.*", + "symfony/proxy-manager-bridge": "6.3.*", + "symfony/rate-limiter": "6.3.*", + "symfony/routing": "6.3.*", + "symfony/security-bundle": "6.3.*", + "symfony/serializer": "6.3.*", + "symfony/translation": "6.3.*", + "symfony/twig-bundle": "6.3.*", + "symfony/uid": "6.3.*", + "symfony/validator": "6.3.*", + "symfony/web-link": "6.3.*", "symfony/webpack-encore-bundle": "^1.11", - "symfony/yaml": "6.2.*", + "symfony/yaml": "6.3.*", "twig/extra-bundle": "^3.0", "twig/twig": "^3.0" }, "require-dev": { - "symfony/browser-kit": "6.2.*", - "symfony/css-selector": "6.2.*", - "symfony/debug-bundle": "6.2.*", + "symfony/browser-kit": "6.3.*", + "symfony/css-selector": "6.3.*", + "symfony/debug-bundle": "6.3.*", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^5.2", - "symfony/stopwatch": "6.2.*", - "symfony/var-dumper": "6.2.*", - "symfony/web-profiler-bundle": "6.2.*" + "symfony/stopwatch": "6.3.*", + "symfony/var-dumper": "6.3.*", + "symfony/web-profiler-bundle": "6.3.*" }, "config": { "allow-plugins": { From f7f078fd0807a9c8c40f69dc78ee7bbe24a2d518 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 24 Jun 2023 13:34:59 +0200 Subject: [PATCH 09/16] update to Symfony 6.4 --- composer.json | 62 +++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index 6d3c55b..2f64c80 100644 --- a/composer.json +++ b/composer.json @@ -11,47 +11,47 @@ "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", - "symfony/asset": "6.3.*", - "symfony/console": "6.3.*", - "symfony/dotenv": "6.3.*", - "symfony/expression-language": "6.3.*", + "symfony/asset": "6.4.*", + "symfony/console": "6.4.*", + "symfony/dotenv": "6.4.*", + "symfony/expression-language": "6.4.*", "symfony/flex": "^1.3.1", - "symfony/form": "6.3.*", - "symfony/framework-bundle": "6.3.*", - "symfony/http-client": "6.3.*", - "symfony/intl": "6.3.*", - "symfony/mailer": "6.3.*", + "symfony/form": "6.4.*", + "symfony/framework-bundle": "6.4.*", + "symfony/http-client": "6.4.*", + "symfony/intl": "6.4.*", + "symfony/mailer": "6.4.*", "symfony/mercure-bundle": "^0.3.2", - "symfony/messenger": "6.3.*", + "symfony/messenger": "6.4.*", "symfony/monolog-bundle": "^3.1", - "symfony/notifier": "6.3.*", - "symfony/process": "6.3.*", - "symfony/property-access": "6.3.*", - "symfony/property-info": "6.3.*", - "symfony/proxy-manager-bridge": "6.3.*", - "symfony/rate-limiter": "6.3.*", - "symfony/routing": "6.3.*", - "symfony/security-bundle": "6.3.*", - "symfony/serializer": "6.3.*", - "symfony/translation": "6.3.*", - "symfony/twig-bundle": "6.3.*", - "symfony/uid": "6.3.*", - "symfony/validator": "6.3.*", - "symfony/web-link": "6.3.*", + "symfony/notifier": "6.4.*", + "symfony/process": "6.4.*", + "symfony/property-access": "6.4.*", + "symfony/property-info": "6.4.*", + "symfony/proxy-manager-bridge": "6.4.*", + "symfony/rate-limiter": "6.4.*", + "symfony/routing": "6.4.*", + "symfony/security-bundle": "6.4.*", + "symfony/serializer": "6.4.*", + "symfony/translation": "6.4.*", + "symfony/twig-bundle": "6.4.*", + "symfony/uid": "6.4.*", + "symfony/validator": "6.4.*", + "symfony/web-link": "6.4.*", "symfony/webpack-encore-bundle": "^1.11", - "symfony/yaml": "6.3.*", + "symfony/yaml": "6.4.*", "twig/extra-bundle": "^3.0", "twig/twig": "^3.0" }, "require-dev": { - "symfony/browser-kit": "6.3.*", - "symfony/css-selector": "6.3.*", - "symfony/debug-bundle": "6.3.*", + "symfony/browser-kit": "6.4.*", + "symfony/css-selector": "6.4.*", + "symfony/debug-bundle": "6.4.*", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^5.2", - "symfony/stopwatch": "6.3.*", - "symfony/var-dumper": "6.3.*", - "symfony/web-profiler-bundle": "6.3.*" + "symfony/stopwatch": "6.4.*", + "symfony/var-dumper": "6.4.*", + "symfony/web-profiler-bundle": "6.4.*" }, "config": { "allow-plugins": { From d79a42da266d0ff38d9d3638b1c6a841907b6944 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 8 Aug 2023 15:01:50 +0200 Subject: [PATCH 10/16] add the HtmlSanitizer component --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 6d3c55b..6477d87 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "symfony/flex": "^1.3.1", "symfony/form": "6.3.*", "symfony/framework-bundle": "6.3.*", + "symfony/html-sanitizer": "6.3.*", "symfony/http-client": "6.3.*", "symfony/intl": "6.3.*", "symfony/mailer": "6.3.*", From 8908a1e663ac8213523f06d4c2b3fb8fc7f955d6 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 24 Jun 2023 13:40:01 +0200 Subject: [PATCH 11/16] update to Symfony 7.0 --- .github/workflows/ci.yml | 2 +- composer.json | 70 ++++++++++----------- config/bundles.php | 1 - config/packages/doctrine.yaml | 2 +- config/packages/security.yaml | 39 ++++++++++++ config/packages/sensio_framework_extra.yaml | 3 - config/routes.yaml | 8 ++- config/routes/annotations.yaml | 7 --- symfony.lock | 42 ------------- 9 files changed, 80 insertions(+), 94 deletions(-) create mode 100644 config/packages/security.yaml delete mode 100644 config/packages/sensio_framework_extra.yaml delete mode 100644 config/routes/annotations.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92ba61e..c14cee6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Set up PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.1 + php-version: 8.2 coverage: none - name: Download dependencies diff --git a/composer.json b/composer.json index c5d5171..26e2161 100644 --- a/composer.json +++ b/composer.json @@ -7,52 +7,50 @@ "ext-iconv": "*", "composer/package-versions-deprecated": "1.11.99.1", "doctrine/annotations": "^1.0", - "doctrine/doctrine-bundle": "^2.3", + "doctrine/doctrine-bundle": "^2.11", "doctrine/orm": "^2.8", "phpdocumentor/reflection-docblock": "^5.2", - "sensio/framework-extra-bundle": "^6.1", - "symfony/asset": "6.4.*", - "symfony/console": "6.4.*", - "symfony/dotenv": "6.4.*", - "symfony/expression-language": "6.4.*", + "symfony/asset": "*", + "symfony/console": "*", + "symfony/dotenv": "*", + "symfony/expression-language": "*", "symfony/flex": "^1.3.1", - "symfony/form": "6.4.*", - "symfony/framework-bundle": "6.4.*", - "symfony/html-sanitizer": "6.4.*", - "symfony/http-client": "6.4.*", - "symfony/intl": "6.4.*", - "symfony/mailer": "6.4.*", + "symfony/form": "*", + "symfony/framework-bundle": "*", + "symfony/html-sanitizer": "*", + "symfony/http-client": "*", + "symfony/intl": "*", + "symfony/mailer": "*", "symfony/mercure-bundle": "^0.3.2", - "symfony/messenger": "6.4.*", + "symfony/messenger": "*", "symfony/monolog-bundle": "^3.1", - "symfony/notifier": "6.4.*", - "symfony/process": "6.4.*", - "symfony/property-access": "6.4.*", - "symfony/property-info": "6.4.*", - "symfony/proxy-manager-bridge": "6.4.*", - "symfony/rate-limiter": "6.4.*", - "symfony/routing": "6.4.*", - "symfony/security-bundle": "6.4.*", - "symfony/serializer": "6.4.*", - "symfony/translation": "6.4.*", - "symfony/twig-bundle": "6.4.*", - "symfony/uid": "6.4.*", - "symfony/validator": "6.4.*", - "symfony/web-link": "6.4.*", - "symfony/webpack-encore-bundle": "^1.11", - "symfony/yaml": "6.4.*", + "symfony/notifier": "*", + "symfony/process": "*", + "symfony/property-access": "*", + "symfony/property-info": "*", + "symfony/rate-limiter": "*", + "symfony/routing": "*", + "symfony/security-bundle": "*", + "symfony/serializer": "*", + "symfony/translation": "*", + "symfony/twig-bundle": "*", + "symfony/uid": "*", + "symfony/validator": "*", + "symfony/web-link": "*", + "symfony/webpack-encore-bundle": "^2.1", + "symfony/yaml": "*", "twig/extra-bundle": "^3.0", "twig/twig": "^3.0" }, "require-dev": { - "symfony/browser-kit": "6.4.*", - "symfony/css-selector": "6.4.*", - "symfony/debug-bundle": "6.4.*", + "symfony/browser-kit": "*", + "symfony/css-selector": "*", + "symfony/debug-bundle": "*", "symfony/maker-bundle": "^1.0", "symfony/phpunit-bridge": "^5.2", - "symfony/stopwatch": "6.4.*", - "symfony/var-dumper": "6.4.*", - "symfony/web-profiler-bundle": "6.4.*" + "symfony/stopwatch": "*", + "symfony/var-dumper": "*", + "symfony/web-profiler-bundle": "*" }, "config": { "allow-plugins": { @@ -102,7 +100,7 @@ "extra": { "symfony": { "allow-contrib": false, - "require": "6.*" + "require": "7.0.*" } }, "minimum-stability": "dev", diff --git a/config/bundles.php b/config/bundles.php index a065b7d..3154197 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -2,7 +2,6 @@ return [ Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], - Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 491dc6f..b9d0132 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -13,7 +13,7 @@ doctrine: mappings: App: is_bundle: false - type: annotation + type: attribute dir: '%kernel.project_dir%/src/Entity' prefix: 'App\Entity' alias: App diff --git a/config/packages/security.yaml b/config/packages/security.yaml new file mode 100644 index 0000000..058cbed --- /dev/null +++ b/config/packages/security.yaml @@ -0,0 +1,39 @@ +security: + # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords + password_hashers: + Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto' + # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider + providers: + users_in_memory: { memory: null } + firewalls: + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ + security: false + main: + lazy: true + provider: users_in_memory + + # activate different ways to authenticate + # https://symfony.com/doc/current/security.html#the-firewall + + # https://symfony.com/doc/current/security/impersonating_user.html + # switch_user: true + + # Easy way to control access for large sections of your site + # Note: Only the *first* access control that matches will be used + access_control: + # - { path: ^/admin, roles: ROLE_ADMIN } + # - { path: ^/profile, roles: ROLE_USER } + +when@test: + security: + password_hashers: + # By default, password hashers are resource intensive and take time. This is + # important to generate secure password hashes. In tests however, secure hashes + # are not important, waste resources and increase test times. The following + # reduces the work factor to the lowest possible values. + Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: + algorithm: auto + cost: 4 # Lowest possible value for bcrypt + time_cost: 3 # Lowest possible value for argon + memory_cost: 10 # Lowest possible value for argon diff --git a/config/packages/sensio_framework_extra.yaml b/config/packages/sensio_framework_extra.yaml deleted file mode 100644 index 1821ccc..0000000 --- a/config/packages/sensio_framework_extra.yaml +++ /dev/null @@ -1,3 +0,0 @@ -sensio_framework_extra: - router: - annotations: false diff --git a/config/routes.yaml b/config/routes.yaml index c3283aa..2d0ef99 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -1,3 +1,5 @@ -#index: -# path: / -# controller: App\Controller\DefaultController::index +controllers: + resource: + path: ../src/Controller/ + namespace: App\Controller + type: attribute diff --git a/config/routes/annotations.yaml b/config/routes/annotations.yaml deleted file mode 100644 index e92efc5..0000000 --- a/config/routes/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -controllers: - resource: ../../src/Controller/ - type: annotation - -kernel: - resource: ../../src/Kernel.php - type: annotation diff --git a/symfony.lock b/symfony.lock index 2759d35..4182fb6 100644 --- a/symfony.lock +++ b/symfony.lock @@ -83,12 +83,6 @@ "fig/link-util": { "version": "1.2.0" }, - "friendsofphp/proxy-manager-lts": { - "version": "v1.0.5" - }, - "laminas/laminas-code": { - "version": "4.5.0" - }, "lcobucci/clock": { "version": "2.1.0" }, @@ -119,27 +113,12 @@ "psr/event-dispatcher": { "version": "1.0.0" }, - "psr/event-dispatcher": { - "version": "1.0.0" - }, "psr/link": { "version": "1.1.1" }, "psr/log": { "version": "2.0.0" }, - "sensio/framework-extra-bundle": { - "version": "5.6", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "5.2", - "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" - }, - "files": [ - "config/packages/sensio_framework_extra.yaml" - ] - }, "symfony/amqp-messenger": { "version": "v6.0.0" }, @@ -282,18 +261,6 @@ "config/packages/lock.yaml" ] }, - "symfony/lock": { - "version": "6.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "5.2", - "ref": "a1c8800e40ae735206bb14586fdd6c4630a51b8d" - }, - "files": [ - "config/packages/lock.yaml" - ] - }, "symfony/mailer": { "version": "5.4", "recipe": { @@ -432,12 +399,6 @@ "symfony/property-info": { "version": "v5.4.0" }, - "symfony/proxy-manager-bridge": { - "version": "v5.4.0" - }, - "symfony/rate-limiter": { - "version": "v5.4.0" - }, "symfony/rate-limiter": { "version": "v6.0.0" }, @@ -525,9 +486,6 @@ "templates/base.html.twig" ] }, - "symfony/uid": { - "version": "v5.4.0" - }, "symfony/uid": { "version": "v6.0.0" }, From 192dfd01218ff425dae1b652314c956bbd612226 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 8 Dec 2023 12:02:06 +0100 Subject: [PATCH 12/16] remove duplicated allow-plugins section --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 6477d87..3cb42f8 100644 --- a/composer.json +++ b/composer.json @@ -61,10 +61,7 @@ "preferred-install": { "*": "dist" }, - "sort-packages": true, - "allow-plugins": { - "symfony/flex": true - } + "sort-packages": true }, "autoload": { "psr-4": { From 467e6624808c2e14ce7818ce4fbe85335a3ee31f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 21 Dec 2023 12:04:01 +0100 Subject: [PATCH 13/16] add the AssetMapper component (#22) --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 3cb42f8..65b4dfb 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "phpdocumentor/reflection-docblock": "^5.2", "sensio/framework-extra-bundle": "^6.1", "symfony/asset": "6.3.*", + "symfony/asset-mapper": "6.3.*", "symfony/console": "6.3.*", "symfony/dotenv": "6.3.*", "symfony/expression-language": "6.3.*", From 958c07475816ddb8a5894e5ab0363f2fd5cde767 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Fri, 22 Dec 2023 17:31:55 +0100 Subject: [PATCH 14/16] add the Webhook component (#25) --- composer.json | 1 + symfony.lock | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/composer.json b/composer.json index 65b4dfb..b95c5c2 100644 --- a/composer.json +++ b/composer.json @@ -40,6 +40,7 @@ "symfony/uid": "6.3.*", "symfony/validator": "6.3.*", "symfony/web-link": "6.3.*", + "symfony/webhook": "6.3.*", "symfony/webpack-encore-bundle": "^1.11", "symfony/yaml": "6.3.*", "twig/extra-bundle": "^3.0", diff --git a/symfony.lock b/symfony.lock index 2759d35..0d535c5 100644 --- a/symfony.lock +++ b/symfony.lock @@ -567,6 +567,18 @@ "config/routes/dev/web_profiler.yaml" ] }, + "symfony/webhook": { + "version": "6.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.3", + "ref": "0bc853a74c98e448116ba53e118a7b6b3cdf9a03" + }, + "files": [ + "config/routes/webhook.yaml" + ] + }, "symfony/webpack-encore-bundle": { "version": "1.13", "recipe": { From 74593b732a6e073643df29fce96554348f47b18f Mon Sep 17 00:00:00 2001 From: Antoine Lamirault Date: Fri, 19 Jan 2024 19:16:59 +0100 Subject: [PATCH 15/16] Add the scheduler component (#26) --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index b95c5c2..1e829ba 100644 --- a/composer.json +++ b/composer.json @@ -33,6 +33,7 @@ "symfony/proxy-manager-bridge": "6.3.*", "symfony/rate-limiter": "6.3.*", "symfony/routing": "6.3.*", + "symfony/scheduler": "6.3.*", "symfony/security-bundle": "6.3.*", "symfony/serializer": "6.3.*", "symfony/translation": "6.3.*", From c1acc035152a990b58af5d1fac57b2e56dc08dc4 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 12 Mar 2024 09:27:14 +0100 Subject: [PATCH 16/16] install the AssetMapper recipe --- .gitignore | 6 +++++- composer.json | 3 ++- config/packages/asset_mapper.yaml | 5 +++++ importmap.php | 19 ++++++++++++++++ symfony.lock | 36 +++++++++++++------------------ templates/base.html.twig | 1 + 6 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 config/packages/asset_mapper.yaml create mode 100644 importmap.php diff --git a/.gitignore b/.gitignore index 6a7987a..7c04f2c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,8 @@ npm-debug.log yarn-error.log ###< symfony/webpack-encore-bundle ### -composer.lock \ No newline at end of file +composer.lock +###> symfony/asset-mapper ### +/public/assets/ +/assets/vendor/ +###< symfony/asset-mapper ### diff --git a/composer.json b/composer.json index d51ed8e..e4a1688 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,8 @@ "scripts": { "auto-scripts": { "cache:clear": "symfony-cmd", - "assets:install %PUBLIC_DIR%": "symfony-cmd" + "assets:install %PUBLIC_DIR%": "symfony-cmd", + "importmap:install": "symfony-cmd" }, "post-install-cmd": [ "@auto-scripts" diff --git a/config/packages/asset_mapper.yaml b/config/packages/asset_mapper.yaml new file mode 100644 index 0000000..d1ac653 --- /dev/null +++ b/config/packages/asset_mapper.yaml @@ -0,0 +1,5 @@ +framework: + asset_mapper: + # The paths to make available to the asset mapper. + paths: + - assets/ diff --git a/importmap.php b/importmap.php new file mode 100644 index 0000000..70ebf14 --- /dev/null +++ b/importmap.php @@ -0,0 +1,19 @@ + [ + 'path' => './assets/app.js', + 'entrypoint' => true, + ], +]; diff --git a/symfony.lock b/symfony.lock index 0d535c5..059d424 100644 --- a/symfony.lock +++ b/symfony.lock @@ -119,9 +119,6 @@ "psr/event-dispatcher": { "version": "1.0.0" }, - "psr/event-dispatcher": { - "version": "1.0.0" - }, "psr/link": { "version": "1.1.1" }, @@ -146,6 +143,21 @@ "symfony/asset": { "version": "v5.4.0" }, + "symfony/asset-mapper": { + "version": "7.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.4", + "ref": "6c28c471640cc2c6e60812ebcb961c526ef8997f" + }, + "files": [ + "assets/app.js", + "assets/styles/app.css", + "config/packages/asset_mapper.yaml", + "importmap.php" + ] + }, "symfony/browser-kit": { "version": "v5.4.0" }, @@ -282,18 +294,6 @@ "config/packages/lock.yaml" ] }, - "symfony/lock": { - "version": "6.0", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "master", - "version": "5.2", - "ref": "a1c8800e40ae735206bb14586fdd6c4630a51b8d" - }, - "files": [ - "config/packages/lock.yaml" - ] - }, "symfony/mailer": { "version": "5.4", "recipe": { @@ -435,9 +435,6 @@ "symfony/proxy-manager-bridge": { "version": "v5.4.0" }, - "symfony/rate-limiter": { - "version": "v5.4.0" - }, "symfony/rate-limiter": { "version": "v6.0.0" }, @@ -525,9 +522,6 @@ "templates/base.html.twig" ] }, - "symfony/uid": { - "version": "v5.4.0" - }, "symfony/uid": { "version": "v6.0.0" }, diff --git a/templates/base.html.twig b/templates/base.html.twig index 16d7273..eb686a8 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -10,6 +10,7 @@ {% endblock %} {% block javascripts %} + {% block importmap %}{{ importmap('app') }}{% endblock %} {#{{ encore_entry_script_tags('app') }}#} {% endblock %}