Move PATH export to where we actually use composer

.travis.yml

@@ -5,7 +5,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
-  - 5.3.3 #php7
+  - 5.3.3 #This will actually use PHP7
   - hhvm
   - hhvm-nightly
 
@@ -21,7 +21,7 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
-  -  ./travis/before_install.sh
+  - ./travis/before_install.sh
 
 install:
   - travis_retry ./travis/install.sh

travis/before_install.sh

@@ -16,5 +16,4 @@ if [[ "$TRAVIS_PHP_VERSION" == "5.3.3" ]]; then
   mkdir $PWD/phar
   mv composer.phar $PWD/phar/composer
   chmod +x $PWD/phar/composer
-  export PATH=$PWD/phar:$PATH
 fi

travis/before_script.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-if [[ "$TRAVIS_PHP_VERSION" != "hhvm" && "$TRAVIS_PHP_VERSION" != "hhvm-nightly" ]]; then
+if [[ "$TRAVIS_PHP_VERSION" != "hhvm" \
+  && "$TRAVIS_PHP_VERSION" != "hhvm-nightly" \
+  && "$TRAVIS_PHP_VERSION" != "5.3.3" ]]; then
   phpenv config-add ./travis/extra.ini
 fi
 phpenv rehash

travis/install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+export PATH=$PWD/phar:$PATH
 if [[ "$TRAVIS_PHP_VERSION" == "5.3.3" ]]; then
     echo PATH is $PATH
 fi