Upgrade vendors (#419)

Author: mRoca

Makefile

@@ -15,7 +15,7 @@ configure:
 ifeq ($(shell uname -s), Darwin)
 	sed -i '' 's/#\(.*\)# Uncomment for MacOS/\1/g' docker-compose.override.yml
 endif
-	mkdir -p .cache/ssl
+	mkdir -p .cache/ssl .cache/node
 	test -f .cache/ssl/local.crt || (docker run --rm -v $$(pwd):/src alpine:3.9 sh -c "apk add openssl && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /src/.cache/ssl/local.key -out /src/.cache/ssl/local.crt -subj \"/C=FR/ST=Paris/L=Paris/O=Resop/CN=*.resop.docker\" && cat /src/.cache/ssl/local.crt /src/.cache/ssl/local.key > /src/.cache/ssl/local.pem  && chown -R $$(id -u):$$(id -g) /src/.cache")
 
 unconfigure:
@@ -38,8 +38,15 @@ start-db:
 	$(DOCKER_COMPOSE_UP) traefik postgres adminer
 	docker-compose run --rm wait -c postgres:5432
 
-start: init-db
+start-php:
 	$(DOCKER_COMPOSE_UP_RECREATE) traefik nginx fpm
+	docker-compose run --rm wait -c fpm:9000,nginx:80
+	@echo -n "\nStack started with success:\nhttp://resop.vcap.me:7500/login => [email protected] : 01/01/1990"
+	@echo -n "\nhttp://resop.vcap.me:7500/organizations/login => DT75 : covid19\n"
+
+start: init-db start-php
+
+start-preserve-db: start-db start-php
 
 stop:
 	docker-compose stop

bin/tools

@@ -15,6 +15,7 @@ if echo ${DOCKER_HOST} | grep unix:///run/user/ > /dev/null 2>&1; then
     # Docker rootless
     ${DOCKER_COMPOSE} run --rm tools "$@"
 elif [ -t 1 -a 1 -ne "${DISABLE_TTY}" ]; then
+    # Common run
     ${DOCKER_COMPOSE} run --rm -u $(id -u):$(id -g) tools "$@"
 else
     # CI and other runners

bin/update-db.sh

@@ -3,5 +3,5 @@ set -ex
 
 bin/console doctrine:mapping:info || true
 
-bin/console doctrine:migrations:migrate -n || true
+bin/console doctrine:migrations:migrate -n --allow-no-migration || true
 

composer.json

@@ -9,25 +9,28 @@
     "ext-iconv": "*",
     "ext-json": "*",
     "beberlei/assert": "^3.2",
+    "composer/package-versions-deprecated": "^1.11",
     "doctrine/annotations": "^1.8",
+    "doctrine/doctrine-bundle": "^2.1",
     "doctrine/doctrine-fixtures-bundle": "^3.3",
+    "doctrine/doctrine-migrations-bundle": "^3.0",
+    "doctrine/orm": "^2.7",
     "friendsofsymfony/jsrouting-bundle": "^2.5",
     "martin-georgiev/postgresql-for-doctrine": "^1.3",
     "odolbeau/phone-number-bundle": "^3.0",
     "sensio/framework-extra-bundle": "5.*",
     "symfony/console": "5.*",
     "symfony/dotenv": "5.*",
-    "symfony/expression-language": "5.0.*",
+    "symfony/expression-language": "5.*",
     "symfony/flex": "1.*",
     "symfony/form": "5.*",
     "symfony/framework-bundle": "5.*",
     "symfony/intl": "5.*",
     "symfony/monolog-bundle": "^3.5",
-    "symfony/orm-pack": "^1.0",
-    "symfony/security-bundle": "5.0.*",
+    "symfony/security-bundle": "5.*",
     "symfony/serializer-pack": "^1.0",
-    "symfony/string": "5.0.*",
-    "symfony/translation": "5.0.*",
+    "symfony/string": "5.*",
+    "symfony/translation": "5.*",
     "symfony/twig-pack": "^1.0",
     "symfony/validator": "5.*",
     "symfony/webpack-encore-bundle": "^1.7",
@@ -44,12 +47,12 @@
     "friends-of-behat/mink-extension": "^2.4",
     "friends-of-behat/symfony-extension": "^2.1",
     "friendsofphp/php-cs-fixer": "^2.16",
-    "guikingone/panther-extension": "^0.4.0",
+    "guikingone/panther-extension": "^0.4.1",
     "hautelook/alice-bundle": "^2.7",
     "mheap/phpunit-github-actions-printer": "^1.2",
     "phpstan/phpstan-doctrine": "^0.12.8",
     "phpstan/phpstan-symfony": "^0.12.2",
-    "phpunit/phpunit": "^8.5",
+    "phpunit/phpunit": "^9.4",
     "roave/security-advisories": "dev-master",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/debug-pack": "^1.0",
@@ -100,7 +103,7 @@
   "extra": {
     "symfony": {
       "allow-contrib": true,
-      "require": "5.0.*"
+      "require": "5.1.*"
     }
   }
 }