diff --git a/.env b/.env
index 9c4db2c..7c81431 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/.idea/codeception.xml b/.idea/codeception.xml
new file mode 100644
index 0000000..330f2dd
--- /dev/null
+++ b/.idea/codeception.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index 5dd201e..d41c898 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -1,20 +1,51 @@
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> oscar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -32,7 +63,6 @@
-
@@ -42,48 +72,31 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -94,16 +107,12 @@
+
-
-
-
-
-
@@ -111,20 +120,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -135,34 +131,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
->>>>>>> oscar
\ No newline at end of file
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
new file mode 100644
index 0000000..33107fd
--- /dev/null
+++ b/.idea/phpspec.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 708202f..13f8a62 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,18 @@
-
+
+
+
+
+
+
-
+
$PROJECT_DIR$/composer.json
@@ -26,139 +31,136 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
@@ -179,6 +181,7 @@
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "Errors",
"vue.rearranger.settings.migration": "true"
}
}]]>
@@ -212,4 +215,22 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 355bb0e..18fe331 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,6 @@
"symfony/http-client": "7.1.*",
"symfony/intl": "7.1.*",
"symfony/mailer": "7.1.*",
- "symfony/mercure-bundle": "^0.3.9",
"symfony/mime": "7.1.*",
"symfony/monolog-bundle": "^3.0",
"symfony/notifier": "7.1.*",
diff --git a/composer.lock b/composer.lock
index a1fc98c..2124aa3 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": "f575e2d5a3aada9c285499efdc694f42",
+ "content-hash": "21495c6f5028b1832d53a6ef3be7e9f6",
"packages": [
{
"name": "composer/semver",
@@ -1257,16 +1257,16 @@
},
{
"name": "doctrine/sql-formatter",
- "version": "1.4.1",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/sql-formatter.git",
- "reference": "7f83911cc5eba870de7ebb11283972483f7e2891"
+ "reference": "16ca9e39877369d664f06dacde468548298bdc40"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/7f83911cc5eba870de7ebb11283972483f7e2891",
- "reference": "7f83911cc5eba870de7ebb11283972483f7e2891",
+ "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/16ca9e39877369d664f06dacde468548298bdc40",
+ "reference": "16ca9e39877369d664f06dacde468548298bdc40",
"shasum": ""
},
"require": {
@@ -1274,6 +1274,7 @@
},
"require-dev": {
"doctrine/coding-standard": "^12",
+ "ergebnis/phpunit-slow-test-detector": "^2.14",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.24"
@@ -1306,9 +1307,9 @@
],
"support": {
"issues": "https://github.com/doctrine/sql-formatter/issues",
- "source": "https://github.com/doctrine/sql-formatter/tree/1.4.1"
+ "source": "https://github.com/doctrine/sql-formatter/tree/1.5.0"
},
- "time": "2024-08-05T20:32:22+00:00"
+ "time": "2024-09-11T07:29:40+00:00"
},
{
"name": "egulias/email-validator",
@@ -1377,79 +1378,6 @@
],
"time": "2023-10-06T06:47:41+00:00"
},
- {
- "name": "lcobucci/jwt",
- "version": "5.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/lcobucci/jwt.git",
- "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/lcobucci/jwt/zipball/08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
- "reference": "08071d8d2c7f4b00222cc4b1fb6aa46990a80f83",
- "shasum": ""
- },
- "require": {
- "ext-openssl": "*",
- "ext-sodium": "*",
- "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
- "psr/clock": "^1.0"
- },
- "require-dev": {
- "infection/infection": "^0.27.0",
- "lcobucci/clock": "^3.0",
- "lcobucci/coding-standard": "^11.0",
- "phpbench/phpbench": "^1.2.9",
- "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": "^10.2.6"
- },
- "suggest": {
- "lcobucci/clock": ">= 3.0"
- },
- "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.3.0"
- },
- "funding": [
- {
- "url": "https://github.com/lcobucci",
- "type": "github"
- },
- {
- "url": "https://www.patreon.com/lcobucci",
- "type": "patreon"
- }
- ],
- "time": "2024-04-11T23:07:54+00:00"
- },
{
"name": "monolog/monolog",
"version": "3.7.0",
@@ -4306,173 +4234,6 @@
],
"time": "2024-09-08T12:32:26+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": {
- "branch-alias": {
- "dev-main": "0.6.x-dev"
- },
- "thanks": {
- "name": "dunglas/mercure",
- "url": "https://github.com/dunglas/mercure"
- }
- },
- "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.1.5",
@@ -7926,16 +7687,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.2.0",
+ "version": "v5.3.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb"
+ "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
- "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+ "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
"shasum": ""
},
"require": {
@@ -7978,9 +7739,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
},
- "time": "2024-09-15T16:40:33+00:00"
+ "time": "2024-09-29T13:56:26+00:00"
},
{
"name": "phar-io/manifest",
diff --git a/config/bundles.php b/config/bundles.php
index e7f9c79..4e3a560 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -13,5 +13,4 @@ return [
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
- Symfony\Bundle\MercureBundle\MercureBundle::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 015e252..cf1900f 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -131,18 +131,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.1",
"recipe": {