From acf6d5161ca16802d1ad72f23862677035b7cb7a Mon Sep 17 00:00:00 2001
From: Awilum <sergey.romanenko@flextype.org>
Date: Fri, 3 Jun 2022 12:48:43 +0300
Subject: [PATCH] feat(shortcodes): change `shortcodes` signature

---
 .../core/Parsers/Shortcodes/RegistryShortcode.php | 15 ++++++++++-----
 .../Parsers/Shortcodes/RegistryShortcodeTest.php  |  8 ++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php b/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php
index 14d34f14..59a36f94 100644
--- a/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php
+++ b/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php
@@ -22,17 +22,22 @@ use function parsers;
 use function registry;
 
 // Shortcode: registry
-// Usage: (registry get:flextype.manifest.version)
+// Usage: (registry get id:'flextype.manifest.version')
 parsers()->shortcodes()->addHandler('registry', static function (ShortcodeInterface $s) {
     if (! registry()->get('flextype.settings.parsers.shortcodes.shortcodes.registry.enabled')) {
         return '';
     }
+    
+    $result = '';
+    $params = $s->getParameters();
 
-    if ($s->getParameter('get') != null && registry()->get('flextype.settings.parsers.shortcodes.shortcodes.registry.get.enabled') === true) {
+    if (collection(array_keys($params))->filter(fn ($v) => $v == 'get')->count() > 0 && 
+        isset($params['id']) && 
+        registry()->get('flextype.settings.parsers.shortcodes.shortcodes.registry.get.enabled') === true) {
 
-        $value   = parsers()->shortcodes()->parse($s->getParameter('get'));
-        $default = ($s->getParameter('default') != null) ? parsers()->shortcodes()->parse($s->getParameter('default')) : null;
-        $result  = registry()->get($value, $default);
+        $id      = parsers()->shortcodes()->parse($params['id']);
+        $default = (isset($params['default'])) ? parsers()->shortcodes()->parse($params['default']) : null;
+        $result  = registry()->get($id, $default);
 
         return is_array($result) ? serializers()->json()->encode($result) : $result;
     }
diff --git a/tests/src/flextype/core/Parsers/Shortcodes/RegistryShortcodeTest.php b/tests/src/flextype/core/Parsers/Shortcodes/RegistryShortcodeTest.php
index 29e31a6a..f8b1125e 100644
--- a/tests/src/flextype/core/Parsers/Shortcodes/RegistryShortcodeTest.php
+++ b/tests/src/flextype/core/Parsers/Shortcodes/RegistryShortcodeTest.php
@@ -3,13 +3,13 @@
 declare(strict_types=1);
 
 test('registry shortcode', function () {
-    expect(strings(parsers()->shortcodes()->parse("(registry get:'flextype.manifest')"))->isJson())->toBeTrue();
-    expect(parsers()->shortcodes()->parse("(registry get:'flextype.manifest.name')"))->toBe('Flextype');
-    expect(parsers()->shortcodes()->parse("(registry get:'flextype.manifest.foo' default:'Default')"))->toBe('Default');
+    expect(strings(parsers()->shortcodes()->parse("(registry get id:'flextype.manifest')"))->isJson())->toBeTrue();
+    expect(parsers()->shortcodes()->parse("(registry get id:'flextype.manifest.name')"))->toBe('Flextype');
+    expect(parsers()->shortcodes()->parse("(registry get id:'flextype.manifest.foo' default:'Default')"))->toBe('Default');
 });
 
 test('registry shortcode disabled', function () {
     registry()->set('flextype.settings.parsers.shortcodes.shortcodes.registry.enabled', false);
-    expect(parsers()->shortcodes()->parse("(registry get:'flextype.manifest.name')"))->toBe('');
+    expect(parsers()->shortcodes()->parse("(registry get id:'flextype.manifest.name')"))->toBe('');
     registry()->set('flextype.settings.parsers.shortcodes.shortcodes.registry.enabled', true);
 });
\ No newline at end of file