Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

Commit 3fa09a7

Browse files
author
Jens Schulze
committed
Merge branch 'hotfix/apigen'
2 parents 0152cf0 + be6193c commit 3fa09a7

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

build.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@
196196
</target>
197197

198198
<target name="install-apigen">
199-
<exec executable="${basedir}/apigen.sh" dir="${basedir}" />
199+
<exec executable="${basedir}/install-apigen.sh" dir="${basedir}" />
200200
</target>
201201
<target name="apigen"
202-
depends="prepare"
202+
depends="prepare, install-apigen"
203203
description="Generate project documentation using phpDocumentor">
204204
<exec executable="php" dir="${basedir}/build/" failonerror="true">
205-
<arg value="${basedir}/vendor/bin/apigen"/>
205+
<arg value="${basedir}/apigen.phar"/>
206206
<arg value="generate"/>
207207
<arg value="--source"/>
208208
<arg path="${basedir}/src"/>

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"doctrine/cache": "~1.4",
3333
"monolog/monolog": "~1.12",
3434
"behat/behat": "~3.0",
35-
"apigen/apigen": "~4.1",
3635
"phpunit/phpcov": "*"
3736
},
3837
"suggest": {

install-apigen.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
if [ ! -e apigen.phar ]
4+
then
5+
wget http://apigen.org/apigen.phar
6+
fi

push-docs-to-gh-pages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
# to be called as "after_success: - ./push-docs-to-gh-pages.sh" in .travis.yml
1010

11-
if [ $(phpenv version-name) = "5.4" ] ; then ant apigen; fi
11+
if [ $(phpenv version-name) = "5.5" ] ; then ant apigen; fi
1212

13-
if [ "$TRAVIS_REPO_SLUG" == "sphereio/sphere-php-sdk" ] && [ $(phpenv version-name) = "5.4" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ( [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == `git describe --tags --always HEAD` ] ); then
13+
if [ "$TRAVIS_REPO_SLUG" == "sphereio/sphere-php-sdk" ] && [ $(phpenv version-name) = "5.5" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ( [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == `git describe --tags --always HEAD` ] ); then
1414
echo -e "Publishing documentation to gh-pages branch ...\n"
1515

1616
cp -R build/docs $HOME/phpdoc-current

0 commit comments

Comments
 (0)