From f233369f3e5266ac81c987ff5d0c1ed05b466127 Mon Sep 17 00:00:00 2001
From: Chris Kankiewicz <Chris@ChrisKankiewicz.com>
Date: Tue, 12 May 2020 14:22:05 -0700
Subject: [PATCH] Converted Collections in container definition back to arrays

---
 app/config/container.php                 | 41 +++++++++++-------------
 app/src/Bootstrap/MiddlewareManager.php  |  8 ++---
 app/src/Factories/FinderFactory.php      |  4 +--
 app/src/Factories/TranslationFactory.php | 13 ++++----
 4 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/app/config/container.php b/app/config/container.php
index 70ea7f6..00bda2c 100644
--- a/app/config/container.php
+++ b/app/config/container.php
@@ -6,7 +6,6 @@ use App\SortMethods;
 use App\ViewFunctions;
 use Middlewares as HttpMiddlewares;
 use Psr\Container\ContainerInterface;
-use Tightenco\Collect\Support\Collection;
 
 return [
     /** Path definitions */
@@ -22,33 +21,29 @@ return [
     /** Array of application files (to be hidden) */
     'app_files' => ['app', 'index.php', '.hidden'],
 
-    /** Collection of application middlewares */
-    'middlewares' => function (ContainerInterface $container): Collection {
-        return Collection::make([
+    /** Array of application middlewares */
+    'middlewares' => function (ContainerInterface $container): array {
+        return [
             Middlewares\WhoopsMiddleware::class,
             new HttpMiddlewares\Expires($container->get('http_expires')),
-        ]);
+        ];
     },
 
-    /** Collection of sort options mapped to their respective classes */
-    'sort_methods' => function (): Collection {
-        return Collection::make([
-            'accessed' => SortMethods\Accessed::class,
-            'changed' => SortMethods\Changed::class,
-            'modified' => SortMethods\Modified::class,
-            'name' => SortMethods\Name::class,
-            'natural' => SortMethods\Natural::class,
-            'type' => SortMethods\Type::class,
-        ]);
-    },
+    /** Array of sort options mapped to their respective classes */
+    'sort_methods' => [
+        'accessed' => SortMethods\Accessed::class,
+        'changed' => SortMethods\Changed::class,
+        'modified' => SortMethods\Modified::class,
+        'name' => SortMethods\Name::class,
+        'natural' => SortMethods\Natural::class,
+        'type' => SortMethods\Type::class,
+    ],
 
-    /** Collection of available translation languages */
-    'translations' => function (): Collection {
-        return Collection::make([
-            'de', 'en', 'es', 'fr', 'id', 'it', 'kr', 'nl',
-            'pl', 'pt-BR', 'ro', 'ru', 'zh-CN', 'zh-TW'
-        ]);
-    },
+    /** Array of available translation languages */
+    'translations' => [
+        'de', 'en', 'es', 'fr', 'id', 'it', 'kr', 'nl',
+        'pl', 'pt-BR', 'ro', 'ru', 'zh-CN', 'zh-TW'
+    ],
 
     /** Array of view functions */
     'view_functions' => [
diff --git a/app/src/Bootstrap/MiddlewareManager.php b/app/src/Bootstrap/MiddlewareManager.php
index 8aa50bb..ed8ef5e 100644
--- a/app/src/Bootstrap/MiddlewareManager.php
+++ b/app/src/Bootstrap/MiddlewareManager.php
@@ -32,10 +32,8 @@ class MiddlewareManager
      */
     public function __invoke(): void
     {
-        $this->container->get('middlewares')->each(
-            function ($middleware): void {
-                $this->app->add($middleware);
-            }
-        );
+        foreach ($this->container->get('middlewares') as $middleware) {
+            $this->app->add($middleware);
+        }
     }
 }
diff --git a/app/src/Factories/FinderFactory.php b/app/src/Factories/FinderFactory.php
index 019a3f1..3333c80 100644
--- a/app/src/Factories/FinderFactory.php
+++ b/app/src/Factories/FinderFactory.php
@@ -45,11 +45,11 @@ class FinderFactory
         if ($sortOrder instanceof Closure) {
             $finder->sort($sortOrder);
         } else {
-            if (! $this->container->get('sort_methods')->has($sortOrder)) {
+            if (! array_key_exists($sortOrder, $this->container->get('sort_methods'))) {
                 throw new RuntimeException("Invalid sort option '{$sortOrder}'");
             }
 
-            $this->container->call($this->container->get('sort_methods')->get($sortOrder), [$finder]);
+            $this->container->call($this->container->get('sort_methods')[$sortOrder], [$finder]);
         }
 
         if ($this->container->get('reverse_sort')) {
diff --git a/app/src/Factories/TranslationFactory.php b/app/src/Factories/TranslationFactory.php
index 56ced95..080da76 100644
--- a/app/src/Factories/TranslationFactory.php
+++ b/app/src/Factories/TranslationFactory.php
@@ -32,19 +32,18 @@ class TranslationFactory
     {
         $language = $this->container->get('language');
 
-        if (! $this->container->get('translations')->contains($language)) {
+        if (! in_array($language, $this->container->get('translations'))) {
             throw new RuntimeException("Invalid language option '{$language}'");
         }
 
         $translator = new Translator($language);
         $translator->addLoader('yaml', new YamlFileLoader());
 
-        $this->container->get('translations')->each(
-            function (string $language) use ($translator): void {
-                $resource = sprintf($this->container->get('translations_path') . '/%s.yaml', $language);
-                $translator->addResource('yaml', $resource, $language);
-            }
-        );
+        foreach ($this->container->get('translations') as $language) {
+            $translator->addResource('yaml', sprintf(
+                '%s/%s.yaml', $this->container->get('translations_path'), $language
+            ), $language);
+        }
 
         return $translator;
     }