diff --git a/composer.json b/composer.json index 642aa34..320da9e 100644 --- a/composer.json +++ b/composer.json @@ -72,6 +72,7 @@ }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "^3.4", + "symfony/debug-bundle": "5.2.*", "symfony/maker-bundle": "^1.30" } } diff --git a/composer.lock b/composer.lock index 271a45b..182cbd9 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": "9c5b89758d62c8a13bd265b1ef64e2bc", + "content-hash": "76574cee43242167355502c759b6260c", "packages": [ { "name": "composer/package-versions-deprecated", @@ -6508,6 +6508,84 @@ }, "time": "2020-12-20T10:01:03+00:00" }, + { + "name": "symfony/debug-bundle", + "version": "v5.2.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug-bundle.git", + "reference": "ec21bd26d24dab02ac40e4bec362b3f4032486e8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/ec21bd26d24dab02ac40e4bec362b3f4032486e8", + "reference": "ec21bd26d24dab02ac40e4bec362b3f4032486e8", + "shasum": "" + }, + "require": { + "ext-xml": "*", + "php": ">=7.2.5", + "symfony/http-kernel": "^4.4|^5.0", + "symfony/twig-bridge": "^4.4|^5.0", + "symfony/var-dumper": "^4.4|^5.0" + }, + "conflict": { + "symfony/config": "<4.4", + "symfony/dependency-injection": "<5.2" + }, + "require-dev": { + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/web-profiler-bundle": "^4.4|^5.0" + }, + "suggest": { + "symfony/config": "For service container configuration", + "symfony/dependency-injection": "For using as a service from the container" + }, + "type": "symfony-bundle", + "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": "Provides a tight integration of the Symfony Debug component into the Symfony full-stack framework", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug-bundle/tree/v5.2.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-01-10T16:30:10+00:00" + }, { "name": "symfony/maker-bundle", "version": "v1.30.2", @@ -6608,5 +6686,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } diff --git a/config/bundles.php b/config/bundles.php index 401e4c5..cb914a8 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -12,4 +12,5 @@ return [ Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true], + Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], ]; diff --git a/config/packages/dev/debug.yaml b/config/packages/dev/debug.yaml new file mode 100644 index 0000000..26d4e53 --- /dev/null +++ b/config/packages/dev/debug.yaml @@ -0,0 +1,4 @@ +debug: + # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser. + # See the "server:dump" command to start a new server. + dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%" diff --git a/config/packages/nelmio_cors.yaml b/config/packages/nelmio_cors.yaml index cc6b9e1..a3b27b5 100644 --- a/config/packages/nelmio_cors.yaml +++ b/config/packages/nelmio_cors.yaml @@ -1,24 +1,10 @@ nelmio_cors: - defaults: - allow_credentials: false - allow_origin: [] - allow_headers: [] - allow_methods: [] - expose_headers: [] - max_age: 0 - hosts: [] - origin_regex: false - forced_allow_origin_value: ~ - paths: - '^/api/': - allow_origin: ['*'] - allow_headers: ['*'] - allow_methods: ['POST', 'PUT', 'GET', 'DELETE', 'OPTIONS'] - max_age: 3600 - '^/': - origin_regex: true - allow_origin: ['^http://localhost:[0-9]+'] - allow_headers: ['*'] - allow_methods: ['POST', 'PUT', 'GET', 'DELETE', 'OPTIONS'] - max_age: 3600 - hosts: ['^api\.'] + defaults: + origin_regex: true + allow_origin: [ '*' ] + allow_methods: [ 'GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE' ] + allow_headers: [ 'Accept','Authorization','Cache-Control','Content-Type','DNT','If-Modified-Since','Keep-Alive','Origin','User-Agent','X-Requested-With' ] + expose_headers: [ 'Authorization' ] + max_age: 3600 + paths: + '^/': ~ diff --git a/symfony.lock b/symfony.lock index be784fa..7a584ec 100644 --- a/symfony.lock +++ b/symfony.lock @@ -216,6 +216,18 @@ "bin/console" ] }, + "symfony/debug-bundle": { + "version": "4.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "4.1", + "ref": "f8863cbad2f2e58c4b65fa1eac892ab189971bea" + }, + "files": [ + "config/packages/dev/debug.yaml" + ] + }, "symfony/dependency-injection": { "version": "v5.2.6" }, diff --git a/update.sh b/update.sh index c1e9fb1..233f5af 100755 --- a/update.sh +++ b/update.sh @@ -25,7 +25,7 @@ cecho g " time to update the framadate setup" cecho g "######################" COMMAND_BUILD="build:prod:demobliss" -# git reset --hard +git reset --hard git pull origin master composer install @@ -85,7 +85,9 @@ fi git config --global diff.submodule log git submodule update -git submodule foreach git reset --hard && git checkout master && git pull +cd funky-framadate-front +git reset --hard && git checkout master && git pull +cd .. cecho g "######################" cecho g " check dependencies of the frontend with yarn "