summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatt <matt@twilio.com>2016-08-15 10:52:00 -0700
committermatt <matt@twilio.com>2016-08-15 10:52:00 -0700
commitfe843e67ff14e9d369b69689fbc76da751c086ae (patch)
tree5e4469a30a875385f8c7a7763883e8531bd52198
parent7c927fc6bd3628db922fc7d35e7b12210d288cb2 (diff)
downloadtwilio-php-origin/next-gen-docs.zip
twilio-php-origin/next-gen-docs.tar.gz
twilio-php-origin/next-gen-docs.tar.bz2
Cleaning up the next-gen-docs stufforigin/next-gen-docs
-rw-r--r--.gitignore1
-rw-r--r--Makefile2
-rw-r--r--composer.json3
3 files changed, 4 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index f84d298..cdcf438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
vendor/*
composer.phar
+composer.lock
coverage
package.xml
*.tgz
diff --git a/Makefile b/Makefile
index 24046c0..9756f20 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ docs-install:
composer require --dev apigen/apigen
docs: docs-install
- apigen generate -s ./ -d docs/api --exclude="Tests/*" --exclude="vendor/*" --exclude="autoload.php" --template-theme bootstrap --main Twilio
+ vendor/bin/apigen generate -s ./ -d docs/api --exclude="Tests/*" --exclude="vendor/*" --exclude="autoload.php" --template-theme bootstrap --main Twilio
sh docs-update.sh
release-install:
diff --git a/composer.json b/composer.json
index d5767b3..8d28546 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,8 @@
"php": ">=5.3.0"
},
"require-dev": {
- "phpunit/phpunit": "4.5.*"
+ "phpunit/phpunit": "4.5.*",
+ "apigen/apigen": "^4.1"
},
"autoload": {
"psr-4": {