Merge 94dc070f5ad2df4cc69309960d08ceabd3e39ff8 into afdd95eed89f498252d19b674c9aaaee26053372

MNT Update phpunit xml file for phpunit 11

phpunit.xml.dist

@@ -1,38 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Standard module phpunit configuration.
-Requires PHPUnit ^9
--->
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<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">
   <testsuites>
     <testsuite name="Default">
       <directory>tests/php</directory>
     </testsuite>
-        <!-- Framework ORM tests are split up to run in parallel -->
+    <!-- Framework ORM tests are split up to run in parallel in github actions CI -->
     <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">
-            <directory>tests/php/ORM</directory>
+      <!-- Will be run in github actions CI with option filter /ORM/ -->
+      <directory>tests/php</directory>
     </testsuite>
-        <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. -->
+    <!-- Cache suite is separate so it only runs what it needs to run -->
     <testsuite name="framework-cache-only">
       <directory>tests/php/Core/Cache</directory>
     </testsuite>
   </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
+  <source>
+    <include>
       <directory suffix=".php">.</directory>
+    </include>
     <exclude>
       <directory suffix=".php">tests/</directory>
       <directory suffix=".php">thirdparty/</directory>
     </exclude>
-        </whitelist>
-    </filter>
+  </source>
 </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');
+        return static::config()->get('trace_query_origin') ?? false;
     }
 
     /**