Merge pull request #7340 from guilliamxavier/patch-1

Fix config template for PHPUnit >= 7.2
doctrine · Aug 8, 2018 · 39609b8 · 39609b8
2 parents 1951401 + f4b2031
commit 39609b8
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,10 +19,6 @@
          bootstrap="./tests/Doctrine/Tests/TestInit.php"
 >
 
-    <php>
-        <env name="COLUMNS" value="120"/>
-    </php>
-
     <testsuites>
         <testsuite name="Doctrine ORM Test Suite">
             <directory>./tests/Doctrine/Tests/ORM</directory>
@@ -37,6 +33,8 @@
     </groups>
 
   <php>
+    <env name="COLUMNS" value="120"/>
+
     <!-- "Real" test database -->
     <!-- uncomment, otherwise sqlite memory runs
     <var name="db_type" value="pdo_mysql"/>