diff --git a/.env b/.env index 31eab4b..1ab5fea 100644 --- a/.env +++ b/.env @@ -39,13 +39,3 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0 ###> symfony/mailer ### MAILER_DSN=null://null ###< symfony/mailer ### - -###> symfony/mercure-bundle ### -# See https://symfony.com/doc/current/mercure.html#configuration -# The URL of the Mercure hub, used by the app to publish updates (can be a local URL) -MERCURE_URL=https://example.com/.well-known/mercure -# The public URL of the Mercure hub, used by the browser to connect -MERCURE_PUBLIC_URL=https://example.com/.well-known/mercure -# The secret used to sign the JWTs -MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!" -###< symfony/mercure-bundle ### diff --git a/compose.override.yaml b/compose.override.yaml index a3ee59d..fc37713 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -1,4 +1,3 @@ - services: ###> doctrine/doctrine-bundle ### database: @@ -17,8 +16,3 @@ services: MP_SMTP_AUTH_ALLOW_INSECURE: 1 ###< symfony/mailer ### -###> symfony/mercure-bundle ### - mercure: - ports: - - "80" -###< symfony/mercure-bundle ### diff --git a/compose.yaml b/compose.yaml index 0c973d3..9afb177 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,4 +1,3 @@ - services: ###> doctrine/doctrine-bundle ### database: @@ -19,36 +18,8 @@ services: # - ./docker/db/data:/var/lib/postgresql/data:rw ###< doctrine/doctrine-bundle ### -###> symfony/mercure-bundle ### - mercure: - image: dunglas/mercure - restart: unless-stopped - environment: - # Uncomment the following line to disable HTTPS, - #SERVER_NAME: ':80' - MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' - MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!' - # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive - MERCURE_EXTRA_DIRECTIVES: | - cors_origins http://127.0.0.1:8000 - # Comment the following line to disable the development mode - command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile - healthcheck: - test: ["CMD", "curl", "-f", "https://localhost/healthz"] - timeout: 5s - retries: 5 - start_period: 60s - volumes: - - mercure_data:/data - - mercure_config:/config -###< symfony/mercure-bundle ### - volumes: ###> doctrine/doctrine-bundle ### database_data: ###< doctrine/doctrine-bundle ### -###> symfony/mercure-bundle ### - mercure_data: - mercure_config: -###< symfony/mercure-bundle ### diff --git a/composer.json b/composer.json index 11d1c4c..562b54a 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,6 @@ "symfony/http-client": "7.2.*", "symfony/intl": "7.2.*", "symfony/mailer": "7.2.*", - "symfony/mercure-bundle": "^0.3.9", "symfony/mime": "7.2.*", "symfony/monolog-bundle": "^3.0", "symfony/notifier": "7.2.*", diff --git a/composer.lock b/composer.lock index abe873f..60e3723 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ca772d9929e27f4922e9abb62ac182b7", + "content-hash": "bf4898b8b7af1fcb2f85b07fb389668f", "packages": [ { "name": "doctrine/cache", @@ -1396,79 +1396,6 @@ ], "time": "2024-12-27T00:36:43+00:00" }, - { - "name": "lcobucci/jwt", - "version": "5.4.2", - "source": { - "type": "git", - "url": "https://github.com/lcobucci/jwt.git", - "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/ea1ce71cbf9741e445a5914e2f67cdbb484ff712", - "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712", - "shasum": "" - }, - "require": { - "ext-openssl": "*", - "ext-sodium": "*", - "php": "~8.2.0 || ~8.3.0 || ~8.4.0", - "psr/clock": "^1.0" - }, - "require-dev": { - "infection/infection": "^0.29", - "lcobucci/clock": "^3.2", - "lcobucci/coding-standard": "^11.0", - "phpbench/phpbench": "^1.2", - "phpstan/extension-installer": "^1.2", - "phpstan/phpstan": "^1.10.7", - "phpstan/phpstan-deprecation-rules": "^1.1.3", - "phpstan/phpstan-phpunit": "^1.3.10", - "phpstan/phpstan-strict-rules": "^1.5.0", - "phpunit/phpunit": "^11.1" - }, - "suggest": { - "lcobucci/clock": ">= 3.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "Lcobucci\\JWT\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Luís Cobucci", - "email": "lcobucci@gmail.com", - "role": "Developer" - } - ], - "description": "A simple library to work with JSON Web Token and JSON Web Signature", - "keywords": [ - "JWS", - "jwt" - ], - "support": { - "issues": "https://github.com/lcobucci/jwt/issues", - "source": "https://github.com/lcobucci/jwt/tree/5.4.2" - }, - "funding": [ - { - "url": "https://github.com/lcobucci", - "type": "github" - }, - { - "url": "https://www.patreon.com/lcobucci", - "type": "patreon" - } - ], - "time": "2024-11-07T12:54:35+00:00" - }, { "name": "monolog/monolog", "version": "3.8.1", @@ -4284,173 +4211,6 @@ ], "time": "2024-11-25T15:21:05+00:00" }, - { - "name": "symfony/mercure", - "version": "v0.6.5", - "source": { - "type": "git", - "url": "https://github.com/symfony/mercure.git", - "reference": "304cf84609ef645d63adc65fc6250292909a461b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/mercure/zipball/304cf84609ef645d63adc65fc6250292909a461b", - "reference": "304cf84609ef645d63adc65fc6250292909a461b", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/deprecation-contracts": "^2.0|^3.0|^4.0", - "symfony/http-client": "^4.4|^5.0|^6.0|^7.0", - "symfony/http-foundation": "^4.4|^5.0|^6.0|^7.0", - "symfony/polyfill-php80": "^1.22", - "symfony/web-link": "^4.4|^5.0|^6.0|^7.0" - }, - "require-dev": { - "lcobucci/jwt": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0|^7.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0|^7.0", - "symfony/phpunit-bridge": "^5.2|^6.0|^7.0", - "symfony/stopwatch": "^4.4|^5.0|^6.0|^7.0", - "twig/twig": "^2.0|^3.0|^4.0" - }, - "suggest": { - "symfony/stopwatch": "Integration with the profiler performances" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/dunglas/mercure", - "name": "dunglas/mercure" - }, - "branch-alias": { - "dev-main": "0.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Mercure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Mercure Component", - "homepage": "https://symfony.com", - "keywords": [ - "mercure", - "push", - "sse", - "updates" - ], - "support": { - "issues": "https://github.com/symfony/mercure/issues", - "source": "https://github.com/symfony/mercure/tree/v0.6.5" - }, - "funding": [ - { - "url": "https://github.com/dunglas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/mercure", - "type": "tidelift" - } - ], - "time": "2024-04-08T12:51:34+00:00" - }, - { - "name": "symfony/mercure-bundle", - "version": "v0.3.9", - "source": { - "type": "git", - "url": "https://github.com/symfony/mercure-bundle.git", - "reference": "77435d740b228e9f5f3f065b6db564f85f2cdb64" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/mercure-bundle/zipball/77435d740b228e9f5f3f065b6db564f85f2cdb64", - "reference": "77435d740b228e9f5f3f065b6db564f85f2cdb64", - "shasum": "" - }, - "require": { - "lcobucci/jwt": "^3.4|^4.0|^5.0", - "php": ">=7.1.3", - "symfony/config": "^4.4|^5.0|^6.0|^7.0", - "symfony/dependency-injection": "^4.4|^5.4|^6.0|^7.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0|^7.0", - "symfony/mercure": "^0.6.1", - "symfony/web-link": "^4.4|^5.0|^6.0|^7.0" - }, - "require-dev": { - "symfony/phpunit-bridge": "^4.3.7|^5.0|^6.0|^7.0", - "symfony/stopwatch": "^4.3.7|^5.0|^6.0|^7.0", - "symfony/ux-turbo": "*", - "symfony/var-dumper": "^4.3.7|^5.0|^6.0|^7.0" - }, - "suggest": { - "symfony/messenger": "To use the Messenger integration" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-main": "0.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Bundle\\MercureBundle\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kévin Dunglas", - "email": "dunglas@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony MercureBundle", - "homepage": "https://symfony.com", - "keywords": [ - "mercure", - "push", - "sse", - "updates" - ], - "support": { - "issues": "https://github.com/symfony/mercure-bundle/issues", - "source": "https://github.com/symfony/mercure-bundle/tree/v0.3.9" - }, - "funding": [ - { - "url": "https://github.com/dunglas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/mercure-bundle", - "type": "tidelift" - } - ], - "time": "2024-05-31T09:07:18+00:00" - }, { "name": "symfony/messenger", "version": "v7.2.1", diff --git a/config/bundles.php b/config/bundles.php index 1d966f4..2c290c6 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -14,7 +14,6 @@ return [ Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true], Symfony\UX\Turbo\TurboBundle::class => ['all' => true], Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true], - Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true], Symfony\UX\TwigComponent\TwigComponentBundle::class => ['all' => true], EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true], ]; diff --git a/config/packages/mercure.yaml b/config/packages/mercure.yaml deleted file mode 100644 index f2a7395..0000000 --- a/config/packages/mercure.yaml +++ /dev/null @@ -1,8 +0,0 @@ -mercure: - hubs: - default: - url: '%env(MERCURE_URL)%' - public_url: '%env(MERCURE_PUBLIC_URL)%' - jwt: - secret: '%env(MERCURE_JWT_SECRET)%' - publish: '*' diff --git a/symfony.lock b/symfony.lock index cd8b460..2a77d30 100644 --- a/symfony.lock +++ b/symfony.lock @@ -150,18 +150,6 @@ "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f" } }, - "symfony/mercure-bundle": { - "version": "0.3", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "0.3", - "ref": "528285147494380298f8f991ee8c47abebaf79db" - }, - "files": [ - "config/packages/mercure.yaml" - ] - }, "symfony/messenger": { "version": "7.2", "recipe": {