Resolve merge with master

.gitlab-ci.yml

@@ -10,7 +10,7 @@ cache:
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ee/ci/services/README.html for examples.
 services:
-    - name: postgis/postgis:14-3.3-alpine
+    - name: postgis/postgis:17-3.5-alpine
       alias: db
       command:
           - postgres
@@ -27,7 +27,7 @@ variables:
     POSTGRES_USER: postgres
     POSTGRES_PASSWORD: postgres
     # configure database access
-    DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=14&charset=utf8
+    DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?serverVersion=17&charset=utf8
     # fetch the chill-app using git submodules
     # GIT_SUBMODULE_STRATEGY: recursive
     REDIS_HOST: redis
@@ -57,7 +57,6 @@ build:
     artifacts:
         expire_in: 1 day
         paths:
-            - bin
             - vendor/
 
 code_style:
@@ -71,36 +70,38 @@ code_style:
     artifacts:
         expire_in: 1 day
         paths:
-            - bin
             - vendor/
 
 phpstan_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    variables:
+        COMPOSER_MEMORY_LIMIT: 3G
+    before_script:
+        - bin/console cache:clear --env=dev
     script:
-        - bin/phpstan analyze --memory-limit=2G
+        - composer exec phpstan -- analyze --memory-limit=3G
     cache:
         paths:
             - .cache/
     artifacts:
         expire_in: 1 day
         paths:
-            - bin
             - vendor/
 
 rector_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    before_script:
+        - bin/console cache:clear --env=dev
     script:
-        - tests/console cache:clear
-        - bin/rector process --dry-run
+        - composer exec rector -- process --dry-run
     cache:
         paths:
             - .cache/
     artifacts:
         expire_in: 1 day
         paths:
-            - bin
             - vendor/
 
 lint:
@@ -132,16 +133,19 @@ lint:
 unit_tests:
     stage: Tests
     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82
+    variables:
+        COMPOSER_MEMORY_LIMIT: 3G
+    before_script:
+        - php bin/console doctrine:database:create -n --env=test
+        - php bin/console doctrine:migrations:migrate -n --env=test
+        - php bin/console chill:db:sync-views --env=test
+        - php bin/console cache:clear --env=test
+        - php bin/console doctrine:fixtures:load -n --env=test
     script:
-        - php tests/console doctrine:migrations:migrate -n --env=test
-        - php tests/console chill:db:sync-views --env=test
-        - php -d memory_limit=2G tests/console cache:clear --env=test
-        - php -d memory_limit=3G tests/console doctrine:fixtures:load -n --env=test
-        - php -d memory_limit=4G bin/phpunit --colors=never --exclude-group dbIntensive
+        - composer exec phpunit -- --colors=never --exclude-group dbIntensive,openstack-integration
     artifacts:
         expire_in: 1 day
         paths:
-            - bin
             - vendor/
 
 release: