From f25ee81682b352bc9a596415e1d92b8f91d1f7b2 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Sat, 25 Jul 2020 19:20:51 +0300
Subject: [PATCH] feat(core): use Arrays class for arrays

---
 src/flextype/Foundation/Config.php             | 18 +++++++++---------
 src/flextype/Foundation/Entries/Entries.php    |  1 -
 .../Foundation/Media/MediaFilesMeta.php        | 14 +++++++-------
 src/flextype/Foundation/Plugins.php            |  8 ++++----
 src/flextype/Support/Collection.php            | 18 +++++++++---------
 .../Shortcodes/EntriesShortcodeExtension.php   |  4 ++--
 .../Support/Serializers/Frontmatter.php        |  4 ++--
 src/flextype/bootstrap.php                     |  2 +-
 8 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/flextype/Foundation/Config.php b/src/flextype/Foundation/Config.php
index 11500b8f..0503c170 100644
--- a/src/flextype/Foundation/Config.php
+++ b/src/flextype/Foundation/Config.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Flextype\Foundation;
 
-use Awilum\ArrayDots\ArrayDots;
+use Flextype\Component\Arrays\Arrays;
 use Flextype\Component\Filesystem\Filesystem;
 
 class Config
@@ -43,7 +43,7 @@ class Config
         $config_file = $this->getFileLocation($config);
 
         if (Filesystem::has($config_file)) {
-            return ArrayDots::get($this->flextype->yaml->decode(Filesystem::read($config_file)), $key, $default);
+            return Arrays::get($this->flextype->yaml->decode(Filesystem::read($config_file)), $key, $default);
         }
     }
 
