From 4b46854f255fb5556893163850445a42ce475749 Mon Sep 17 00:00:00 2001 From: Sam Harrison Date: Wed, 2 Oct 2019 16:52:28 -0500 Subject: [PATCH] Do not update new dependencies or versioning during testing and doc generation --- Makefile | 12 +++--------- composer.json | 7 +------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index d788d52c0e..da75e987bd 100644 --- a/Makefile +++ b/Makefile @@ -10,24 +10,18 @@ PHPVERSION = $(shell php -r 'echo PHP_VERSION;') all: test clean: - @rm -rf venv vendor composer.lock + @rm -rf docs venv vendor composer.lock install: clean @composer --version || (curl -s https://getcomposer.org/installer | php); - $(COMPOSER) config platform.php $(PHPVERSION) $(COMPOSER) install vendor: install -# if these fail, you may need to install the helper library test: install - $(COMPOSER) require --dev phpunit/phpunit @PATH=vendor/bin:$(PATH) phpunit --strict-coverage --disallow-test-output --colors --configuration tests/phpunit.xml -docs-install: - composer require --dev apigen/apigen - -docs: docs-install +docs: vendor/bin/apigen generate --source src -d docs/api --exclude="autoload.php" --template-theme bootstrap --main Twilio authors: @@ -59,4 +53,4 @@ docker-dev-clean: docker-dev-test: docker exec -t twilio_php${VERSION} /bin/bash -c 'make all' -.PHONY: all clean test docs docs-install test-install authors docker-dev-build docker-dev-clean docker-dev-test +.PHONY: all clean install test docs authors docker-dev-build docker-dev-clean docker-dev-test diff --git a/composer.json b/composer.json index 61bdb43569..a144a25dd1 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require-dev": { "guzzlehttp/guzzle": "^6.3", "apigen/apigen": "^4.1", - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": ">=4.5" }, "suggest": { "guzzlehttp/guzzle": "An HTTP client to execute the API requests" @@ -31,10 +31,5 @@ "psr-4": { "Twilio\\Tests\\": "tests/Twilio/" } - }, - "config": { - "platform": { - "php": "7.1.23" - } } }