Merge branch 'develop'

* develop:
  Now able to detect index.php nested in another directory.
  Use $CACHE_DIR for composer cache.
  PHP v5.4.5.

bin/compile

@@ -8,7 +8,7 @@ set -o pipefail
 NGINX_VERSION=1.2.2
 LIBMCRYPT_VERSION=2.5.8
 LIBMEMCACHED_VERSION=1.0.7
-PHP_VERSION=5.4.4
+PHP_VERSION=5.4.5
 NEWRELIC_VERSION=2.9.5.78
 S3_BUCKET=heroku-buildpack-php-tyler
 # END CONFIG
@@ -53,11 +53,12 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 BUNDLE_DIR="${CACHE_DIR}/bundles"
 LP_DIR=`cd $(dirname $0); cd ..; pwd`
+export COMPOSER_HOME="${CACHE_DIR}/.composer"
 
 # include .files when moving things around
 shopt -s dotglob
 
-mkdir -p $BUILD_DIR $CACHE_DIR ${BUNDLE_DIR} ${BUILD_DIR}/local ${BUILD_DIR}/vendor/bin
+mkdir -p $BUILD_DIR $CACHE_DIR ${BUNDLE_DIR} ${BUILD_DIR}/local ${BUILD_DIR}/vendor/bin ${COMPOSER_HOME}
 
 echo "-----> Fetching Manifest"
 pushd ${BUNDLE_DIR} > /dev/null
@@ -180,7 +181,7 @@ then
 
 	# do the deed!
 	echo "Running: php composer.phar install" | indent
-	LD_LIBRARY_PATH="${BUILD_DIR}/local/lib" ${BUILD_DIR}/vendor/php/bin/php composer.phar install | indent
+	LD_LIBRARY_PATH="${BUILD_DIR}/local/lib" ${BUILD_DIR}/vendor/php/bin/php composer.phar install -n | indent
 
 	export GIT_DIR=$GIT_DIR_ORIG
 fi

bin/detect

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -f $1/index.php ]; then
+if [ `find "$1" -type f -iname "index.php" 2> /dev/null | wc -l` -ge 1 ]; then
   echo "PHP" && exit 0
 else
   echo "no" && exit 1

support/ec2-build-php.sh

@@ -5,7 +5,7 @@
 ## EDIT
 export S3_BUCKET="heroku-buildpack-php-tyler"
 export LIBMCRYPT_VERSION="2.5.8"
-export PHP_VERSION="5.4.4"
+export PHP_VERSION="5.4.5"
 export APC_VERSION="3.1.10"
 export PHPREDIS_VERSION="2.2.1"
 export LIBMEMCACHED_VERSION="1.0.7"

support/set-env.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export NGINX_VERSION="1.2.2"
-export PHP_VERSION="5.4.4"
+export PHP_VERSION="5.4.5"
 export LIBMCRYPT_VERSION="2.5.8"
 export LIBMEMCACHED_VERSION="1.0.7"
 export NEWRELIC_VERSION="2.9.5.78"

test/compile_test.sh

@@ -92,4 +92,6 @@ EOF
 	assertCaptured "Running: php composer.phar install"
 	assertCaptured "packforlan/packtest"
 	assertTrue "packforlan/packtest package exists" "[ -f ${BUILD_DIR}/vendor/packforlan/packtest/composer.json ]"
+
+	assertTrue "composer cache exists in cache dir" "[ -d ${CACHE_DIR}/.composer/cache ]"
 }

test/detect_test.sh

@@ -13,6 +13,17 @@ testDetect()
 	assertAppDetected "PHP"
 }
 
+testDeepDetect()
+{
+	mkdir -p ${BUILD_DIR}/public_html
+	touch ${BUILD_DIR}/public_html/index.php
+
+	detect
+
+	assertCapturedSuccess
+	assertAppDetected "PHP"
+}
+
 testNoDetectPHP()
 {
 	mkdir -p ${BUILD_DIR}/