Merge pull request #169 from silinternational/develop

Release 5.4.1 -- dependency updates

.github/workflows/test-and-publish.yml

@@ -11,9 +11,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Check PSR2
-        run: docker-compose -f actions-services.yml run --rm app ./check-psr2.sh
+        run: docker compose -f actions-services.yml run --rm app ./check-psr2.sh
       - name: Run unit tests
-        run: docker-compose -f actions-services.yml run --rm app ./run-tests.sh
+        run: docker compose -f actions-services.yml run --rm app ./run-tests.sh
 
   build-and-publish:
     name: Build and Publish

Makefile

@@ -1,60 +1,60 @@
 sync_full: broker deps
-	docker-compose run --rm app
+	docker compose run --rm app
 
 sync_incremental: broker deps
-	docker-compose run --rm app bash -c "/data/yii batch/incremental"
+	docker compose run --rm app bash -c "/data/yii batch/incremental"
 
 bash:
-	docker-compose run --rm cli bash
+	docker compose run --rm cli bash
 
 behat:
-	docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure"
+	docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure"
 
 behatlocal:
-	docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure --tags '~@integration'"
+	docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --strict --stop-on-failure --tags '~@integration'"
 
 behatlocalappend:
-	docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --tags '~@integration' --append-snippets"
+	docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --tags '~@integration' --append-snippets"
 
 behatv:
-	docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat -v --config=features/behat.yml --strict --stop-on-failure"
+	docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat -v --config=features/behat.yml --strict --stop-on-failure"
 
 behatappend:
-	docker-compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --append-snippets"
+	docker compose run --rm cli bash -c "whenavail brokerdb 3306 20 vendor/bin/behat --config=features/behat.yml --append-snippets"
 
 broker:
-	docker-compose up -d brokerdb brokercron broker
+	docker compose up -d brokerdb brokercron broker
 	make wait_for_broker
 
 clean:
-	docker-compose kill
-	docker-compose rm -f
+	docker compose kill
+	docker compose rm -f
 
 deps:
-	docker-compose run --rm cli composer install --no-scripts
+	docker compose run --rm cli composer install --no-scripts
 
 composershow:
-	docker-compose run --rm cli bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'
+	docker compose run --rm cli bash -c 'composer show --format=json --no-dev --no-ansi --locked | jq "[.locked[] | { \"name\": .name, \"version\": .version }]" > dependencies.json'
 
 depsupdate:
-	docker-compose run --rm cli bash -c "composer update --no-scripts"
+	docker compose run --rm cli bash -c "composer update --no-scripts"
 	make composershow
 
 phpmyadmin:
-	docker-compose up -d phpmyadmin
+	docker compose up -d phpmyadmin
 
 psr2:
-	docker-compose run --rm cli bash -c "vendor/bin/php-cs-fixer fix ."
+	docker compose run --rm cli bash -c "vendor/bin/php-cs-fixer fix ."
 
 # NOTE: When running tests locally, make sure you don't exclude the integration
 #       tests (which we do when testing on Codeship).
 test: deps unittest broker behat
 
 testci: deps broker
-	docker-compose run --rm cli bash -c "./run-tests.sh"
+	docker compose run --rm cli bash -c "./run-tests.sh"
 
 unittest:
-	docker-compose run --rm cli vendor/bin/phpunit
+	docker compose run --rm cli vendor/bin/phpunit
 
 wait_for_broker:
-	docker-compose run --rm cli whenavail broker 80 20 echo "Broker is ready"
+	docker compose run --rm cli whenavail broker 80 20 echo "Broker is ready"

README.md

@@ -39,7 +39,7 @@ run `make testci` first, then use one of the following to run just a specific te
 
 OR
 
-- `docker-compose run --rm cli bash -c "vendor/bin/behat --config=features/behat.yml --suite=notification_features"`
+- `docker compose run --rm cli bash -c "vendor/bin/behat --config=features/behat.yml --suite=notification_features"`
 
 Substitute `notification_features` with any of the suites defined in `behat.yml`
 

actions-services.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
     app:
         build: .