Skip to content

Do not update new dependencies or versioning during testing and doc generation #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 2, 2019
Merged

Do not update new dependencies or versioning during testing and doc generation #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
7 changes: 1 addition & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -31,10 +31,5 @@
"psr-4": {
"Twilio\\Tests\\": "tests/Twilio/"
}
},
"config": {
"platform": {
"php": "7.1.23"
}
}
}