Merge branch '2.8' into 3.0

* 2.8:
  merged the two php sections of phpunix.xml.dist

Author: fabpot

phpunit.xml.dist

@@ -9,6 +9,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <server name="KERNEL_DIR" value="app/" />
     </php>
 
     <testsuites>
@@ -17,10 +18,6 @@
         </testsuite>
     </testsuites>
 
-    <php>
-        <server name="KERNEL_DIR" value="app/" />
-    </php>
-
     <filter>
         <whitelist>
             <directory>src</directory>