Fixes

.docker/docker-compose/docker-compose.local.yml

@@ -132,7 +132,7 @@ services:
       - MYSQL_DATABASE=${MYSQL_DATABASE:-application_db}
       - MYSQL_USER=${MYSQL_USER:-application_user}
       - MYSQL_PASSWORD=${MYSQL_PASSWORD?}
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD?}
+      - MYSQL_ALLOW_EMPTY_PASSWORD=true
       - TZ=${TIMEZONE:-UTC}
     volumes:
       - mysql:/var/lib/mysql

.docker/images/nginx/conf.d/default.conf

@@ -57,12 +57,6 @@ server {
                 rewrite ^(.*) /index.php last;
         }
 
-        location /w2p/ {
-             proxy_pass http://tp:8080/w2p/;
-             proxy_temp_path /tmp/proxy;
-        }
-
-
         location /apps/ { # Static files
                 client_max_body_size 1024M;
                 root $frontRoot;

.gitea/workflows/run_tests.yaml

@@ -23,6 +23,16 @@ jobs:
       - name: Run Server
         run: |
           make docker-compose-up
+      - name: Load Data
+        run: |
+          docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump
+          docker exec -i psc_local-mysql-1 /usr/bin/mysql --host localhost psc < ./dev_db/mysql.sql
+      - name: Run Tests
+        run: |
+          make test
+      - name: Clean Up
+        run: |
+          make clean
       - run: echo "🍏 This job's status is ${{ job.status }}."
   Run-Tests-On-Arm64:
     runs-on: arm64
@@ -44,4 +54,14 @@ jobs:
       - name: Run Server
         run: |
           make docker-compose-up
+      - name: Load Data
+        run: |
+          docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump
+          docker exec -i psc_local-mysql-1 /usr/bin/mysql --host localhost psc < ./dev_db/mysql.sql
+      - name: Run Tests
+        run: |
+          make test
+      - name: Clean Up
+        run: |
+          make clean
       - run: echo "🍏 This job's status is ${{ job.status }}."

.make/04-docker.mk

@@ -89,7 +89,7 @@ docker-compose-init: ## Initialize the .env file for docker compose
 
 .PHONY: docker-compose-clean
 docker-compose-clean: ## Remove the .env file for docker compose
-	@rm -f $(DOCKER_ENV_FILE)
+	@rm -f -v $(DOCKER_ENV_FILE)
 
 .PHONY: validate-docker-compose-variables
 validate-docker-compose-variables: validate-docker-variables
@@ -99,23 +99,42 @@ validate-docker-compose-variables: validate-docker-variables
 
 .PHONY: docker-compose-build-image
 docker-compose-build-image: validate-docker-compose-variables ## Build all docker images OR a specific image by providing the service name via: make docker-compose-build DOCKER_SERVICE_NAME=<service>
+	$(DOCKER_COMPOSE) build $(DOCKER_SERVICE_NAME) $(ARGS)
+
+.PHONY: docker-compose-build-image-no-cache
+docker-compose-build-image-no-cache: validate-docker-compose-variables ## Build all docker images OR a specific image by providing the service name via: make docker-compose-build DOCKER_SERVICE_NAME=<service>
 	$(DOCKER_COMPOSE) build --no-cache $(DOCKER_SERVICE_NAME) $(ARGS)
 
+
 .PHONY: docker-compose-build-image-config
 docker-compose-build-image-config: validate-docker-compose-variables ## generate config via ARGS=-ophpstorm.yml
 	$(DOCKER_COMPOSE) config $(ARGS)
 
 .PHONY: docker-compose-build-php
 docker-compose-build-php: validate-docker-compose-variables ## Build the php base image
+	$(DOCKER_COMPOSE_PHP_BASE) build $(DOCKER_SERVICE_NAME_PHP_BASE) $(ARGS)
+
+.PHONY: docker-compose-build-php-no-cache
+docker-compose-build-php-no-cache: validate-docker-compose-variables ## Build the php base image
 	$(DOCKER_COMPOSE_PHP_BASE) build --no-cache $(DOCKER_SERVICE_NAME_PHP_BASE) $(ARGS)
 
+
 .PHONY: docker-compose-build-web
 docker-compose-build-web: validate-docker-compose-variables ## Build the php base image
+	$(DOCKER_COMPOSE) build web $(ARGS)
+
+.PHONY: docker-compose-build-web-no-cache
+docker-compose-build-web-no-cache: validate-docker-compose-variables ## Build the php base image
 	$(DOCKER_COMPOSE) build --no-cache web $(ARGS)
 
+
 .PHONY: docker-compose-build
 docker-compose-build: docker-compose-build-php docker-compose-build-image ## Build the php image and then all other docker images
 
+.PHONY: docker-compose-build-no-cache
+docker-compose-build-no-cache: docker-compose-build-php-no-cache docker-compose-build-image-no-cache ## Build the php image and then all other docker images
+
+
 .PHONY: docker-compose-up
 docker-compose-up: validate-docker-compose-variables ## Create and start all docker containers. To create/start only a specific container, use DOCKER_SERVICE_NAME=<service>
 	$(DOCKER_COMPOSE) up -d $(DOCKER_SERVICE_NAME)

dev_db/dump/READ__ME_TO_RECOVER_YOUR_DATA/README.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"0a2ae68e3ff94378b1aaa39bff508fe1","collectionName":"README","type":"collection"}

