diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa1eff8b1..8fcf7e192 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ # Select what we should cache between builds cache: paths: - - tests/app/vendor/ + - /vendor/ - .cache # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service @@ -23,12 +23,10 @@ variables: # configure database access DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8 # fetch the chill-app using git submodules - GIT_SUBMODULE_STRATEGY: recursive + # GIT_SUBMODULE_STRATEGY: recursive REDIS_HOST: redis REDIS_PORT: 6379 REDIS_URL: redis://redis:6379 - # change vendor dir to make the app install into tests/apps - COMPOSER_VENDOR_DIR: tests/app/vendor DEFAULT_CARRIER_CODE: BE stages: @@ -50,7 +48,7 @@ build: expire_in: 30 min paths: - bin - - tests/app/vendor/ + - vendor/ code_style: stage: Tests @@ -64,7 +62,7 @@ code_style: expire_in: 30 min paths: - bin - - tests/app/vendor/ + - vendor/ phpstan_tests: stage: Tests @@ -78,7 +76,7 @@ phpstan_tests: expire_in: 30 min paths: - bin - - tests/app/vendor/ + - vendor/ rector_tests: stage: Tests @@ -92,7 +90,7 @@ rector_tests: expire_in: 30 min paths: - bin - - tests/app/vendor/ + - vendor/ # psalm_tests: # stage: Tests @@ -112,16 +110,16 @@ unit_tests: # until we fix testes allow_failure: true script: - - php tests/app/bin/console doctrine:migrations:migrate -n - - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev - - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n - - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test + - php tests/console doctrine:migrations:migrate -n + - php -d memory_limit=2G tests/console cache:clear --env=dev + - php -d memory_limit=3G tests/console doctrine:fixtures:load -n + - php -d memory_limit=2G tests/console cache:clear --env=test - php -d memory_limit=4G bin/phpunit --colors=never artifacts: expire_in: 30 min paths: - bin - - tests/app/vendor/ + - vendor/ release: stage: Deploy diff --git a/composer.json b/composer.json index fc3be677b..e3983cf06 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "social worker" ], "require": { - "php": "^7.4|^8.2", + "php": "^8.2", "ext-json": "*", "ext-openssl": "*", "ext-redis": "*", @@ -98,7 +98,6 @@ "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle", "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle", "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle", - "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle", "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle", "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle", "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle", diff --git a/tests/app/config/routes/dev/web_profiler.yaml b/tests/app/config/routes/dev/web_profiler.yaml deleted file mode 100644 index c82beff2f..000000000 --- a/tests/app/config/routes/dev/web_profiler.yaml +++ /dev/null @@ -1,7 +0,0 @@ -web_profiler_wdt: - resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' - prefix: /_wdt - -web_profiler_profiler: - resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' - prefix: /_profiler