Skip to content

Commit

Permalink
Merge branch '5.1' into 5
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Nov 5, 2023
2 parents 4c66b57 + 5b40be3 commit d6f0cec
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
5 changes: 1 addition & 4 deletions src/Auth/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ class Handler
* @config
* @var array
*
* @internal Experimental config:
* @todo Move this to a per-schema configuration and refer to this schema from the current endpoint
* @link https://github.com/silverstripe/silverstripe-graphql/issues/58
* @link https://github.com/silverstripe/silverstripe-graphql/issues/52
* @internal Experimental config
*/
private static $authenticators = [
[
Expand Down
2 changes: 0 additions & 2 deletions src/Middleware/QueryCachingMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ protected function getCachedResponse(string $key): ?array

// On cache success validate against cached classes
foreach ($cached['classes'] as $class) {
// Note: Could combine these clases into a UNION to cut down on extravagant queries
// Todo: We can get last-deleted/modified as well for versioned records
$lastEditedDate = DataObject::get($class)->max('LastEdited');
if (strtotime($lastEditedDate ?? '') > strtotime($cached['date'] ?? '')) {
// class modified, fail validation of cache
Expand Down
2 changes: 0 additions & 2 deletions src/Schema/DataObject/InterfaceBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ public function createInterfaces(ModelType $modelType, array $interfaceStack = [
)
->setTypeResolver([AbstractTypeResolver::class, 'resolveType']);

// TODO: this makes a really good case for
// https://github.com/silverstripe/silverstripe-graphql/issues/364
$validPlugins = [];
foreach ($modelType->getPlugins() as $name => $config) {
$plugin = $modelType->getPluginRegistry()->getPluginByID($name);
Expand Down

0 comments on commit d6f0cec

Please sign in to comment.