Merge branch '4.1' into 4

silverstripe · Dec 19, 2022 · 82a2262 · 82a2262
2 parents d9bda2b + 81755df
commit 82a2262
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/Middleware/QueryCachingMiddleware.php b/src/Middleware/QueryCachingMiddleware.php
@@ -45,7 +45,7 @@ public function process(Schema $schema, string $query, array $context, array $va
                 __CLASS__
             ));
         }
-        $vars = $vars['vars'];
+        $vars = $vars['vars'] ?? [];
         $key = $this->generateCacheKey($query, $vars);
 
         // Get successful cache response

diff --git a/src/Schema/Storage/AbstractTypeRegistry.php b/src/Schema/Storage/AbstractTypeRegistry.php
@@ -41,13 +41,15 @@ protected static function fromCache(string $typename)
         if (!isset(static::$types[$typename])) {
             $obfuscatedName = $obfuscator->obfuscate($typename);
             $file = static::getSourceDirectory() . DIRECTORY_SEPARATOR . $obfuscatedName . '.php';
-            if (file_exists($file ?? '')) {
-                require_once($file);
-                $cls = static::getSourceNamespace() . '\\' . $obfuscatedName;
-                if (class_exists($cls ?? '')) {
-                    $type = new $cls();
-                }
+            if (!file_exists($file)) {
+                throw new Exception('Missing graphql file for ' . $typename);
             }
+            require_once($file);
+            $cls = static::getSourceNamespace() . '\\' . $obfuscatedName;
+            if (!class_exists($cls)) {
+                throw new Exception('Missing graphql class for ' . $typename);
+            }
+            $type = new $cls();
             static::$types[$typename] = $type;
         }
         $type = static::$types[$typename];

diff --git a/.../Middleware/MiddlewareProcessTestBase.php → .../Middleware/BaseMiddlewareProcessTest.php b/.../Middleware/MiddlewareProcessTestBase.php → .../Middleware/BaseMiddlewareProcessTest.php
@@ -9,7 +9,7 @@
 use SilverStripe\GraphQL\Middleware\QueryMiddleware;
 use SilverStripe\GraphQL\Schema\Schema as SchemaSchema;
 
-abstract class MiddlewareProcessTestBase extends SapphireTest
+abstract class BaseMiddlewareProcessTest extends SapphireTest
 {
     /**
      * @var callable

diff --git a/tests/Middleware/CSRFMiddlewareTest.php b/tests/Middleware/CSRFMiddlewareTest.php
@@ -6,7 +6,7 @@
 use SilverStripe\GraphQL\Middleware\CSRFMiddleware;
 use SilverStripe\Security\SecurityToken;
 
-class CSRFMiddlewareTest extends MiddlewareProcessTestBase
+class CSRFMiddlewareTest extends BaseMiddlewareProcessTest
 {
     public function testItDoesntDoAnythingIfNotAMutation()
     {