dev_db/dump/admin/system.version.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"e595bc0e0a294dc59142e37c41a51b8f","collectionName":"system.version","type":"collection"}

dev_db/dump/psc/Account.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"da257057d5ae4cef9034ec3953d40edc","collectionName":"Account","type":"collection"}

dev_db/dump/psc/Cms.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"3096a24618db4ddda30c05f7df6deb39","collectionName":"Cms","type":"collection"}

dev_db/dump/psc/Contact.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"719a53349ec9439eba3f514394f74e8e","collectionName":"Contact","type":"collection"}

dev_db/dump/psc/ContactAddress.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"a4f27876564640e2a8f777c1f8c1eed3","collectionName":"ContactAddress","type":"collection"}

dev_db/dump/psc/Country.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"e4e9671daee043558c34b478226dba0c","collectionName":"Country","type":"collection"}

dev_db/dump/psc/Gatewaysettings.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"86cf4d54db5446ff9920a3ba1fe7d7f3","collectionName":"Gatewaysettings","type":"collection"}

dev_db/dump/psc/Help.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"28543f41dc5e4831961796dcfc3838e0","collectionName":"Help","type":"collection"}

dev_db/dump/psc/Instance.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"4fcf56b1319441f8a96f84eeadac41de","collectionName":"Instance","type":"collection"}

dev_db/dump/psc/Job.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"ebf99a2ee7b54c039edfd4983285ab32","collectionName":"Job","type":"collection"}

dev_db/dump/psc/JobLog.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"07180637db924be988bbe4df0eb8fb71","collectionName":"JobLog","type":"collection"}

dev_db/dump/psc/LayouterSession.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"84fdd96a4c904891920f2b6bd5e24d3f","collectionName":"LayouterSession","type":"collection"}

dev_db/dump/psc/LogEntry.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"434c6de95f3b4c9aa65d91df4b4cb722","collectionName":"LogEntry","type":"collection"}

dev_db/dump/psc/Media.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"f4beb425993840dca5572346e37fa192","collectionName":"Media","type":"collection"}

dev_db/dump/psc/Media_Folder.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"6ed1f40594de4873bac99524e480697d","collectionName":"Media_Folder","type":"collection"}

dev_db/dump/psc/Migration.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"b88dfc486e014f85807a6b3f9ef58d1c","collectionName":"Migration","type":"collection"}

dev_db/dump/psc/Motiv.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"a734c79a29e042baaf97c7c12178c1a0","collectionName":"Motiv","type":"collection"}

dev_db/dump/psc/Order.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"00045c4cfcf44c2b9863ce930ea254fa","collectionName":"Order","type":"collection"}

dev_db/dump/psc/Paper.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"75f45c2d48b04027be6eb21477849115","collectionName":"Paper","type":"collection"}

dev_db/dump/psc/Payment.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"b44f4576d37f4df18f29784dd111899c","collectionName":"Payment","type":"collection"}

