From 4ea6528ed9cf1ffe63ed3b1ecf8dcef46a659b56 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 9 May 2022 12:04:44 +0300 Subject: [PATCH] feat(macros): add ability to set enabled status for `entries` and `registry` macros --- src/flextype/core/Entries/Macros/EntriesMacros.php | 3 ++- src/flextype/core/Entries/Macros/RegistryMacros.php | 3 ++- src/flextype/settings.yaml | 3 +++ tests/fixtures/settings/settings.yaml | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/flextype/core/Entries/Macros/EntriesMacros.php b/src/flextype/core/Entries/Macros/EntriesMacros.php index b4896305..cde5f943 100644 --- a/src/flextype/core/Entries/Macros/EntriesMacros.php +++ b/src/flextype/core/Entries/Macros/EntriesMacros.php @@ -22,7 +22,8 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void return; } - if (entries()->registry()->has('methods.fetch.result.macros.entries.fetch')) { + if (entries()->registry()->has('methods.fetch.result.macros.entries.fetch') && + registry()->get('flextype.settings.entries.macros.entries.fetch.enabled') === true) { // Get $original = entries()->registry()->get('methods.fetch'); diff --git a/src/flextype/core/Entries/Macros/RegistryMacros.php b/src/flextype/core/Entries/Macros/RegistryMacros.php index 4103fb90..647931c9 100644 --- a/src/flextype/core/Entries/Macros/RegistryMacros.php +++ b/src/flextype/core/Entries/Macros/RegistryMacros.php @@ -20,7 +20,8 @@ emitter()->addListener('onEntriesFetchSingleHasResult', static function (): void return; } - if (entries()->registry()->has('methods.fetch.result.macros.registry.get')) { + if (entries()->registry()->has('methods.fetch.result.macros.registry.get') && + registry()->get('flextype.settings.entries.macros.registry.get.enabled') === true) { // Get fetch. $original = entries()->registry()->get('methods.fetch'); diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml index 663a2360..2fc8ea22 100644 --- a/src/flextype/settings.yaml +++ b/src/flextype/settings.yaml @@ -95,10 +95,13 @@ entries: registry: enabled: true path: "/src/flextype/core/Entries/Macros/RegistryMacros.php" + get: + enabled: true entries: enabled: true path: "/src/flextype/core/Entries/Macros/EntriesMacros.php" fetch: + enabled: true result: toArray collections: default: diff --git a/tests/fixtures/settings/settings.yaml b/tests/fixtures/settings/settings.yaml index d42f68f4..237a3bb8 100644 --- a/tests/fixtures/settings/settings.yaml +++ b/tests/fixtures/settings/settings.yaml @@ -91,10 +91,13 @@ entries: registry: enabled: true path: "/src/flextype/core/Entries/Macros/RegistryMacros.php" + get: + enabled: true entries: enabled: true path: "/src/flextype/core/Entries/Macros/EntriesMacros.php" fetch: + enabled: true result: toArray collections: default: