Improve tests config

Author: VincentLanglet

build.xml

@@ -29,13 +29,10 @@
 
     <target name="phpunit" depends="symlink-cs" description="Run unit tests with PHPUnit">
         <exec executable="${phpunit.bin}" failonerror="true" >
-            <arg value="--verbose"/>
-            <arg value="--filter=SymfonyCustom"/>
-            <arg value="${phpcs.dir}/tests/AllTests.php"/>
+            <arg value="--testsuite=SymfonyCustom"/>
         </exec>
         <exec executable="${phpunit.bin}" failonerror="true" >
-            <arg value="--verbose"/>
-            <arg value="TwigCS"/>
+            <arg value="--testsuite=TwigCS"/>
         </exec>
     </target>
 

phpunit.xml.dist

@@ -10,9 +10,12 @@
          stopOnFailure="false"
          bootstrap="./bootstrap.php"
 >
-    <filter>
-        <whitelist>
-            <directory>./vendor/squizlabs/php_codesniffer/src/Standards/SymfonyCustom</directory>
-        </whitelist>
-    </filter>
+    <testsuites>
+        <testsuite name="SymfonyCustom">
+            <file>./vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>
+        </testsuite>
+        <testsuite name="TwigCS">
+            <directory>./TwigCS</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>