@@ -61,8 +61,8 @@ class Config
         if (Filesystem::has($config_file)) {
              $config_file_data = $this->flextype->yaml->decode(Filesystem::read($config_file));
 
-            if (! ArrayDots::has($config_file_data, $key)) {
-                ArrayDots::set($config_file_data, $key, $value);
+            if (! Arrays::has($config_file_data, $key)) {
+                Arrays::set($config_file_data, $key, $value);
 
                 return Filesystem::write($config_file, $this->flextype->yaml->encode($config_file_data));
             }
@@ -87,8 +87,8 @@ class Config
         if (Filesystem::has($config_file)) {
              $config_file_data = $this->flextype->yaml->decode(Filesystem::read($config_file));
 
-            if (ArrayDots::has($config_file_data, $key)) {
-                ArrayDots::set($config_file_data, $key, $value);
+            if (Arrays::has($config_file_data, $key)) {
+                Arrays::set($config_file_data, $key, $value);
 
                 return Filesystem::write($config_file, $this->flextype->yaml->encode($config_file_data));
             }
@@ -112,8 +112,8 @@ class Config
         if (Filesystem::has($config_file)) {
              $config_file_data = $this->flextype->yaml->decode(Filesystem::read($config_file));
 
-            if (ArrayDots::has($config_file_data, $key)) {
-                ArrayDots::delete($config_file_data, $key);
+            if (Arrays::has($config_file_data, $key)) {
+                Arrays::delete($config_file_data, $key);
 
                 return Filesystem::write($config_file, $this->flextype->yaml->encode($config_file_data));
             }
@@ -137,7 +137,7 @@ class Config
         if (Filesystem::has($config_file)) {
              $config_file_data = $this->flextype->yaml->decode(Filesystem::read($config_file));
 
-            if (ArrayDots::has($config_file_data, $key)) {
+            if (Arrays::has($config_file_data, $key)) {
                 return true;
             }
 
diff --git a/src/flextype/Foundation/Entries/Entries.php b/src/flextype/Foundation/Entries/Entries.php
index b6d2bc8b..525b7a66 100755
--- a/src/flextype/Foundation/Entries/Entries.php
+++ b/src/flextype/Foundation/Entries/Entries.php
@@ -30,7 +30,6 @@ use function time;
 
 class Entries
 {
-
     /**
      * Current entry path
      *
diff --git a/src/flextype/Foundation/Media/MediaFilesMeta.php b/src/flextype/Foundation/Media/MediaFilesMeta.php
index 7c1c63c9..6deffec5 100644
--- a/src/flextype/Foundation/Media/MediaFilesMeta.php
+++ b/src/flextype/Foundation/Media/MediaFilesMeta.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Flextype\Foundation\Media;
 
-use Awilum\ArrayDots\ArrayDots;
+use Flextype\Component\Arrays\Arrays;
 use Flextype\Component\Filesystem\Filesystem;
 
 class MediaFilesMeta
@@ -46,8 +46,8 @@ class MediaFilesMeta
     {
         $file_data = $this->flextype['yaml']->decode(Filesystem::read($this->getFileMetaLocation($id)));
 
-        if (ArrayDots::has($file_data, $field)) {
-            ArrayDots::set($file_data, $field, $value);
+        if (Arrays::has($file_data, $field)) {
+            Arrays::set($file_data, $field, $value);
 
             return Filesystem::write($this->getFileMetaLocation($id), $this->flextype['yaml']->encode($file_data));
         }
@@ -70,8 +70,8 @@ class MediaFilesMeta
     {
         $file_data = $this->flextype['yaml']->decode(Filesystem::read($this->getFileMetaLocation($id)));
 
-        if (! ArrayDots::has($file_data, $field)) {
-            ArrayDots::set($file_data, $field, $value);
+        if (! Arrays::has($file_data, $field)) {
+            Arrays::set($file_data, $field, $value);
 
             return Filesystem::write($this->getFileMetaLocation($id), $this->flextype['yaml']->encode($file_data));
         }
@@ -93,8 +93,8 @@ class MediaFilesMeta
     {
         $file_data = $this->flextype['yaml']->decode(Filesystem::read($this->getFileMetaLocation($id)));
 
-        if (ArrayDots::has($file_data, $field)) {
-            ArrayDots::delete($file_data, $field);
+        if (Arrays::has($file_data, $field)) {
+            Arrays::delete($file_data, $field);
 
             return Filesystem::write($this->getFileMetaLocation($id), $this->flextype['yaml']->encode($file_data));
         }
diff --git a/src/flextype/Foundation/Plugins.php b/src/flextype/Foundation/Plugins.php
index f88eb5ce..a49fc911 100755
--- a/src/flextype/Foundation/Plugins.php
+++ b/src/flextype/Foundation/Plugins.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Flextype\Foundation;
 
-use Awilum\ArrayDots\ArrayDots;
+use Flextype\Component\Arrays\Arrays;
 use Composer\Semver\Semver;
 use Flextype\Component\Filesystem\Filesystem;
 use Flextype\Component\I18n\I18n;
@@ -163,11 +163,11 @@ class Plugins
             }
 
             // Sort plugins list by priority.
-            $plugins = ArrayDots::sort($plugins, '_priority', 'DESC');
+            $plugins = Arrays::sort($plugins, '_priority', 'DESC');
 
             // ... and delete tmp _priority field for sorting
             foreach ($plugins as $plugin_name => $plugin_data) {
-                ArrayDots::delete($plugins, $plugin_name . '._priority');
+                Arrays::delete($plugins, $plugin_name . '._priority');
             }
 
             // Get Valid Plugins Dependencies
@@ -333,7 +333,7 @@ class Plugins
         // Show alert if dependencies are not installed properly
         $diff = array_diff_key($non_verified_plugins, $verified_plugins);
         if (count($diff) > 0) {
-            echo '<b>The following dependencies need to be installed properly:</b>';
+            echo '<b>Dependencies need to be installed properly for this plugins:</b>';
             echo '<ul>';
             foreach ($diff as $plugin_name => $plugin_data) {
                 echo '<li>' . $plugin_name . '</li>';
diff --git a/src/flextype/Support/Collection.php b/src/flextype/Support/Collection.php
index fdbef9f7..f11ecf14 100644
--- a/src/flextype/Support/Collection.php
+++ b/src/flextype/Support/Collection.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Flextype\Support;
 
-use Awilum\ArrayDots\ArrayDots;
+use Flextype\Component\Arrays\Arrays;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Common\Collections\Expr\Comparison;
@@ -102,7 +102,7 @@ class Collection
             $flat_array = [];
 
             foreach ($items as $key => $value) {
-                $flat_array[$key] = ArrayDots::dot($value);
+                $flat_array[$key] = Arrays::dot($value);
             }
 
             $items = $flat_array;
@@ -294,7 +294,7 @@ class Collection
         $results = $collection->last();
 
         // Return first matching result
-        return is_array($results) ? ArrayDots::undot($results) : $results;
+        return is_array($results) ? Arrays::undot($results) : $results;
     }
 
     /**
@@ -321,7 +321,7 @@ class Collection
         $results = $collection->next();
 
         // Return first matching result
-        return is_array($results) ? ArrayDots::undot($results) : $results;
+        return is_array($results) ? Arrays::undot($results) : $results;
     }
 
     /**
@@ -348,7 +348,7 @@ class Collection
         $results = $collection->toArray();
 
         if ($this->_isAssocArray($results)) {
-            $results = ArrayDots::undot(ArrayDots::dot($results));
+            $results = Arrays::undot(Arrays::dot($results));
             $this->_shuffleAssocArray($results);
         } else {
             shuffle($results);
@@ -380,7 +380,7 @@ class Collection
         $results = $collection->first();
 
         // Return first matching result
-        return is_array($results) ? ArrayDots::undot($results) : $results;
+        return is_array($results) ? Arrays::undot($results) : $results;
     }
 
     /**
@@ -416,7 +416,7 @@ class Collection
         }
 
         if ($this->_isAssocArray($array)) {
-            $array = ArrayDots::undot(ArrayDots::dot($array));
+            $array = Arrays::undot(Arrays::dot($array));
         }
 
         if ((int) $number === 1 || is_null($number)) {
@@ -467,7 +467,7 @@ class Collection
         $results = $collection->slice($offset, $length);
 
         // Return results
-        return $this->_isAssocArray($results) ? ArrayDots::undot(ArrayDots::dot($results)) : $results;
+        return $this->_isAssocArray($results) ? Arrays::undot(Arrays::dot($results)) : $results;
     }
 
     /**
@@ -492,7 +492,7 @@ class Collection
         $results = $collection->toArray();
 
         // Return results
-        return $this->_isAssocArray($results) ? ArrayDots::undot(ArrayDots::dot($results)) : $results;
+        return $this->_isAssocArray($results) ? Arrays::undot(Arrays::dot($results)) : $results;
     }
 
     /**
diff --git a/src/flextype/Support/Parsers/Shortcodes/EntriesShortcodeExtension.php b/src/flextype/Support/Parsers/Shortcodes/EntriesShortcodeExtension.php
index a99ae4a5..1afcccfc 100644
--- a/src/flextype/Support/Parsers/Shortcodes/EntriesShortcodeExtension.php
+++ b/src/flextype/Support/Parsers/Shortcodes/EntriesShortcodeExtension.php
@@ -8,9 +8,9 @@ declare(strict_types=1);
  */
 
 use Thunder\Shortcode\Shortcode\ShortcodeInterface;
-use Awilum\ArrayDots\ArrayDots;
+use Flextype\Component\Arrays\Arrays;
 
 // Shortcode: [entries_fetch id="entry-id" field="field-name" default="default-value"]
 $flextype['shortcode']->add('entries_fetch', function (ShortcodeInterface $s) use ($flextype) {
-    return ArrayDots::get($flextype['entries']->fetch($s->getParameter('id')), $s->getParameter('field'), $s->getParameter('default'));
+    return Arrays::get($flextype['entries']->fetch($s->getParameter('id')), $s->getParameter('field'), $s->getParameter('default'));
 });
diff --git a/src/flextype/Support/Serializers/Frontmatter.php b/src/flextype/Support/Serializers/Frontmatter.php
index f9aecf93..5744a3e3 100644
--- a/src/flextype/Support/Serializers/Frontmatter.php
+++ b/src/flextype/Support/Serializers/Frontmatter.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Flextype\Support\Serializers;
 
-use Awilum\ArrayDots\ArrayDots;
+use Flextype\Component\Arrays\Arrays;
 use function array_slice;
 use function count;
 use function implode;
@@ -81,7 +81,7 @@ class Frontmatter
     {
         if (isset($input['content'])) {
             $content = $input['content'];
-            ArrayDots::delete($input, 'content');
+            Arrays::delete($input, 'content');
             $matter = $this->flextype['yaml']->encode($input);
         } else {
             $content = '';
diff --git a/src/flextype/bootstrap.php b/src/flextype/bootstrap.php
index 437b0512..a03eb0f9 100755
--- a/src/flextype/bootstrap.php
+++ b/src/flextype/bootstrap.php
@@ -176,7 +176,7 @@ date_default_timezone_set($flextype['registry']->get('flextype.settings.timezone
 /**
  * Init shortocodes
  *
- * Load Flextype Shortcodes extensions from directory /flextype/Support/Parsers/Shortcodes/ based on settings.shortcodes.extensions array
+ * Load Flextype Shortcodes extensions from directory /flextype/Support/Parsers/Shortcodes/ based on flextype.settings.shortcodes.extensions array
  */
 $shortcodes_extensions = $flextype['registry']->get('flextype.settings.shortcodes.extensions');