Fixed broken build

Author: mcustiel

Dockerfile

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with mcustiel/docker-php-tools. If not, see <http://www.gnu.org/licenses/>.
 
-FROM composer
+FROM composer:1.6
 MAINTAINER Mariano Custiel <jmcustiel@gmail.com>
 
 # phars directory
@@ -27,7 +27,7 @@ ENV PATH $COMPOSER_HOME/vendor/bin:$PATH
 RUN apk add --no-cache \
 $PHPIZE_DEPS \
 openssl-dev
-RUN pecl install xdebug-2.5.3 && docker-php-ext-enable xdebug
+RUN pecl install xdebug-2.6.0 && docker-php-ext-enable xdebug
 
 # PHP Configuration
 COPY ./config/phar-writable.ini /usr/local/etc/php/conf.d
@@ -37,9 +37,10 @@ RUN composer global require hirak/prestissimo
 
 # PHP tools
 RUN composer global require phing/phing
-RUN composer global require phpunit/phpunit:~5.0
-RUN composer global require phpunit/dbunit:~2.0
-RUN composer global require sebastian/phpcpd
+RUN composer global require kherge/box --prefer-source
+RUN composer global require phpunit/phpunit:~6.0
+RUN composer global require phpunit/dbunit:~3.0
+RUN composer global require sebastian/phpcpd:~3.0
 RUN composer global require phploc/phploc
 RUN composer global require phpmd/phpmd
 RUN composer global require squizlabs/php_codesniffer
@@ -48,12 +49,14 @@ RUN composer global require friendsofphp/php-cs-fixer
 RUN composer global require codeception/codeception
 RUN composer global require phpmetrics/phpmetrics
 RUN composer global require sensiolabs/security-checker
-RUN composer global require kherge/box --prefer-source
+
 RUN composer global require sebastian/phpdcd
 
 RUN curl -L http://phpdoc.org/phpDocumentor.phar -o $PHARS_DIR/phpDocumentor
 RUN chmod +x $PHARS_DIR/phpDocumentor
 
+RUN composer global require phpstan/phpstan --prefer-dist
+
 # CS config for SF2 standards
 RUN composer global require escapestudios/symfony2-coding-standard
 RUN phpcs --config-set installed_paths $COMPOSER_HOME/vendor/escapestudios/symfony2-coding-standard

php-tool-run

@@ -3,7 +3,6 @@
 DIR=$(pwd)
 USER=$(id -u)
 GROUP=$(id -g)
-CHANGE_OWNER=0
 COMMAND=""
 options=($@)
 
@@ -29,9 +28,6 @@ while [ "${#options[@]}" -gt 0 ]; do
  GROUP=${options[1]}
  options=(${options[@]:1})
  ;;
- --dpt-owner)
- CHANGE_OWNER=1
- ;;
  *)
  COMMAND="$COMMAND ${options[0]}"
  ;;
@@ -48,8 +44,4 @@ docker run -it --rm \
  --env SSH_AUTH_SOCK=/ssh-auth.sock \
  --user $USER:$GROUP \
  php-tools $COMMAND
-if [ "$CHANGE_OWNER" -eq "1" ]; then
- echo "CHANGING OWNERSHIP TO $USER:$GROUP"
- sudo chown -R $USER:$GROUP $DIR
-fi
 

php5-tool-run

@@ -3,7 +3,6 @@
 DIR=$(pwd)
 USER=$(id -u)
 GROUP=$(id -g)
-CHANGE_OWNER=0
 COMMAND=""
 options=($@)
 
@@ -29,9 +28,6 @@ while [ "${#options[@]}" -gt 0 ]; do
  GROUP=${options[1]}
  options=(${options[@]:1})
  ;;
- --dpt-owner)
- CHANGE_OWNER=1
- ;;
  *)
  COMMAND="$COMMAND ${options[0]}"
  ;;
@@ -48,8 +44,4 @@ docker run -it --rm \
  --env SSH_AUTH_SOCK=/ssh-auth.sock \
  --user $USER:$GROUP \
  php-tools:php5 $COMMAND
-if [ "$CHANGE_OWNER" -eq "1" ]; then
- echo "CHANGING OWNERSHIP TO $USER:$GROUP"
- sudo chown -R $USER:$GROUP $DIR
-fi