From 8026a9b7fba9ebcc038c2d3873518df2d18f6948 Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 1 Aug 2021 12:36:28 +0300 Subject: [PATCH] feat(serializers): update all serializers #199 --- src/flextype/Support/Serializers/Frontmatter.php | 12 ++++++------ src/flextype/Support/Serializers/Json.php | 6 +++--- src/flextype/Support/Serializers/Yaml.php | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/flextype/Support/Serializers/Frontmatter.php b/src/flextype/Support/Serializers/Frontmatter.php index 33ec001e..3a6b75af 100644 --- a/src/flextype/Support/Serializers/Frontmatter.php +++ b/src/flextype/Support/Serializers/Frontmatter.php @@ -35,10 +35,10 @@ class Frontmatter if (isset($input['content'])) { $content = $input['content']; $input = arrays($input)->delete('content')->toArray(); - $matter = flextype('serializers')->yaml()->encode($input); + $matter = serializers()->yaml()->encode($input); } else { $content = ''; - $matter = flextype('serializers')->yaml()->encode($input); + $matter = serializers()->yaml()->encode($input); } return '---' . "\n" . @@ -71,18 +71,18 @@ class Frontmatter return ['content' => strings($input)->trim()->toString()]; } - return flextype('serializers')->yaml()->decode(strings($parts[1])->trim()->toString(), false) + ['content' => strings(implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2)))->trim()->toString()]; + return serializers()->yaml()->decode(strings($parts[1])->trim()->toString(), false) + ['content' => strings(implode(PHP_EOL . '---' . PHP_EOL, array_slice($parts, 2)))->trim()->toString()]; }; - if ($cache === true && flextype('registry')->get('flextype.settings.cache.enabled') === true) { + if ($cache === true && registry()->get('flextype.settings.cache.enabled') === true) { $key = $this->getCacheID($input); - if ($dataFromCache = flextype('cache')->get($key)) { + if ($dataFromCache = cache()->get($key)) { return $dataFromCache; } $data = $decode($input); - flextype('cache')->set($key, $data); + cache()->set($key, $data); return $data; } diff --git a/src/flextype/Support/Serializers/Json.php b/src/flextype/Support/Serializers/Json.php index 4f43e9ce..a6b62736 100644 --- a/src/flextype/Support/Serializers/Json.php +++ b/src/flextype/Support/Serializers/Json.php @@ -80,15 +80,15 @@ class Json return $value; }; - if ($cache === true && flextype('registry')->get('flextype.settings.cache.enabled') === true) { + if ($cache === true && registry()->get('flextype.settings.cache.enabled') === true) { $key = $this->getCacheID($input); - if ($dataFromCache = flextype('cache')->get($key)) { + if ($dataFromCache = cache()->get($key)) { return $dataFromCache; } $data = $decode($input, $assoc, $depth, $flags); - flextype('cache')->set($key, $data); + cache()->set($key, $data); return $data; } diff --git a/src/flextype/Support/Serializers/Yaml.php b/src/flextype/Support/Serializers/Yaml.php index 6280885f..05391148 100644 --- a/src/flextype/Support/Serializers/Yaml.php +++ b/src/flextype/Support/Serializers/Yaml.php @@ -113,15 +113,15 @@ class Yaml } }; - if ($cache === true && flextype('registry')->get('flextype.settings.cache.enabled') === true) { + if ($cache === true && registry()->get('flextype.settings.cache.enabled') === true) { $key = $this->getCacheID($input); - if ($dataFromCache = flextype('cache')->get($key)) { + if ($dataFromCache = cache()->get($key)) { return $dataFromCache; } $data = $decode($input, $flags); - flextype('cache')->set($key, $data); + cache()->set($key, $data); return $data; }