Merge branch 'hotfix/apigen'

Author: Jens Schulze

build.xml

@@ -196,13 +196,13 @@
     </target>
 
     <target name="install-apigen">
-        <exec executable="${basedir}/apigen.sh" dir="${basedir}" />
+        <exec executable="${basedir}/install-apigen.sh" dir="${basedir}" />
     </target>
     <target name="apigen"
-            depends="prepare"
+            depends="prepare, install-apigen"
             description="Generate project documentation using phpDocumentor">
         <exec executable="php" dir="${basedir}/build/" failonerror="true">
-            <arg value="${basedir}/vendor/bin/apigen"/>
+            <arg value="${basedir}/apigen.phar"/>
             <arg value="generate"/>
             <arg value="--source"/>
             <arg path="${basedir}/src"/>

composer.json

@@ -32,7 +32,6 @@
         "doctrine/cache": "~1.4",
         "monolog/monolog": "~1.12",
         "behat/behat": "~3.0",
-        "apigen/apigen": "~4.1",
         "phpunit/phpcov": "*"
     },
     "suggest": {

install-apigen.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ ! -e apigen.phar ]
+ then
+    wget http://apigen.org/apigen.phar
+fi

push-docs-to-gh-pages.sh

@@ -8,9 +8,9 @@
 
 # to be called as "after_success: - ./push-docs-to-gh-pages.sh" in .travis.yml
 
-if [ $(phpenv version-name) = "5.4" ] ; then ant apigen; fi
+if [ $(phpenv version-name) = "5.5" ] ; then ant apigen; fi
 
-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
+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
   echo -e "Publishing documentation to gh-pages branch ...\n"
 
   cp -R build/docs $HOME/phpdoc-current