Fixed composer.json constraint + added 'composer validate' to the bui…

…ld pipeline.
halaxa · Nov 28, 2023 · 05744e1 · 05744e1
1 parent 27780c5
commit 05744e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ help:
 	@grep -E '^[-a-zA-Z0-9_\.\/]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[32m%-15s\033[0m\t%s\n", $$1, $$2}'
 
 
-build: tests-all cs-check phpstan ## Run all necessary stuff before commit.
+build: composer-validate cs-check phpstan tests-all ## Run all necessary stuff before commit.
 
 
 tests: ## Run tests on recent PHP version. Pass args to phpunit via ARGS=""
@@ -67,6 +67,10 @@ performance-tests: ## Run performance tests
 	@$(call DOCKER_RUN,$(LATEST_PHP),composer performance-tests)
 
 
+composer-validate: ## Validate composer.json contents
+	@$(call DOCKER_RUN,$(LATEST_PHP),composer validate)
+
+
 release: .env build
 	@\
 	branch=$$(git branch --show-current); \

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0-8.3"
+        "php": "7.0 - 8.3"
     },
     "require-dev": {
         "ext-json": "*",