Merge e10f6f421a into e46135be0a

phpunit.xml.dist

@@ -1,30 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd">
+<!--
+Standard module phpunit configuration.
+Requires PHPUnit ^9
+-->
+<phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="Default">
             <directory>tests/php</directory>
         </testsuite>
-    <!-- Framework ORM tests are split up to run in parallel in github actions CI -->
+        <!-- Framework ORM tests are split up to run in parallel -->
         <testsuite name="framework-core">
-      <!-- Will be run in github actions CI with option exclude-filter /ORM/ -->
             <directory>tests/php</directory>
+            <exclude>
+                <directory>tests/php/ORM</directory>
+            </exclude>
         </testsuite>
         <testsuite name="framework-orm">
-      <!-- Will be run in github actions CI with option filter /ORM/ -->
+            <directory>tests/php/ORM</directory>
-      <directory>tests/php</directory>
         </testsuite>
-    <!-- Cache suite is separate so it only runs what it needs to run -->
+        <testsuite name="cms">
+            <directory>vendor/silverstripe/cms/tests</directory>
+        </testsuite>
+        <!-- Cache suite is separate so it only runs what it needs to run. Intentionally also included in core above. -->
         <testsuite name="framework-cache-only">
             <directory>tests/php/Core/Cache</directory>
         </testsuite>
     </testsuites>
-  <source>
+    <filter>
-    <include>
+        <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">.</directory>
-    </include>
             <exclude>
                 <directory suffix=".php">tests/</directory>
                 <directory suffix=".php">thirdparty/</directory>
             </exclude>
-  </source>
+        </whitelist>
+    </filter>
 </phpunit>

src/ORM/Connect/DBQueryBuilder.php

@@ -86,7 +86,7 @@ class DBQueryBuilder
         if (Environment::hasEnv('SS_TRACE_DB_QUERY_ORIGIN')) {
             return (bool) Environment::getEnv('SS_TRACE_DB_QUERY_ORIGIN');
         }
-        return static::config()->get('trace_query_origin') ?? false;
+        return static::config()->get('trace_query_origin');
     }
 
     /**