dev_db/dump/psc/Plugin.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"10754e4d63234b75b9c4c74d0c66fef7","collectionName":"Plugin","type":"collection"}

dev_db/dump/psc/Position.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"40424341fc434747be74dc51618fba10","collectionName":"Position","type":"collection"}

dev_db/dump/psc/Product.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"628fd2633d914e06bf6c6c4af1ac905e","collectionName":"Product","type":"collection"}

dev_db/dump/psc/Productgroup.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"c3185a73240343f0ad64305351574fad","collectionName":"Productgroup","type":"collection"}

dev_db/dump/psc/Queue.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"2939a1dbef024e4f9937dc29e0868552","collectionName":"Queue","type":"collection"}

dev_db/dump/psc/Route.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"dd3471a39b0544c3a6ac83a39be53489","collectionName":"Route","type":"collection"}

dev_db/dump/psc/Shipping.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"809a6bbe0ca647b1a855bf160092dab8","collectionName":"Shipping","type":"collection"}

dev_db/dump/psc/Shop.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"8698b0f1f876489bbfff736c70c8311c","collectionName":"Shop","type":"collection"}

dev_db/dump/psc/ShopFormular.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"94ea396ee4ce48f389557f41fc0b591a","collectionName":"ShopFormular","type":"collection"}

dev_db/dump/psc/Status.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"94f7cb52e1fd4cb6b47cd573764cc979","collectionName":"Status","type":"collection"}

dev_db/dump/psc/Tax.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"ab5f5793041b4f8c9bbf801f62379896","collectionName":"Tax","type":"collection"}

dev_db/dump/psc/accountObj_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"d93fec216a614114b4de615685487c9e","collectionName":"accountObj_history","type":"collection"}

dev_db/dump/psc/cmsObj_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"fc7a531053174aafb8ef1da81223a1da","collectionName":"cmsObj_history","type":"collection"}

dev_db/dump/psc/contactObj_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"b27d9860ac0442fe8a45464af7b57abf","collectionName":"contactObj_history","type":"collection"}

dev_db/dump/psc/news_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"2c46eca4585342d4ae706d45b26fd3ce","collectionName":"news_history","type":"collection"}

dev_db/dump/psc/payment_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"8d36006633f54262842b886a0fa34630","collectionName":"payment_history","type":"collection"}

dev_db/dump/psc/producktgroupObj_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"01f8359408784535aab1cc3f35adcf5d","collectionName":"producktgroupObj_history","type":"collection"}

dev_db/dump/psc/productObj_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"8048223d93bb4994935a1054dea436a4","collectionName":"productObj_history","type":"collection"}

dev_db/dump/psc/shipping_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"d36cd7214b484da9915b15ff56cc5cb5","collectionName":"shipping_history","type":"collection"}

dev_db/dump/psc/shopObj_history.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"357c67d9a27442e1bc2ef076588589cf","collectionName":"shopObj_history","type":"collection"}

dev_db/dump/psc_test/Contact.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"0f620ee835034bafb23dcfee904948cd","collectionName":"Contact","type":"collection"}

dev_db/dump/psc_test/Country.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"48d80569f0864f30a5e9e7d1ae997d07","collectionName":"Country","type":"collection"}

dev_db/dump/psc_test/Instance.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"87e79f863132414cbd38440a44deffa8","collectionName":"Instance","type":"collection"}

dev_db/dump/psc_test/Job.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"4940436d31824b8da217a21d20b63f6c","collectionName":"Job","type":"collection"}

dev_db/dump/psc_test/Order.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"2e65b276146b4d4fb23d14c539b0ab95","collectionName":"Order","type":"collection"}

dev_db/dump/psc_test/Plugin.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"92d55e90e26e4666b31eea6d0c47cd47","collectionName":"Plugin","type":"collection"}

dev_db/dump/psc_test/Position.metadata.json

@@ -1 +0,0 @@
-{"indexes":[{"v":{"$numberInt":"2"},"key":{"_id":{"$numberInt":"1"}},"name":"_id_"}],"uuid":"f3f8f7222f644238813897749bdb2cce","collectionName":"Position","type":"collection"}