Forward port zendframework#5281

abutme · Oct 20, 2013 · 1e998f2 · 1e998f2
2 parents be748e7 + e903de8
commit 1e998f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/bin/check-cs.sh b/bin/check-cs.sh
@@ -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

diff --git a/build.xml b/build.xml
@@ -13,10 +13,6 @@
         <mkdir dir="${basedir}/build/logs"/>
     </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">
@@ -52,7 +48,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">

diff --git a/composer.json b/composer.json
@@ -38,6 +38,7 @@
         "ircmaxell/security-lib": "dev-master",
         "mikey179/vfsStream": "1.2.*",
         "ocramius/proxy-manager": "0.4.*",
+        "fabpot/php-cs-fixer": "*@dev",
         "phpunit/PHPUnit": "3.7.*",
         "satooshi/php-coveralls": "dev-master",
         "sebastianbergmann/phpcov": "1.1.0"