Merge branch '2.7' into 2.8

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

Author: fabpot

app/phpunit.xml.dist

@@ -9,6 +9,9 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <!--
+            <server name="KERNEL_DIR" value="/path/to/your/app/" />
+        -->
     </php>
 
     <testsuites>
@@ -19,12 +22,6 @@
         </testsuite>
     </testsuites>
 
-    <!--
-    <php>
-        <server name="KERNEL_DIR" value="/path/to/your/app/" />
-    </php>
-    -->
-
     <filter>
         <whitelist>
             <directory>../src</directory>