Skip to content

Commit

Permalink
[travis] Update script for get php-cs-fixer from Composer install
Browse files Browse the repository at this point in the history
  • Loading branch information
Maks3w committed Oct 16, 2013
1 parent c88e584 commit 886b641
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 4 additions & 2 deletions bin/check-cs.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/bash

libraryCS=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 ./library)
testsCS=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 ./tests)
FIXER_PATH="`dirname $0`/../vendor/fabpot/php-cs-fixer/php-cs-fixer"

libraryCS=$(php $FIXER_PATH fix -v --dry-run --level=psr2 ./library)
testsCS=$(php $FIXER_PATH fix -v --dry-run --level=psr2 ./tests)

if [[ "$libraryCS" || "$testsCS" ]];
then
Expand Down
6 changes: 1 addition & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<mkdir dir="${basedir}/build/cs-results"/>
</target>

<target name="get-cs-fixer" depends="clean" description="Get coding standards fixer">
<get src="http://cs.sensiolabs.org/get/php-cs-fixer.phar" dest="${basedir}/php-cs-fixer.phar"/>
</target>

<target name="composer-install" description="Installs dependencies via composer install">
<sequential>
<exec executable="composer" failonerror="true">
Expand All @@ -34,7 +30,7 @@

<target
name="tests-parallel"
depends="prepare,composer-install,get-cs-fixer"
depends="prepare,composer-install"
description="Run tests for the various components in parallel"
>
<parallel threadCount="8">
Expand Down

0 comments on commit 886b641

Please sign in to comment.