Merge branch '4.2' into 4

silverstripe · Mar 28, 2023 · 7ac06ec · 7ac06ec
2 parents 76e2e69 + 13327fd
commit 7ac06ec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/Schema/Storage/AbstractTypeRegistry.php b/src/Schema/Storage/AbstractTypeRegistry.php
@@ -27,7 +27,7 @@ abstract class AbstractTypeRegistry
      * the schema files themselves are missing.
      */
     private static bool $rebuild_on_missing_schema_file = true;
-    
+
     /**
      * Minimum number of seconds between rebuilding the schema if a schema file is missing.
      * If set too low this may make the site vulnerable to the schema being repeatedly rebuilt

diff --git a/tests/Schema/IntegrationTest.php b/tests/Schema/IntegrationTest.php
@@ -1217,8 +1217,6 @@ private function createSchema(TestSchemaBuilder $factory): Schema
 
         // Register as the default SchemaBuilder so that any calls to
         // SchemaBuidler::singleton() get this TestSchemaBuilder
-        // This is important for the call in AbstractTypeRegisty::get() because
-        // otherwise a duplicate .graphql-generated folder will be created
         Injector::inst()->registerService($factory, SchemaBuilder::class);
 
         return $schema;