Merge pull request #724 from wirDesign-communication-AG/v3.0.12

v3.0.12
wirDesign-communication-AG · Sep 26, 2023 · 2db38a2 · 2db38a2
2 parents 2747e5f + 744ad1f
commit 2db38a2
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 110 deletions.
diff --git a/.env.test b/.env.test
@@ -4,7 +4,6 @@ APP_LOCALE=de
 APP_CACHE_DIR=/home/runner/var/cache
 PANTHER_APP_ENV=test
 PANTHER_CHROME_ARGUMENTS="--ignore-certificate-errors --disable-dev-shm-usage --log-level=DEBUG --log-path=$(pwd)/build/debug"
-PANTHER_CHROME_DRIVER_BINARY=$(pwd)/vendor/wirdesign-communications-ag/wirhub/Tests/Helper/bin/chromedriver_111
 PANTHER_EXTERNAL_BASE_URI=http://localhost:8000
 PANTHER_NO_SANDBOX=1
 PANTHER_WEB_SERVER_DIR=./public

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,17 +18,6 @@ jobs:
                     extensions: imagick, sqlite3
                     ini-values: error_log=/home/runner/.symfony5/log/php.log
 
-            -   name: Log some versions
-                run: |
-                    echo ""
-                    echo "---------------------------"
-                    google-chrome --version
-                    echo "---------------------------"
-                    php --version
-                    echo "---------------------------"
-                    composer --version
-                    echo "---------------------------"
-
             -   name: Install Symfony Server
                 run: wget https://get.symfony.com/cli/installer -O - | bash
 

diff --git a/Makefile b/Makefile
@@ -24,12 +24,53 @@ ifeq ($(shell id -u), 0)
 endif
 
 test:
+	@echo "--------------------------------------"
+	@echo "------------ Log versions ------------"
+	@echo "--------------------------------------"
+	@google-chrome --version
+	@echo "---"
+	@chromedriver --version
+	@echo "---"
+	@php --version
+	@echo "---"
+	@composer --version
+	@echo "---"
+	@echo ""
+	@echo ""
+	@echo "--------------------------------------"
+	@echo "---------- Lint validation -----------"
+	@echo "--------------------------------------"
 	APP_ENV=test php bin/console lint:twig templates/ vendor/wirdesign-communication-ag/wirhub/
 	APP_ENV=test php bin/console lint:yaml config/ vendor/wirdesign-communication-ag/wirhub/Resources/config/
 	APP_ENV=test php bin/console lint:container
+	@echo ""
+	@echo ""
+	@echo "--------------------------------------"
+	@echo "-------------- PHPStan ---------------"
+	@echo "--------------------------------------"
 	vendor/bin/phpstan analyse -c phpstan.neon
+	@echo ""
+	@echo ""
+	@echo "--------------------------------------"
+	@echo "--------- Custom validation ----------"
+	@echo "--------------------------------------"
 	APP_ENV=test php bin/console app:test
+	@echo ""
+	@echo ""
+	@echo "--------------------------------------"
+	@echo "--------- Prepare database -----------"
+	@echo "--------------------------------------"
 	APP_ENV=test php bin/console doctrine:database:create
 	APP_ENV=test php bin/console doctrine:schema:update --force --complete
+	@echo ""
+	@echo ""
+	@echo "--------------------------------------"
+	@echo "----------- Create theme -------------"
+	@echo "--------------------------------------"
 	APP_ENV=test php bin/console app:theme:refresh
-	php bin/phpunit
+	@echo ""
+	@echo ""
+	@echo "--------------------------------------"
+	@echo "------------- PHPUnit ----------------"
+	@echo "--------------------------------------"
+	php bin/phpunit $(TARGET)
diff --git a/composer.json b/composer.json
@@ -74,7 +74,7 @@
         "symfony/framework-bundle": "6.3.*",
         "symfony/runtime": "6.3.*",
         "symfony/yaml": "6.3.*",
-        "wirdesign-communication-ag/wirhub": "^v3.0.11"
+        "wirdesign-communication-ag/wirhub": "^3.0.12"
     },
     "scripts": {
         "auto-scripts": {