From 94f0bb0f56723e540355cef1cacf51ddf1056a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?William=20=C3=85str=C3=B6m?= <william@pixney.com>
Date: Sat, 7 Sep 2019 14:26:50 +0200
Subject: [PATCH 001/256] One viewport is enough.

---
 resources/stubs/addons/resources/views/partials/metadata.twig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/stubs/addons/resources/views/partials/metadata.twig b/resources/stubs/addons/resources/views/partials/metadata.twig
index 97fdf2816..1a398c843 100644
--- a/resources/stubs/addons/resources/views/partials/metadata.twig
+++ b/resources/stubs/addons/resources/views/partials/metadata.twig
@@ -4,7 +4,7 @@
   Any other head element should come *after* these tags.
 #}
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0,shrink-to-fit=no">
 
 <!-- Locale -->
 <meta http-equiv="Content-Language" content="{{ config('app.locale') }}">
@@ -15,7 +15,6 @@
 <!-- Meta Tags -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 <meta name="description" content="{{ trans(template.meta_description) }}"/>
 
 {{ template.includes.render('meta')|raw }}

From 109186838d200696f7c01e93bec3b21415cd3a6d Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Thu, 24 Oct 2019 13:37:43 -0700
Subject: [PATCH 002/256] Add docs on how to extend the ajax form data.

Add docs on how to extend the ajax form data.
---
 docs/en/07.ui/01.forms/02.configuration/07.ajax.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/07.ui/01.forms/02.configuration/07.ajax.md b/docs/en/07.ui/01.forms/02.configuration/07.ajax.md
index f954612a6..34f04d06c 100644
--- a/docs/en/07.ui/01.forms/02.configuration/07.ajax.md
+++ b/docs/en/07.ui/01.forms/02.configuration/07.ajax.md
@@ -20,6 +20,11 @@ You can also flag forms as ajax on the fly.
 $builder->setAjax(true);
 ```
 
+## Custom Data
+
+You can easily add custom data to the JSON response by adding `public function onJsonResponse($data){}` to your form builder. This will allow you to modify the array before it being set in the form response.
+
+
 Ajax forms are designed to be included in a modal by default but you can configure it to display using options or however you like.
 
 > **In Development:** The Ajax API is still being developed. While ajax forms are usable, more robust JSON response information is still missing.{.note}

From 1e48164ca700cff8885bfbddc8c507e33e34a6a1 Mon Sep 17 00:00:00 2001
From: Michal Haracewiat <michal.haracewiat@selectra.info>
Date: Fri, 25 Oct 2019 12:55:31 +0200
Subject: [PATCH 003/256] Fix the point default

Script attends to load wrong config option. Assuming the dot (.) is a
defualt value.
---
 src/Support/Currency.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Support/Currency.php b/src/Support/Currency.php
index 27d5ff736..a26b73046 100644
--- a/src/Support/Currency.php
+++ b/src/Support/Currency.php
@@ -40,7 +40,7 @@ public function format($number, $currency = null, array $options = [])
         $point     = array_get(
             $options,
             'point',
-            config('streams::currencies.supported.' . $currency . '.point' . '.')
+            config('streams::currencies.supported.' . $currency . '.point', '.')
         );
 
         $prefix = null;
@@ -80,7 +80,7 @@ public function normalize($number, $currency = null, array $options = [])
         $point     = array_get(
             $options,
             'point',
-            config('streams::currencies.supported.' . $currency . '.point' . '.')
+            config('streams::currencies.supported.' . $currency . '.point', '.')
         );
 
         return number_format(floor(($number * 100)) / 100, $decimals, $point, $separator);

From 1d61b84acb1119cbc126d8bf17426961cb9cc83e Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 28 Oct 2019 14:01:34 -0500
Subject: [PATCH 004/256] Add ID support to field type attributes.

---
 docs/en/01.prologue/02.change-log.md       | 5 +++++
 resources/views/form/partials/wrapper.twig | 6 ++----
 src/Addon/FieldType/FieldType.php          | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f87b9ea5c..ef725bc80 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.179] - 2019-10-28
+#### Added
+- Added IDs to default field type attributes. 
+
+
 ### [1.6.178] - 2019-10-22
 #### Fixed
 - Fix custom error message field prefixes: https://github.com/anomalylabs/streams-platform/pull/673
diff --git a/resources/views/form/partials/wrapper.twig b/resources/views/form/partials/wrapper.twig
index b095ed5db..ed9076b16 100644
--- a/resources/views/form/partials/wrapper.twig
+++ b/resources/views/form/partials/wrapper.twig
@@ -1,6 +1,4 @@
-<div
-        {{ field_type.locale ? 'lang=' ~ field_type.locale }}
-        class="
+<div {{ field_type.locale ? 'lang=' ~ field_type.locale }} class="
             form-group
             {{ form.hasErrors() ? form.hasError(field_type.input_name) ? 'has-danger has-error' : 'has-success' }}
             {{ field_type.input_name }}-field
@@ -9,7 +7,7 @@
             ">
 
     {% if field_type.object.label != false and field_type.config.disable_label != true %}
-        <label class="control-label">
+        <label class="control-label" for="{{ field_type.attributes.id }}">
             {{ field_type.object.label|raw }}
 
             {% if field_type.required %}
diff --git a/src/Addon/FieldType/FieldType.php b/src/Addon/FieldType/FieldType.php
index cb74f24fa..a5a044cd5 100644
--- a/src/Addon/FieldType/FieldType.php
+++ b/src/Addon/FieldType/FieldType.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Addon\FieldType;
+<?php
+
+namespace Anomaly\Streams\Platform\Addon\FieldType;
 
 use Anomaly\Streams\Platform\Addon\Addon;
 use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
@@ -608,7 +610,7 @@ public function getSearchableValue()
             $value = json_encode($value);
         }
 
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
@@ -768,6 +770,7 @@ public function getAttributes()
                     'data-field'      => $this->getField(),
                     'data-field_name' => $this->getFieldName(),
                     'data-provides'   => $this->getNamespace(),
+                    'id'              => $this->getInputName(),
                 ],
                 $this->attributes
             )

From 3193057da9ecf7562653fca2481a53383a5d93ea Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 28 Oct 2019 14:04:22 -0500
Subject: [PATCH 005/256] Added ID support

---
 docs/en/01.prologue/02.change-log.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f1734638c..a2c700086 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,12 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.15] - 2019-10-28
+#### Added
+- Added default ID support to field types.
+- Added "for" attribute to input wrapper view.
+
+
 ### [1.7.14] - 2019-10-22
 #### Fixed
 - Fixed issue when setting template data using `template` helper.

From 39cc89cccd276d2386bea6c0661581fe10a4607a Mon Sep 17 00:00:00 2001
From: Robin Radic <rradic@hotmail.com>
Date: Wed, 30 Oct 2019 09:19:26 +0100
Subject: [PATCH 006/256] Remove run method from seeder to allow dependency
 injection again (as does default laravel)

---
 src/Database/Seeder/Seeder.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Database/Seeder/Seeder.php b/src/Database/Seeder/Seeder.php
index 8ab22a557..3dc092b26 100644
--- a/src/Database/Seeder/Seeder.php
+++ b/src/Database/Seeder/Seeder.php
@@ -37,12 +37,4 @@ public function __construct()
         $this->streams     = app(StreamRepositoryInterface::class);
         $this->assignments = app(AssignmentRepositoryInterface::class);
     }
-
-    /**
-     * Run the seeder.
-     */
-    public function run()
-    {
-        # code...
-    }
 }

From 2b4ab9789aa35395981cafd03ff223f1fc38753c Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 6 Nov 2019 15:27:23 -0600
Subject: [PATCH 007/256] Update constants.twig

---
 resources/views/partials/constants.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/constants.twig b/resources/views/partials/constants.twig
index d69cde532..c114d47fa 100644
--- a/resources/views/partials/constants.twig
+++ b/resources/views/partials/constants.twig
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-    const APPLICATION_URL = "{{ url() }}";
+    const APPLICATION_URL = "{{ url()|escape }}";
     const APPLICATION_REFERENCE = "{{ env('APPLICATION_REFERENCE') }}";
     const APPLICATION_DOMAIN = "{{ env('APPLICATION_DOMAIN') }}";
 

From 2326f07179e65c6c1543c31d6f28a6ba99d08473 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 6 Nov 2019 15:30:00 -0600
Subject: [PATCH 008/256] Escape URL constant

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index ef725bc80..a645cd1eb 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.180] - 2019-11-06
+#### Changed
+- Escaped the URL in `constants.twig` partial.
+
+
 ### [1.6.179] - 2019-10-28
 #### Added
 - Added IDs to default field type attributes. 

From e3e4c5009d459a4f09c67ca1a5fbf1436048d540 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 7 Nov 2019 23:32:03 -0600
Subject: [PATCH 009/256] Update 07.ajax.md

---
 docs/en/07.ui/01.forms/02.configuration/07.ajax.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/07.ui/01.forms/02.configuration/07.ajax.md b/docs/en/07.ui/01.forms/02.configuration/07.ajax.md
index 34f04d06c..27caa8fee 100644
--- a/docs/en/07.ui/01.forms/02.configuration/07.ajax.md
+++ b/docs/en/07.ui/01.forms/02.configuration/07.ajax.md
@@ -22,7 +22,7 @@ $builder->setAjax(true);
 
 ## Custom Data
 
-You can easily add custom data to the JSON response by adding `public function onJsonResponse($data){}` to your form builder. This will allow you to modify the array before it being set in the form response.
+You can easily add custom data to the JSON response by adding `public function onJsonResponse(Collection $data){}` to your form builder. This will allow you to modify the array before it being set in the form response.
 
 
 Ajax forms are designed to be included in a modal by default but you can configure it to display using options or however you like.

From d83a5361a10f38e155a42e562bdb439379f3c487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Mon, 11 Nov 2019 10:51:09 +0700
Subject: [PATCH 010/256] Fixed remote asset on non root hosting

---
 src/Asset/Asset.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index dbae6b79b..6c6653485 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -323,6 +323,10 @@ public function path($collection, array $filters = [], $basePath = true)
             $this->add($collection, $collection, $filters, true);
         }
 
+        if (starts_with($collection, ['http', '//'])) {
+            $basePath = false;
+        }
+
         return ($basePath ? request()->getBasePath() : '') . $this->getPath($collection, $filters);
     }
 

From ec521ede293d61c4a20987e401288d250e39ed96 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 14 Nov 2019 12:00:59 -0600
Subject: [PATCH 011/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index a645cd1eb..2790c5da7 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.181] - 2019-11-14
+#### Fixed
+- Fixed issue with remote assets and non-root hosting locations.
+
+
 ### [1.6.180] - 2019-11-06
 #### Changed
 - Escaped the URL in `constants.twig` partial.

From 824ee6fd0122ffc6b66003e8ba0aa83ed70d4391 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 14 Nov 2019 12:16:44 -0600
Subject: [PATCH 012/256] FindWithTrashed

---
 docs/en/01.prologue/02.change-log.md              |  3 +++
 .../Contract/EloquentRepositoryInterface.php      | 12 +++++++++++-
 src/Model/EloquentRepository.php                  | 15 ++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 2790c5da7..8e86ead9b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -33,6 +33,9 @@ Features that are deprecated will generally be removed in the next `minor` updat
 #### Fixed
 - Fixed issue with remote assets and non-root hosting locations.
 
+#### Added
+- Added `findWithTrashed($id)` shortcut method to base repositories.
+
 
 ### [1.6.180] - 2019-11-06
 #### Changed
diff --git a/src/Model/Contract/EloquentRepositoryInterface.php b/src/Model/Contract/EloquentRepositoryInterface.php
index ffedc01db..118e36397 100644
--- a/src/Model/Contract/EloquentRepositoryInterface.php
+++ b/src/Model/Contract/EloquentRepositoryInterface.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Model\Contract;
+<?php
+
+namespace Anomaly\Streams\Platform\Model\Contract;
 
 use Anomaly\Streams\Platform\Model\EloquentCollection;
 use Anomaly\Streams\Platform\Model\EloquentModel;
@@ -44,6 +46,14 @@ public function allWithoutRelations();
      */
     public function find($id);
 
+    /**
+     * Find a record by it's ID including trash.
+     *
+     * @param $id
+     * @return EloquentModel
+     */
+    public function findWithTrashed($id);
+
     /**
      * Return all records without relations.
      *
diff --git a/src/Model/EloquentRepository.php b/src/Model/EloquentRepository.php
index 708319735..d0feebf69 100644
--- a/src/Model/EloquentRepository.php
+++ b/src/Model/EloquentRepository.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Model;
+<?php
+
+namespace Anomaly\Streams\Platform\Model;
 
 use Anomaly\Streams\Platform\Entry\EntryModel;
 use Anomaly\Streams\Platform\Model\Contract\EloquentRepositoryInterface;
@@ -65,6 +67,17 @@ public function find($id)
         return $this->model->find($id);
     }
 
+    /**
+     * Find a record by it's ID including trash.
+     *
+     * @param $id
+     * @return EloquentModel
+     */
+    public function findWithTrashed($id)
+    {
+        return $this->model->withTrashed()->find($id);
+    }
+
     /**
      * Return all records without relations.
      *

From 4bc752b8f2853f34d24620c088f916e1e5216afa Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 14 Nov 2019 12:26:47 -0600
Subject: [PATCH 013/256] Fix issue with configured bindings.

---
 docs/en/01.prologue/02.change-log.md |  5 +++++
 src/StreamsServiceProvider.php       | 15 ++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 6a73287be..5c26d257c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.18] - 2019-11-14
+#### Fixed
+- Fix issue with `config/streams.php` bindings and singletons not working.
+
+
 ### [1.7.17] - 2019-11-14
 #### Fixed
 - Fixed issue with remote assets and non-root hosting locations.
diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 84c104e51..ddaa21439 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -355,15 +355,12 @@ public function register()
             }
         }
 
-        // Register bindings.
-        foreach (array_merge($this->bindings, config('streams.bindings', [])) as $abstract => $concrete) {
-            $this->app->bind($abstract, $concrete);
-        }
-
-        // Register singletons.
-        foreach (array_merge($this->singletons, config('streams.singletons', [])) as $abstract => $concrete) {
-            $this->app->singleton($abstract, $concrete);
-        }
+        /**
+         * Merge mindings with config and leave
+         * for Laravel to handle this later.
+         */
+        $this->bindings = array_merge($this->bindings, config('streams.bindings', []));
+        $this->singletons = array_merge($this->singletons, config('streams.singletons', []));
 
         // Register streams other providers.
         foreach (array_merge($this->providers, config('streams.providers', [])) as $provider) {

From 228a0a2ef7321d7b0748d7bc0590e06eec864a65 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 14 Nov 2019 12:40:20 -0600
Subject: [PATCH 014/256] Fix issue with env:set

---
 docs/en/01.prologue/02.change-log.md |  1 +
 src/Application/Console/EnvSet.php   | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 5c26d257c..8d384c0d4 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -32,6 +32,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ### [1.7.18] - 2019-11-14
 #### Fixed
 - Fix issue with `config/streams.php` bindings and singletons not working.
+- Fix issue with `env:set` command mucking up the formatting in the file.
 
 
 ### [1.7.17] - 2019-11-14
diff --git a/src/Application/Console/EnvSet.php b/src/Application/Console/EnvSet.php
index fff9955d8..92c2cb9a6 100644
--- a/src/Application/Console/EnvSet.php
+++ b/src/Application/Console/EnvSet.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Application\Console;
+<?php
+
+namespace Anomaly\Streams\Platform\Application\Console;
 
 use Anomaly\Streams\Platform\Application\Command\ReadEnvironmentFile;
 use Anomaly\Streams\Platform\Application\Command\WriteEnvironmentFile;
@@ -40,11 +42,9 @@ public function handle()
 
         list($variable, $value) = explode('=', $line, 2);
 
-        $data = $this->dispatchNow(new ReadEnvironmentFile());
-
-        array_set($data, $variable, $value);
+        $contents = preg_replace("/{$variable}=.+/", "{$variable}=\"{$value}\"", file_get_contents(base_path('.env')));
 
-        $this->dispatchNow(new WriteEnvironmentFile($data));
+        file_put_contents(base_path('.env'), $contents);
     }
 
     /**

From f5f5bdc17fb0f6ae153a92cc0d4424ac8fa05d83 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 18 Nov 2019 17:06:18 -0600
Subject: [PATCH 015/256] Cherry pick withCookie middleware fix.

---
 docs/en/01.prologue/02.change-log.md |  5 +++++
 src/Http/Middleware/ProxySession.php | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 8e86ead9b..d70e27993 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.182] - 2019-11-18
+#### Fixed
+- Cherry picked `withCookie` middleware issue from `1.7`.
+
+
 ### [1.6.181] - 2019-11-14
 #### Fixed
 - Fixed issue with remote assets and non-root hosting locations.
diff --git a/src/Http/Middleware/ProxySession.php b/src/Http/Middleware/ProxySession.php
index 9268055df..1f9206ff1 100644
--- a/src/Http/Middleware/ProxySession.php
+++ b/src/Http/Middleware/ProxySession.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Http\Middleware;
+<?php
+
+namespace Anomaly\Streams\Platform\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
@@ -27,9 +29,14 @@ public function handle(Request $request, Closure $next)
     {
         $check = auth()->check();
 
-        return $next($request)
-            ->withCookie(
+        $response = $next($request);
+
+        if (method_exists($response, 'withCookie')) {
+            return $response->withCookie(
                 cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1)
             );
+        }
+
+        return $response;
     }
 }

From c4c23a591073e445849725c854a3a8f829ad5683 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 9 Dec 2019 00:39:28 -0600
Subject: [PATCH 016/256] Add the rest of the excluded paths to this
 middleware. Just like the cache kernel.

---
 src/Http/Middleware/HttpCache.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Http/Middleware/HttpCache.php b/src/Http/Middleware/HttpCache.php
index 8714855b4..dba83f306 100644
--- a/src/Http/Middleware/HttpCache.php
+++ b/src/Http/Middleware/HttpCache.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Http\Middleware;
+<?php
+
+namespace Anomaly\Streams\Platform\Http\Middleware;
 
 use Anomaly\Streams\Platform\Message\MessageBag;
 use Closure;
@@ -25,9 +27,17 @@ class HttpCache
      * @var array
      */
     protected $excluded = [
+        '/admin',
+        '/admin/*',
         '/streams/*-field_type/*',
         '/streams/*-extension/*',
         '/streams/*-module/*',
+        '/entry/handle/*',
+        '/form/handle/*',
+        '/locks/touch',
+        '/locks/release',
+        '/logout*',
+        '/login*',
     ];
 
     /**
@@ -172,7 +182,7 @@ function ($line) {
         }
 
         // Merge system excluded routes.
-        $excluded = array_merge((array)$excluded, $this->excluded);
+        $excluded = array_merge((array) $excluded, $this->excluded);
 
         foreach ($excluded as $path) {
             if (str_is($path, $request->getPathInfo())) {
@@ -195,7 +205,7 @@ function ($line) {
             );
         }
 
-        foreach ((array)$rules as $rule) {
+        foreach ((array) $rules as $rule) {
 
             $parts = explode(' ', $rule);
 
@@ -229,5 +239,4 @@ function ($line) {
 
         return $response;
     }
-
 }

From f1f5c1d56b493c7c1a17286d649f11a965c5dc83 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 9 Dec 2019 00:40:46 -0600
Subject: [PATCH 017/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index d70e27993..1ba942a4e 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.183] - 2019-12-09
+#### Changed
+- Added the rest of the `excluded` paths from `CacheKernel` to the `HttpCache` middleware. 
+
+
 ### [1.6.182] - 2019-11-18
 #### Fixed
 - Cherry picked `withCookie` middleware issue from `1.7`.

From c1daf2743507126d868264be7faaab1e5030deaf Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 19 Dec 2019 22:21:28 -0600
Subject: [PATCH 018/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 8d384c0d4..cf809c2e6 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.19] - 2019-12-19
+#### Changed
+- Remove unused `run` method in base seeder class. This blocked dependency injection due to declaration compatibility.
+
+
 ### [1.7.18] - 2019-11-14
 #### Fixed
 - Fix issue with `config/streams.php` bindings and singletons not working.

From 03f35f70e065764f098b32fd3bc98b1b3c65d8ba Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 2 Jan 2020 23:00:31 -0600
Subject: [PATCH 019/256] Fixed issue with deep attributes and custom
 validation not working properly.

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 src/Ui/Form/FormExtender.php         | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 1ba942a4e..77bee2f57 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.184] - 2020-01-02
+#### Fixed
+- Fixed issue with deep attributes and custom validation not working properly.
+
+
 ### [1.6.183] - 2019-12-09
 #### Changed
 - Added the rest of the `excluded` paths from `CacheKernel` to the `HttpCache` middleware. 
diff --git a/src/Ui/Form/FormExtender.php b/src/Ui/Form/FormExtender.php
index befcd0b0a..c1907a84c 100644
--- a/src/Ui/Form/FormExtender.php
+++ b/src/Ui/Form/FormExtender.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form;
+<?php
+
+namespace Anomaly\Streams\Platform\Ui\Form;
 
 use Anomaly\Streams\Platform\Addon\FieldType\FieldType;
 use Illuminate\Contracts\Container\Container;
@@ -65,6 +67,10 @@ protected function registerValidators(Factory $factory, FormBuilder $builder, Fi
                 $rule,
                 function ($attribute, $value, $parameters, Validator $validator) use ($handler, $builder, $fieldType) {
 
+                    if ($prefix = $builder->getFormOption('prefix')) {
+                        $attribute = preg_replace("/^{$prefix}/", '', $attribute, 1);
+                    }
+
                     $fieldType = $builder->getFormField($attribute) ?: $fieldType;
 
                     return $this->container->call(

From 1255cc23caff85afd01ddc3a85c8272220632e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 3 Jan 2020 17:33:19 +0700
Subject: [PATCH 020/256] UrlGenerator interface should be a alias of url

---
 src/StreamsServiceProvider.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 84c104e51..acb78c464 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -92,7 +92,6 @@ class StreamsServiceProvider extends ServiceProvider
     public $bindings = [
         'Illuminate\Contracts\Debug\ExceptionHandler'                                    => 'Anomaly\Streams\Platform\Exception\ExceptionHandler',
         'Illuminate\Routing\UrlGenerator'                                                => 'Anomaly\Streams\Platform\Routing\UrlGenerator',
-        'Illuminate\Contracts\Routing\UrlGenerator'                                      => 'Anomaly\Streams\Platform\Routing\UrlGenerator',
         'Illuminate\Database\Migrations\MigrationRepositoryInterface'                    => 'Anomaly\Streams\Platform\Database\Migration\MigrationRepository',
         'Anomaly\Streams\Platform\Entry\EntryModel'                                      => 'Anomaly\Streams\Platform\Entry\EntryModel',
         'Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface'               => 'Anomaly\Streams\Platform\Entry\EntryRepository',
@@ -124,7 +123,6 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public $singletons = [
         'Illuminate\Database\Migrations\Migrator'                                            => 'Anomaly\Streams\Platform\Database\Migration\Migrator',
-        'Illuminate\Contracts\Routing\UrlGenerator'                                          => 'Anomaly\Streams\Platform\Routing\UrlGenerator',
         'Anomaly\Streams\Platform\Routing\UrlGenerator'                                      => 'Anomaly\Streams\Platform\Routing\UrlGenerator',
         'Intervention\Image\ImageManager'                                                    => 'image',
         'League\Flysystem\MountManager'                                                      => 'League\Flysystem\MountManager',

From e0a45f63c201921050992b1dd17b4ccf85b11dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 3 Jan 2020 18:22:55 +0700
Subject: [PATCH 021/256] Override url singleton

---
 src/StreamsServiceProvider.php | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index acb78c464..27df0ec1c 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -211,6 +211,7 @@ public function boot(Dispatcher $events)
         $this->dispatchNow(new AddImageNamespaces());
         $this->dispatchNow(new ConfigureRequest());
         $this->dispatchNow(new ConfigureScout());
+        $this->overrideUrlSingleton();
 
         // Observe our base models.
         EntryModel::observe(EntryObserver::class);
@@ -472,4 +473,40 @@ function () {
             ]
         );
     }
+
+    protected function overrideUrlSingleton()
+    {
+        $this->app->singleton('url', function ($app) {
+            $routes = $app['router']->getRoutes();
+
+            $url = new \Anomaly\Streams\Platform\Routing\UrlGenerator(
+                $routes, $app->rebinding(
+                    'request', function ($app, $request) {
+                        $app['url']->setRequest($request);
+                    }
+                )
+            );
+
+            // Next we will set a few service resolvers on the URL generator so it can
+            // get the information it needs to function. This just provides some of
+            // the convenience features to this URL generator like "signed" URLs.
+            $url->setSessionResolver(function () {
+                return $this->app['session'];
+            });
+
+            $url->setKeyResolver(function () {
+                return $this->app->make('config')->get('app.key');
+            });
+
+            // If the route collection is "rebound", for example, when the routes stay
+            // cached for the application, we will need to rebind the routes on the
+            // URL generator instance so it has the latest version of the routes.
+            $app->rebinding('routes', function ($app, $routes) {
+                $app['url']->setRoutes($routes);
+            });
+
+            return $url;
+        });
+    }
+
 }

From eb1c4bdc605950ad849434eae6b3dcd34654ce11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 3 Jan 2020 18:23:52 +0700
Subject: [PATCH 022/256] Laravel UrlGenerator should also be an alias of url

---
 src/StreamsServiceProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 27df0ec1c..c466c65e3 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -91,7 +91,6 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public $bindings = [
         'Illuminate\Contracts\Debug\ExceptionHandler'                                    => 'Anomaly\Streams\Platform\Exception\ExceptionHandler',
-        'Illuminate\Routing\UrlGenerator'                                                => 'Anomaly\Streams\Platform\Routing\UrlGenerator',
         'Illuminate\Database\Migrations\MigrationRepositoryInterface'                    => 'Anomaly\Streams\Platform\Database\Migration\MigrationRepository',
         'Anomaly\Streams\Platform\Entry\EntryModel'                                      => 'Anomaly\Streams\Platform\Entry\EntryModel',
         'Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface'               => 'Anomaly\Streams\Platform\Entry\EntryRepository',

From f893ac118b18cfed2a4b66d60b3be09e2c403d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 3 Jan 2020 18:40:16 +0700
Subject: [PATCH 023/256] Should be done before asset

---
 src/StreamsServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index c466c65e3..674d77ef2 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -206,11 +206,11 @@ public function boot(Dispatcher $events)
         $this->dispatchNow(new ConfigureFileCacheStore());
         $this->dispatchNow(new ConfigureTranslator());
         $this->dispatchNow(new AutoloadEntryModels());
+        $this->overrideUrlSingleton();
         $this->dispatchNow(new AddAssetNamespaces());
         $this->dispatchNow(new AddImageNamespaces());
         $this->dispatchNow(new ConfigureRequest());
         $this->dispatchNow(new ConfigureScout());
-        $this->overrideUrlSingleton();
 
         // Observe our base models.
         EntryModel::observe(EntryObserver::class);

From c0d8b5dc3ef65b532403f2a0ea398ffde8c697bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 3 Jan 2020 18:52:25 +0700
Subject: [PATCH 024/256] SP UrlGenerator should bind to url too

---
 src/StreamsServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 674d77ef2..74629492a 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -122,7 +122,7 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public $singletons = [
         'Illuminate\Database\Migrations\Migrator'                                            => 'Anomaly\Streams\Platform\Database\Migration\Migrator',
-        'Anomaly\Streams\Platform\Routing\UrlGenerator'                                      => 'Anomaly\Streams\Platform\Routing\UrlGenerator',
+        'Anomaly\Streams\Platform\Routing\UrlGenerator'                                      => 'url',
         'Intervention\Image\ImageManager'                                                    => 'image',
         'League\Flysystem\MountManager'                                                      => 'League\Flysystem\MountManager',
         'Illuminate\Database\Seeder'                                                         => 'Anomaly\Streams\Platform\Database\Seeder\Seeder',

From f6ad0849379c0bee65ba7322e55be1516fa71fd8 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 3 Jan 2020 09:58:55 -0600
Subject: [PATCH 025/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 77bee2f57..853657361 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### Unreleased
+#### Fixed
+- Fixed issue where `app('url')` was not returning Streams' URL generator.
+
+
 ### [1.6.184] - 2020-01-02
 #### Fixed
 - Fixed issue with deep attributes and custom validation not working properly.

From bf05f74f9cb5268ab1e3e88a0ab0bce123b61ed5 Mon Sep 17 00:00:00 2001
From: Robin Radic <rradic@hotmail.com>
Date: Sun, 5 Jan 2020 13:25:31 +0100
Subject: [PATCH 026/256] Change argument to allow any value to be assigned to
 an icon. This make it possible to assign a string as value as that is the
 appropriate value instead of an array

---
 src/Ui/Icon/IconRegistry.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Ui/Icon/IconRegistry.php b/src/Ui/Icon/IconRegistry.php
index 2955f71c3..57b20784c 100644
--- a/src/Ui/Icon/IconRegistry.php
+++ b/src/Ui/Icon/IconRegistry.php
@@ -172,13 +172,13 @@ public function get($icon)
     /**
      * Register an icon.
      *
-     * @param        $icon
-     * @param  array $parameters
+     * @param  string $icon
+     * @param  string $value
      * @return $this
      */
-    public function register($icon, array $parameters)
+    public function register($icon, $value)
     {
-        array_set($this->icons, $icon, $parameters);
+        array_set($this->icons, $icon, $value);
 
         return $this;
     }

From 3462f0e5bef91f87ceb8bcc40dfb091fde846da8 Mon Sep 17 00:00:00 2001
From: Robin Radic <rradic@hotmail.com>
Date: Mon, 6 Jan 2020 14:20:19 +0100
Subject: [PATCH 027/256] Allow adding custom logic to providers. (for example;
 extra AddonServiceProvider shortcut helper properties)

---
 src/Addon/AddonProvider.php        |  8 ++++++++
 src/Addon/AddonServiceProvider.php |  3 ++-
 src/Traits/FiresCallbacks.php      | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index e5dded386..fd0e576ad 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -6,6 +6,7 @@
 use Anomaly\Streams\Platform\Addon\Module\Module;
 use Anomaly\Streams\Platform\Addon\Theme\Theme;
 use Anomaly\Streams\Platform\Http\Middleware\MiddlewareCollection;
+use Anomaly\Streams\Platform\Traits\FiresCallbacks;
 use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
 use Anomaly\Streams\Platform\View\ViewMobileOverrides;
 use Anomaly\Streams\Platform\View\ViewOverrides;
@@ -16,6 +17,7 @@
 use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Routing\Router;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * Class AddonProvider
@@ -26,6 +28,8 @@
  */
 class AddonProvider
 {
+    use Macroable;
+    use FiresCallbacks;
 
     /**
      * The cached services.
@@ -143,6 +147,8 @@ public function register(Addon $addon)
 
         $this->providers[] = $provider = $addon->newServiceProvider();
 
+        $this->fire('register', [ 'provider' => $provider, 'addon' => $addon, 'addonProvider' => $this ]);
+
         $this->bindAliases($provider);
         $this->bindClasses($provider);
         $this->bindSingletons($provider);
@@ -167,6 +173,8 @@ public function register(Addon $addon)
 
         // Call other providers last.
         $this->registerProviders($provider);
+
+        $this->fire('registered', [ 'provider' => $provider, 'addon' => $addon, 'addonProvider' => $this ]);
     }
 
     /**
diff --git a/src/Addon/AddonServiceProvider.php b/src/Addon/AddonServiceProvider.php
index a50aa44cd..3d57ed251 100644
--- a/src/Addon/AddonServiceProvider.php
+++ b/src/Addon/AddonServiceProvider.php
@@ -6,6 +6,7 @@
 use Anomaly\Streams\Platform\Addon\Theme\Theme;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * Class AddonServiceProvider
@@ -16,7 +17,7 @@
  */
 class AddonServiceProvider
 {
-
+    use Macroable;
     use DispatchesJobs;
 
     /**
diff --git a/src/Traits/FiresCallbacks.php b/src/Traits/FiresCallbacks.php
index 200ff3ea1..fba4edea5 100644
--- a/src/Traits/FiresCallbacks.php
+++ b/src/Traits/FiresCallbacks.php
@@ -42,6 +42,24 @@ public function on($trigger, $callback)
         return $this;
     }
 
+    /**
+     * Register a new listener.
+     *
+     * @param $trigger
+     * @param $callback
+     * @return $this
+     */
+    public static function when($trigger, $callback)
+    {
+        $trigger = static::class . '::' . $trigger;
+
+        if ( ! isset(self::$listeners[ $trigger ])) {
+            self::$listeners[ $trigger ] = [];
+        }
+
+        self::$listeners[ $trigger ][] = $callback;
+    }
+
     /**
      * Register a new listener.
      *

From 21daf3817257fa79628f9a8fea0f8d0e450ad330 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 8 Jan 2020 23:02:29 -0600
Subject: [PATCH 028/256] Fix .env generation

---
 docs/en/01.prologue/02.change-log.md           | 5 +++++
 src/Installer/Console/Command/SetOtherData.php | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 853657361..70ed44e05 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -34,6 +34,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Fixed issue where `app('url')` was not returning Streams' URL generator.
 
 
+### [1.6.185] - 2020-01-08
+#### Changed
+- Corrected the `.env` data in order to correctly set `APP_LOCALE`. 
+
+
 ### [1.6.184] - 2020-01-02
 #### Fixed
 - Fixed issue with deep attributes and custom validation not working properly.
diff --git a/src/Installer/Console/Command/SetOtherData.php b/src/Installer/Console/Command/SetOtherData.php
index 6658aa90c..2ee1d59b6 100644
--- a/src/Installer/Console/Command/SetOtherData.php
+++ b/src/Installer/Console/Command/SetOtherData.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Installer\Console\Command;
+<?php
+
+namespace Anomaly\Streams\Platform\Installer\Console\Command;
 
 use Anomaly\Streams\Platform\Support\Collection;
 use Illuminate\Console\Command;
@@ -45,7 +47,7 @@ public function __construct(Collection $data, Command $command)
     public function handle()
     {
         $this->data->put(
-            'LOCALE',
+            'APP_LOCALE',
             $this->command->askWithCompletion(
                 'Enter the default locale',
                 array_keys(config('streams::locales.supported')),

From ab59f5bbe305a1674807fdf40f1a9d322b917403 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 8 Jan 2020 23:04:19 -0600
Subject: [PATCH 029/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index e9a66c6a8..4a87e747d 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.21] - 2020-01-08
+#### Changed
+- Corrected the `.env` data in order to correctly set `APP_LOCALE`. 
+
+
 ### [1.7.20] - 2020-01-02
 #### Fixed
 - Fixed issue with deep attributes and custom validation not working properly.

From 073ae0089712f8940b09c093fcbd2a7bab4aaff8 Mon Sep 17 00:00:00 2001
From: Simon Morris <simon@evoluted.net>
Date: Fri, 17 Jan 2020 16:10:16 +0000
Subject: [PATCH 030/256] Don't show buttons in dropdowns we don't have
 permission to use

---
 src/Ui/Table/Component/Button/ButtonDropdown.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Ui/Table/Component/Button/ButtonDropdown.php b/src/Ui/Table/Component/Button/ButtonDropdown.php
index 22f23cf4d..57b2c610c 100644
--- a/src/Ui/Table/Component/Button/ButtonDropdown.php
+++ b/src/Ui/Table/Component/Button/ButtonDropdown.php
@@ -1,5 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Ui\Table\Component\Button;
 
+use Anomaly\Streams\Platform\Support\Authorizer;
 use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
 
 /**
@@ -47,8 +48,14 @@ public function flatten(TableBuilder $builder)
     public function build(TableBuilder $builder)
     {
         $buttons = $builder->getButtons();
+        $authorizer = resolve(Authorizer::class);
 
         foreach ($buttons as $key => &$button) {
+            if (!$authorizer->authorize($button['permission'])) {
+                // We don't have permission to use this button so hide it
+                continue;
+            }
+
             if ($dropdown = array_get($button, 'parent')) {
                 foreach ($buttons as &$parent) {
                     if (array_get($parent, 'button') == $dropdown) {

From 757caa2c04103a6d024fe0216ed7cdd3f1ac696c Mon Sep 17 00:00:00 2001
From: Simon Morris <simon@evoluted.net>
Date: Fri, 17 Jan 2020 16:12:58 +0000
Subject: [PATCH 031/256] Add isset guard

---
 src/Ui/Table/Component/Button/ButtonDropdown.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ui/Table/Component/Button/ButtonDropdown.php b/src/Ui/Table/Component/Button/ButtonDropdown.php
index 57b2c610c..f423f5c81 100644
--- a/src/Ui/Table/Component/Button/ButtonDropdown.php
+++ b/src/Ui/Table/Component/Button/ButtonDropdown.php
@@ -51,7 +51,7 @@ public function build(TableBuilder $builder)
         $authorizer = resolve(Authorizer::class);
 
         foreach ($buttons as $key => &$button) {
-            if (!$authorizer->authorize($button['permission'])) {
+            if (isset($button['permission']) && !$authorizer->authorize($button['permission'])) {
                 // We don't have permission to use this button so hide it
                 continue;
             }

From ca8955ec64151d662dcaf84c26363b3cac87a858 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 21 Jan 2020 17:08:52 -0600
Subject: [PATCH 032/256] Fix issue where down message was not displaying

---
 docs/en/01.prologue/02.change-log.md          |  5 ++++
 src/Exception/ExceptionHandler.php            |  6 +++--
 .../Middleware/CheckForMaintenanceMode.php    | 24 +++++++++++++------
 src/Model/Command/CascadeDelete.php           |  4 +++-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 4a87e747d..bd47bb74c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.22] - 2020-01-21
+#### Fixed
+- Fixed issue where `--message` option was not working with `php artisan down`.
+
+
 ### [1.7.21] - 2020-01-08
 #### Changed
 - Corrected the `.env` data in order to correctly set `APP_LOCALE`. 
diff --git a/src/Exception/ExceptionHandler.php b/src/Exception/ExceptionHandler.php
index af1dbd5c8..8889d7cd2 100644
--- a/src/Exception/ExceptionHandler.php
+++ b/src/Exception/ExceptionHandler.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Exception;
+<?php
+
+namespace Anomaly\Streams\Platform\Exception;
 
 use Exception;
 use Illuminate\Auth\AuthenticationException;
@@ -99,7 +101,7 @@ protected function renderHttpException(HttpExceptionInterface $e)
             return $this->convertExceptionToResponse($e);
         }
 
-        $summary = 'No Message';//$e->getMessage();
+        $summary = $e->getMessage();
         $headers = $e->getHeaders();
         $code    = $e->getStatusCode();
         $name    = trans("streams::error.{$code}.name");
diff --git a/src/Http/Middleware/CheckForMaintenanceMode.php b/src/Http/Middleware/CheckForMaintenanceMode.php
index 48f79d93d..dd6ff91d3 100644
--- a/src/Http/Middleware/CheckForMaintenanceMode.php
+++ b/src/Http/Middleware/CheckForMaintenanceMode.php
@@ -1,13 +1,17 @@
-<?php namespace Anomaly\Streams\Platform\Http\Middleware;
+<?php
+
+namespace Anomaly\Streams\Platform\Http\Middleware;
 
-use Anomaly\Streams\Platform\Application\Application;
-use Anomaly\Streams\Platform\Support\Authorizer;
-use Anomaly\UsersModule\User\Contract\UserInterface;
 use Closure;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Foundation\Application as Laravel;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Contracts\Auth\Guard;
+use Symfony\Component\HttpFoundation\IpUtils;
+use Anomaly\Streams\Platform\Support\Authorizer;
+use Anomaly\UsersModule\User\Contract\UserInterface;
+use Anomaly\Streams\Platform\Application\Application;
+use Illuminate\Contracts\Foundation\Application as Laravel;
+use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
 
 /**
  * Class CheckForMaintenanceMode
@@ -120,6 +124,12 @@ public function handle(Request $request, Closure $next)
             return $response;
         }
 
-        abort(503);
+        $data = json_decode(file_get_contents($this->app->storagePath() . '/framework/down'), true);
+
+        if (isset($data['allowed']) && IpUtils::checkIp($request->ip(), (array) $data['allowed'])) {
+            return $next($request);
+        }
+
+        throw new MaintenanceModeException($data['time'], $data['retry'], $data['message']);
     }
 }
diff --git a/src/Model/Command/CascadeDelete.php b/src/Model/Command/CascadeDelete.php
index 460248a46..bb4708eb9 100644
--- a/src/Model/Command/CascadeDelete.php
+++ b/src/Model/Command/CascadeDelete.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Model\Command;
+<?php
+
+namespace Anomaly\Streams\Platform\Model\Command;
 
 use Anomaly\Streams\Platform\Model\EloquentCollection;
 use Anomaly\Streams\Platform\Model\EloquentModel;

From 2222954d72abdf2b47411be83b17d188ab2374c8 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 29 Jan 2020 17:58:28 +0300
Subject: [PATCH 033/256] fixed language problem

---
 src/Model/EloquentQueryBuilder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 88f2d6059..96fb52127 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -370,6 +370,7 @@ function ($column) use ($model) {
         $this->query->where(
             function (\Illuminate\Database\Query\Builder $query) use ($model, $locale) {
                 $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));
+                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));
                 $query->orWhereNull($model->getTranslationsTableName() . '.locale');
             }
         );

From a31c94ddb74f03303f7227fd097cc241d4f20434 Mon Sep 17 00:00:00 2001
From: Fatih Alp <fatihalp89@gmail.com>
Date: Mon, 3 Feb 2020 13:02:14 +0300
Subject: [PATCH 034/256] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ed5ba851d..afc0a5a0a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "anomaly/streams-platform",
+    "name": "visiosoft/streams-platform",
     "description": "A powerful, inclusive, modular PHP application engine built lovingly for Laravel.",
     "authors": [
         {

From d72c7d8a98dc04c6b09a0ac2d85a466522ec2b65 Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Mon, 3 Feb 2020 17:03:10 +0300
Subject: [PATCH 035/256] add default lang

---
 src/Model/EloquentQueryBuilder.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 96fb52127..c81fee902 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -369,8 +369,9 @@ function ($column) use ($model) {
          */
         $this->query->where(
             function (\Illuminate\Database\Query\Builder $query) use ($model, $locale) {
-                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));
-                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));
+                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));//active lang
+                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));//system lang
+                $query->orWhere($model->getTranslationsTableName() . '.locale','en');//default lang
                 $query->orWhereNull($model->getTranslationsTableName() . '.locale');
             }
         );

From 2a81368739a00542bd19e9f49c3fd8007527d8c8 Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Tue, 4 Feb 2020 17:24:14 +0300
Subject: [PATCH 036/256] update streams path

---
 src/StreamsServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 127ca16aa..d3373d352 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -382,7 +382,7 @@ function () {
          */
         $this->app->instance(
             'streams.path',
-            $this->app->make('path.base') . '/vendor/anomaly/streams-platform'
+            $this->app->make('path.base') . '/vendor/visiosoft/streams-platform'
         );
 
         /*

From 36bc5af2794802a089e78691669fc75d5df69ced Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 5 Feb 2020 12:43:03 +0300
Subject: [PATCH 037/256] change anomaly

---
 README.md                                     |  4 +-
 docs/en/01.prologue/03.upgrade-guide.md       |  2 +-
 docs/en/02.getting-started/02.introduction.md |  2 +-
 docs/en/02.getting-started/03.installation.md |  2 +-
 .../en/02.getting-started/04.configuration.md |  6 +-
 docs/en/03.reference/02.hints.md              | 10 +--
 docs/en/05.core-concepts/04.image.md          |  2 +-
 src/Addon/Addon.php                           |  2 +-
 src/Addon/AddonManager.php                    |  2 +-
 src/Addon/AddonPaths.php                      |  2 +-
 src/Addon/Console/Command/ScaffoldTheme.php   |  2 +-
 .../Console/Command/WriteAddonButtonLang.php  |  2 +-
 src/Addon/Console/Command/WriteAddonClass.php |  2 +-
 .../Console/Command/WriteAddonComposer.php    |  2 +-
 .../Console/Command/WriteAddonFeatureTest.php |  2 +-
 .../Console/Command/WriteAddonFieldLang.php   |  2 +-
 .../Console/Command/WriteAddonGitIgnore.php   |  2 +-
 src/Addon/Console/Command/WriteAddonLang.php  |  2 +-
 .../Console/Command/WriteAddonPackage.php     |  2 +-
 .../Command/WriteAddonPermissionLang.php      |  2 +-
 .../Console/Command/WriteAddonPermissions.php |  2 +-
 .../Console/Command/WriteAddonPhpUnit.php     |  2 +-
 .../Console/Command/WriteAddonSectionLang.php |  2 +-
 .../Command/WriteAddonServiceProvider.php     |  2 +-
 .../Console/Command/WriteAddonStreamLang.php  |  2 +-
 .../Console/Command/WriteAddonTestCase.php    |  2 +-
 .../Console/Command/WriteAddonWebpack.php     |  2 +-
 .../Console/Command/WriteThemePackage.php     |  2 +-
 .../Console/Command/WriteThemeWebpack.php     |  2 +-
 .../Console/Command/MigrateStreams.php        |  4 +-
 .../Command/LoadApplicationInstallers.php     |  2 +-
 .../Console/Command/LoadCoreInstallers.php    |  2 +-
 src/Lang/Loader.php                           |  2 +-
 .../Console/Command/WriteEntityCollection.php |  2 +-
 .../Console/Command/WriteEntityController.php |  2 +-
 .../Console/Command/WriteEntityCriteria.php   |  2 +-
 .../Console/Command/WriteEntityFactory.php    |  2 +-
 .../Command/WriteEntityFormBuilder.php        |  2 +-
 .../Console/Command/WriteEntityModel.php      |  2 +-
 .../Command/WriteEntityModelInterface.php     |  2 +-
 .../Console/Command/WriteEntityObserver.php   |  2 +-
 .../Console/Command/WriteEntityPresenter.php  |  2 +-
 .../Console/Command/WriteEntityRepository.php |  2 +-
 .../WriteEntityRepositoryInterface.php        |  2 +-
 .../Console/Command/WriteEntityRouter.php     |  2 +-
 .../Console/Command/WriteEntityRoutes.php     |  2 +-
 .../Console/Command/WriteEntitySeeder.php     |  2 +-
 .../Command/WriteEntityTableBuilder.php       |  2 +-
 .../Console/Command/WriteEntityTestCases.php  |  2 +-
 .../Command/WriteEntityTreeBuilder.php        |  2 +-
 src/StreamsCompilerProvider.php               | 64 +++++++++----------
 tests/Unit/Asset/AssetTest.php                | 30 ++++-----
 52 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/README.md b/README.md
index 7a68b777c..ea7d830f0 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Streams Platform
 
-[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://packagist.org/packages/anomaly/streams-platform) 
+[![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://packagist.org/packages/visiosoft/streams-platform) 
 [![Build Status](https://scrutinizer-ci.com/g/anomalylabs/streams-platform/badges/build.png?b=master)](https://scrutinizer-ci.com/g/anomalylabs/streams-platform/build-status/master)
 [![Code Quality](http://img.shields.io/scrutinizer/g/anomalylabs/streams-platform.svg)](https://scrutinizer-ci.com/g/anomalylabs/streams-platform/)
-[![Total Downloads](http://img.shields.io/packagist/dt/anomaly/streams.svg)](https://packagist.org/packages/anomaly/streams-platform)
+[![Total Downloads](http://img.shields.io/packagist/dt/anomaly/streams.svg)](https://packagist.org/packages/visiosoft/streams-platform)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/a0a603f4bb094044b9cc681b5a55506a)](https://www.codacy.com/app/RyanThompson/streams-platform?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=anomalylabs/streams-platform&amp;utm_campaign=Badge_Grade)
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/c07a737b-fd8f-43b1-a076-facbfb9ed2b0/small.png)](https://insight.sensiolabs.com/projects/c07a737b-fd8f-43b1-a076-facbfb9ed2b0)
diff --git a/docs/en/01.prologue/03.upgrade-guide.md b/docs/en/01.prologue/03.upgrade-guide.md
index 4e2db8057..ed7851d58 100644
--- a/docs/en/01.prologue/03.upgrade-guide.md
+++ b/docs/en/01.prologue/03.upgrade-guide.md
@@ -29,7 +29,7 @@ Disable package discovery by appending your `composer.json` file: https://github
 Migrate the core as well as all installed addons:
 
 ```bash
-php artisan migrate --path=vendor/anomaly/streams-platform/migrations/application
+php artisan migrate --path=vendor/visiosoft/streams-platform/migrations/application
 php artisan migrate --all-addons
 ```
 
diff --git a/docs/en/02.getting-started/02.introduction.md b/docs/en/02.getting-started/02.introduction.md
index 57da02148..54988f08c 100644
--- a/docs/en/02.getting-started/02.introduction.md
+++ b/docs/en/02.getting-started/02.introduction.md
@@ -8,7 +8,7 @@ title: Introduction
 
 ## What is the Streams Platform?
 
-The Streams Platform is a [Composer package](https://packagist.org/packages/anomaly/streams-platform) that serves as the foundation for PyroCMS. 
+The Streams Platform is a [Composer package](https://packagist.org/packages/visiosoft/streams-platform) that serves as the foundation for PyroCMS. 
 
 Nearly every functionality in every addon for PyroCMS relies on the Streams Platform to do it's work. The Streams Platform is responsible for everything from [Table Builders](../ui/tables) to [Image](../core-principles/image) and [Asset](../core-principles/asset) pipelines to providing the actual addon layer itself. 
 
diff --git a/docs/en/02.getting-started/03.installation.md b/docs/en/02.getting-started/03.installation.md
index 05a6c687c..49f7ef3cc 100644
--- a/docs/en/02.getting-started/03.installation.md
+++ b/docs/en/02.getting-started/03.installation.md
@@ -18,7 +18,7 @@ Before proceeding consider starting your project with a vanilla PyroCMS installa
 
 ### Download with Composer
 
-First download the [package](https://packagist.org/packages/anomaly/streams-platform) by running `composer require anomaly/streams-platform`.
+First download the [package](https://packagist.org/packages/visiosoft/streams-platform) by running `composer require visiosoft/streams-platform`.
 
 ### Register the service provider
 
diff --git a/docs/en/02.getting-started/04.configuration.md b/docs/en/02.getting-started/04.configuration.md
index fc15f3cf6..bb77e9d5e 100644
--- a/docs/en/02.getting-started/04.configuration.md
+++ b/docs/en/02.getting-started/04.configuration.md
@@ -8,7 +8,7 @@ title: Configuration
 
 ## Introduction
 
-Streams configuration can be found in `vendor/anomaly/streams-platform/resources/config`. It is a good idea to look through the configuration files to get acquainted with what's available.
+Streams configuration can be found in `vendor/visiosoft/streams-platform/resources/config`. It is a good idea to look through the configuration files to get acquainted with what's available.
 
 [Configuration Reference](../reference/configuration){.link}
 
@@ -45,6 +45,6 @@ The [Settings](https://pyrocms.com/documentation/settings-module) and [Preferenc
 You can see what settings are bound to what configuration by reviewing the settings and preferences configuration found within the following files:
 
 ```bash
-vendor/anomaly/streams-platform/resources/config/settings/settings.php
-vendor/anomaly/streams-platform/resources/config/preferences/preferences.php
+vendor/visiosoft/streams-platform/resources/config/settings/settings.php
+vendor/visiosoft/streams-platform/resources/config/preferences/preferences.php
 ```
diff --git a/docs/en/03.reference/02.hints.md b/docs/en/03.reference/02.hints.md
index 061dbe56a..7411c1257 100644
--- a/docs/en/03.reference/02.hints.md
+++ b/docs/en/03.reference/02.hints.md
@@ -65,7 +65,7 @@ The `storage::` path hint represents your application's storage directory `stora
 
 ### streams
 
-The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/`.
+The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/`.
 
 ### module
 
@@ -126,7 +126,7 @@ The `storage::` path hint represents your application's storage directory `stora
 
 ### streams
 
-The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/`.
+The `streams::` path hint represents the `resources` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/`.
 
 
 ## Config Hints
@@ -147,7 +147,7 @@ Every addon has a config path hint for the addon's `config` directory `{addon_pa
 
 ### streams
 
-The `streams::` path hint represents the `config` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/config/`.
+The `streams::` path hint represents the `config` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/config/`.
 
 
 ## Translator Hints
@@ -176,7 +176,7 @@ The `theme::` path hint represents the `lang` directory for the `active` theme `
 
 ### streams
 
-The `streams::` path hint represents the `lang` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/lang/`.
+The `streams::` path hint represents the `lang` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/lang/`.
 
 
 ## View Hints
@@ -205,7 +205,7 @@ The `theme::` path hint represents the `views` directory for the `active` theme
 
 ### streams
 
-The `streams::` path hint represents the `views` directory for the Streams Platform `vendor/anomaly/streams-platform/resources/views/`.
+The `streams::` path hint represents the `views` directory for the Streams Platform `vendor/visiosoft/streams-platform/resources/views/`.
 
 ### app
 
diff --git a/docs/en/05.core-concepts/04.image.md b/docs/en/05.core-concepts/04.image.md
index 89d736602..ba39f22a6 100644
--- a/docs/en/05.core-concepts/04.image.md
+++ b/docs/en/05.core-concepts/04.image.md
@@ -105,7 +105,7 @@ All paths are relative to your application's base path.
 *   `asset`: public/app/{app_reference}/
 *   `storage`: storage/streams/{app_reference}/
 *   `download`: public/app/{app_reference}/assets/downloads/
-*   `streams`: vendor/anomaly/streams-platform/resources/
+*   `streams`: vendor/visiosoft/streams-platform/resources/
 *   `bower`: bin/bower_components/
 *   `theme`: {active_theme_path}/resources/
 *   `module`: {active_module_path}/resources/
diff --git a/src/Addon/Addon.php b/src/Addon/Addon.php
index 9ac376cb2..a92dd35fe 100644
--- a/src/Addon/Addon.php
+++ b/src/Addon/Addon.php
@@ -161,7 +161,7 @@ public function isShared()
      */
     public function isTesting()
     {
-        return str_contains($this->getPath(), 'vendor/anomaly/streams-platform/addons/' . $this->getVendor());
+        return str_contains($this->getPath(), 'vendor/visiosoft/streams-platform/addons/' . $this->getVendor());
     }
 
     /**
diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 3130bdaac..2a1460e54 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -141,7 +141,7 @@ function () use ($installed) {
 
             $this->loader->classLoader()->addPsr4(
                 'Anomaly\\StreamsPlatformTests\\',
-                base_path('vendor/anomaly/streams-platform/tests')
+                base_path('vendor/visiosoft/streams-platform/tests')
             );
 
             $this->loader->register();
diff --git a/src/Addon/AddonPaths.php b/src/Addon/AddonPaths.php
index 0030b08e0..3011e0fd6 100644
--- a/src/Addon/AddonPaths.php
+++ b/src/Addon/AddonPaths.php
@@ -189,7 +189,7 @@ public function application()
      */
     public function testing()
     {
-        $path = base_path('vendor/anomaly/streams-platform/addons');
+        $path = base_path('vendor/visiosoft/streams-platform/addons');
 
         if (env('APP_ENV') !== 'testing') {
             return false;
diff --git a/src/Addon/Console/Command/ScaffoldTheme.php b/src/Addon/Console/Command/ScaffoldTheme.php
index 3d44182c2..5788cfc1d 100644
--- a/src/Addon/Console/Command/ScaffoldTheme.php
+++ b/src/Addon/Console/Command/ScaffoldTheme.php
@@ -53,7 +53,7 @@ public function handle(Filesystem $filesystem)
     {
         foreach ($this->copy as $copy) {
             $filesystem->copyDirectory(
-                base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/' . $copy),
+                base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/' . $copy),
                 "{$this->path}/resources/" . $copy
             );
         }
diff --git a/src/Addon/Console/Command/WriteAddonButtonLang.php b/src/Addon/Console/Command/WriteAddonButtonLang.php
index 284907b36..7f10f23bb 100644
--- a/src/Addon/Console/Command/WriteAddonButtonLang.php
+++ b/src/Addon/Console/Command/WriteAddonButtonLang.php
@@ -43,7 +43,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/resources/lang/en/button.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/lang/en/button.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/lang/en/button.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonClass.php b/src/Addon/Console/Command/WriteAddonClass.php
index 7e47e4d23..3feb56387 100644
--- a/src/Addon/Console/Command/WriteAddonClass.php
+++ b/src/Addon/Console/Command/WriteAddonClass.php
@@ -75,7 +75,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/src/{$addon}.php";
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/addons/{$this->type}.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/addons/{$this->type}.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonComposer.php b/src/Addon/Console/Command/WriteAddonComposer.php
index e212857bc..ed2b20455 100644
--- a/src/Addon/Console/Command/WriteAddonComposer.php
+++ b/src/Addon/Console/Command/WriteAddonComposer.php
@@ -75,7 +75,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $prefix = ucfirst(camel_case($vendor)) . '\\\\' . $addon . '\\\\';
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/composer.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/composer.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonFeatureTest.php b/src/Addon/Console/Command/WriteAddonFeatureTest.php
index 5c3b433be..b42353481 100644
--- a/src/Addon/Console/Command/WriteAddonFeatureTest.php
+++ b/src/Addon/Console/Command/WriteAddonFeatureTest.php
@@ -78,7 +78,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/tests/Feature/{$addon}Test.php";
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/addons/tests/feature.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/addons/tests/feature.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonFieldLang.php b/src/Addon/Console/Command/WriteAddonFieldLang.php
index 19436a23a..e937d7f36 100644
--- a/src/Addon/Console/Command/WriteAddonFieldLang.php
+++ b/src/Addon/Console/Command/WriteAddonFieldLang.php
@@ -43,7 +43,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/resources/lang/en/field.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/lang/en/field.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/lang/en/field.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonGitIgnore.php b/src/Addon/Console/Command/WriteAddonGitIgnore.php
index 59412274c..2f1d80fce 100644
--- a/src/Addon/Console/Command/WriteAddonGitIgnore.php
+++ b/src/Addon/Console/Command/WriteAddonGitIgnore.php
@@ -68,7 +68,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/.gitignore";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/gitignore.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/gitignore.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonLang.php b/src/Addon/Console/Command/WriteAddonLang.php
index 446a5bd1a..e2f148f0a 100644
--- a/src/Addon/Console/Command/WriteAddonLang.php
+++ b/src/Addon/Console/Command/WriteAddonLang.php
@@ -62,7 +62,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $type  = ucwords(str_replace('_', ' ', $this->type));
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/lang/en/addon.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/lang/en/addon.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonPackage.php b/src/Addon/Console/Command/WriteAddonPackage.php
index 8616cce4d..276b29e7c 100644
--- a/src/Addon/Console/Command/WriteAddonPackage.php
+++ b/src/Addon/Console/Command/WriteAddonPackage.php
@@ -44,7 +44,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/package.json";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/package.addon.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/package.addon.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonPermissionLang.php b/src/Addon/Console/Command/WriteAddonPermissionLang.php
index b48dcb1cf..5b458f1e8 100644
--- a/src/Addon/Console/Command/WriteAddonPermissionLang.php
+++ b/src/Addon/Console/Command/WriteAddonPermissionLang.php
@@ -43,7 +43,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/resources/lang/en/permission.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/lang/en/permission.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/lang/en/permission.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonPermissions.php b/src/Addon/Console/Command/WriteAddonPermissions.php
index 45d1f570a..adb641b94 100644
--- a/src/Addon/Console/Command/WriteAddonPermissions.php
+++ b/src/Addon/Console/Command/WriteAddonPermissions.php
@@ -43,7 +43,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/resources/config/permissions.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/config/permissions.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/config/permissions.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonPhpUnit.php b/src/Addon/Console/Command/WriteAddonPhpUnit.php
index 8a340e67d..923550749 100644
--- a/src/Addon/Console/Command/WriteAddonPhpUnit.php
+++ b/src/Addon/Console/Command/WriteAddonPhpUnit.php
@@ -68,7 +68,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/phpunit.xml";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/phpunit.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/phpunit.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonSectionLang.php b/src/Addon/Console/Command/WriteAddonSectionLang.php
index 9f313bbcf..685fcd504 100644
--- a/src/Addon/Console/Command/WriteAddonSectionLang.php
+++ b/src/Addon/Console/Command/WriteAddonSectionLang.php
@@ -43,7 +43,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/resources/lang/en/section.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/lang/en/section.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/lang/en/section.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonServiceProvider.php b/src/Addon/Console/Command/WriteAddonServiceProvider.php
index b4f3481d4..3a0251a28 100644
--- a/src/Addon/Console/Command/WriteAddonServiceProvider.php
+++ b/src/Addon/Console/Command/WriteAddonServiceProvider.php
@@ -76,7 +76,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/src/{$provider}.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/provider.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/provider.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonStreamLang.php b/src/Addon/Console/Command/WriteAddonStreamLang.php
index 042733106..cf314e82e 100644
--- a/src/Addon/Console/Command/WriteAddonStreamLang.php
+++ b/src/Addon/Console/Command/WriteAddonStreamLang.php
@@ -43,7 +43,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/resources/lang/en/stream.php";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/resources/lang/en/stream.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/resources/lang/en/stream.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonTestCase.php b/src/Addon/Console/Command/WriteAddonTestCase.php
index 3595d24db..3dcac03e6 100644
--- a/src/Addon/Console/Command/WriteAddonTestCase.php
+++ b/src/Addon/Console/Command/WriteAddonTestCase.php
@@ -76,7 +76,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/tests/{$addon}TestCase.php";
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/addons/tests/test.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/addons/tests/test.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteAddonWebpack.php b/src/Addon/Console/Command/WriteAddonWebpack.php
index a20766e88..625628bea 100644
--- a/src/Addon/Console/Command/WriteAddonWebpack.php
+++ b/src/Addon/Console/Command/WriteAddonWebpack.php
@@ -44,7 +44,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/webpack.mix.js";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/webpack.addon.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/webpack.addon.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteThemePackage.php b/src/Addon/Console/Command/WriteThemePackage.php
index 9b779a20d..2b94b58aa 100644
--- a/src/Addon/Console/Command/WriteThemePackage.php
+++ b/src/Addon/Console/Command/WriteThemePackage.php
@@ -44,7 +44,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/package.json";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/package.theme.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/package.theme.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Addon/Console/Command/WriteThemeWebpack.php b/src/Addon/Console/Command/WriteThemeWebpack.php
index f25683db2..246406993 100644
--- a/src/Addon/Console/Command/WriteThemeWebpack.php
+++ b/src/Addon/Console/Command/WriteThemeWebpack.php
@@ -44,7 +44,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = "{$this->path}/webpack.mix.js";
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/addons/webpack.theme.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/addons/webpack.theme.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Database/Migration/Console/Command/MigrateStreams.php b/src/Database/Migration/Console/Command/MigrateStreams.php
index 9dd71d00e..1754cb79b 100644
--- a/src/Database/Migration/Console/Command/MigrateStreams.php
+++ b/src/Database/Migration/Console/Command/MigrateStreams.php
@@ -22,8 +22,8 @@ class MigrateStreams
      * @var array
      */
     protected $paths = [
-        'vendor/anomaly/streams-platform/migrations/core',
-        'vendor/anomaly/streams-platform/migrations/application',
+        'vendor/visiosoft/streams-platform/migrations/core',
+        'vendor/visiosoft/streams-platform/migrations/application',
     ];
 
     /**
diff --git a/src/Installer/Console/Command/LoadApplicationInstallers.php b/src/Installer/Console/Command/LoadApplicationInstallers.php
index 954eaa917..07086595a 100644
--- a/src/Installer/Console/Command/LoadApplicationInstallers.php
+++ b/src/Installer/Console/Command/LoadApplicationInstallers.php
@@ -44,7 +44,7 @@ function (Kernel $console) {
                         'migrate',
                         [
                             '--force' => true,
-                            '--path'  => 'vendor/anomaly/streams-platform/migrations/application',
+                            '--path'  => 'vendor/visiosoft/streams-platform/migrations/application',
                         ]
                     );
                 }
diff --git a/src/Installer/Console/Command/LoadCoreInstallers.php b/src/Installer/Console/Command/LoadCoreInstallers.php
index d9b43d1c5..8f4136ad5 100644
--- a/src/Installer/Console/Command/LoadCoreInstallers.php
+++ b/src/Installer/Console/Command/LoadCoreInstallers.php
@@ -44,7 +44,7 @@ function (Kernel $console) {
                         'migrate',
                         [
                             '--force' => true,
-                            '--path'  => 'vendor/anomaly/streams-platform/migrations/core',
+                            '--path'  => 'vendor/visiosoft/streams-platform/migrations/core',
                         ]
                     );
                 }
diff --git a/src/Lang/Loader.php b/src/Lang/Loader.php
index fd6beaa1c..c81628fac 100644
--- a/src/Lang/Loader.php
+++ b/src/Lang/Loader.php
@@ -52,7 +52,7 @@ class Loader extends FileLoader
      */
     public function __construct(Filesystem $files, $path)
     {
-        $this->streams = base_path('vendor/anomaly/streams-platform/resources/lang');
+        $this->streams = base_path('vendor/visiosoft/streams-platform/resources/lang');
 
         $this->application = app(Application::class);
         $this->addons      = app(AddonCollection::class);
diff --git a/src/Stream/Console/Command/WriteEntityCollection.php b/src/Stream/Console/Command/WriteEntityCollection.php
index 1dcce9452..22bd517f0 100644
--- a/src/Stream/Console/Command/WriteEntityCollection.php
+++ b/src/Stream/Console/Command/WriteEntityCollection.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Collection.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/collection.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/collection.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityController.php b/src/Stream/Console/Command/WriteEntityController.php
index 282808407..e358bbbdc 100644
--- a/src/Stream/Console/Command/WriteEntityController.php
+++ b/src/Stream/Console/Command/WriteEntityController.php
@@ -88,7 +88,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/Http/Controller/Admin/{$suffix}Controller.php");
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/entity/http/controller/admin.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/entity/http/controller/admin.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityCriteria.php b/src/Stream/Console/Command/WriteEntityCriteria.php
index e50df1356..9b8acad67 100644
--- a/src/Stream/Console/Command/WriteEntityCriteria.php
+++ b/src/Stream/Console/Command/WriteEntityCriteria.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Criteria.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/criteria.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/criteria.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityFactory.php b/src/Stream/Console/Command/WriteEntityFactory.php
index 423361d51..b5e250d63 100644
--- a/src/Stream/Console/Command/WriteEntityFactory.php
+++ b/src/Stream/Console/Command/WriteEntityFactory.php
@@ -69,7 +69,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("factories/{$entity}Factory.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/factory.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/factory.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityFormBuilder.php b/src/Stream/Console/Command/WriteEntityFormBuilder.php
index b05e37241..ed017c5c2 100644
--- a/src/Stream/Console/Command/WriteEntityFormBuilder.php
+++ b/src/Stream/Console/Command/WriteEntityFormBuilder.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/Form/{$entity}FormBuilder.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/form/builder.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/form/builder.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityModel.php b/src/Stream/Console/Command/WriteEntityModel.php
index b60c79314..269162264 100644
--- a/src/Stream/Console/Command/WriteEntityModel.php
+++ b/src/Stream/Console/Command/WriteEntityModel.php
@@ -72,7 +72,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Model.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/model.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/model.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityModelInterface.php b/src/Stream/Console/Command/WriteEntityModelInterface.php
index d74dfa6c2..fe317a229 100644
--- a/src/Stream/Console/Command/WriteEntityModelInterface.php
+++ b/src/Stream/Console/Command/WriteEntityModelInterface.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/Contract/{$entity}Interface.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/contract/entry.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/contract/entry.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityObserver.php b/src/Stream/Console/Command/WriteEntityObserver.php
index 693b76621..b885ff9a9 100644
--- a/src/Stream/Console/Command/WriteEntityObserver.php
+++ b/src/Stream/Console/Command/WriteEntityObserver.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Observer.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/observer.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/observer.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityPresenter.php b/src/Stream/Console/Command/WriteEntityPresenter.php
index 872c4081c..9b56dcff2 100644
--- a/src/Stream/Console/Command/WriteEntityPresenter.php
+++ b/src/Stream/Console/Command/WriteEntityPresenter.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Presenter.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/presenter.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/presenter.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityRepository.php b/src/Stream/Console/Command/WriteEntityRepository.php
index 2b3853baf..989af3069 100644
--- a/src/Stream/Console/Command/WriteEntityRepository.php
+++ b/src/Stream/Console/Command/WriteEntityRepository.php
@@ -71,7 +71,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Repository.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/repository.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/repository.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityRepositoryInterface.php b/src/Stream/Console/Command/WriteEntityRepositoryInterface.php
index 17b9e0aff..a21eb48c4 100644
--- a/src/Stream/Console/Command/WriteEntityRepositoryInterface.php
+++ b/src/Stream/Console/Command/WriteEntityRepositoryInterface.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/Contract/{$entity}RepositoryInterface.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/contract/repository.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/contract/repository.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityRouter.php b/src/Stream/Console/Command/WriteEntityRouter.php
index 8ea612cc3..b2165ecd3 100644
--- a/src/Stream/Console/Command/WriteEntityRouter.php
+++ b/src/Stream/Console/Command/WriteEntityRouter.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Router.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/router.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/router.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityRoutes.php b/src/Stream/Console/Command/WriteEntityRoutes.php
index 519a07e23..2d3d3e637 100644
--- a/src/Stream/Console/Command/WriteEntityRoutes.php
+++ b/src/Stream/Console/Command/WriteEntityRoutes.php
@@ -69,7 +69,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("resources/routes/{$this->slug}.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/http/routes.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/http/routes.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntitySeeder.php b/src/Stream/Console/Command/WriteEntitySeeder.php
index f8d614ca4..5bef7c00e 100644
--- a/src/Stream/Console/Command/WriteEntitySeeder.php
+++ b/src/Stream/Console/Command/WriteEntitySeeder.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/{$entity}Seeder.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/seeder.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/seeder.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityTableBuilder.php b/src/Stream/Console/Command/WriteEntityTableBuilder.php
index b4552a254..c125723e8 100644
--- a/src/Stream/Console/Command/WriteEntityTableBuilder.php
+++ b/src/Stream/Console/Command/WriteEntityTableBuilder.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/Table/{$entity}TableBuilder.php");
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/table/builder.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/table/builder.stub")
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/Stream/Console/Command/WriteEntityTestCases.php b/src/Stream/Console/Command/WriteEntityTestCases.php
index fbe5335e0..2d3337173 100644
--- a/src/Stream/Console/Command/WriteEntityTestCases.php
+++ b/src/Stream/Console/Command/WriteEntityTestCases.php
@@ -68,7 +68,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $extends   = "{$addon}TestCase";
 
         $template = $filesystem->get(
-            base_path("vendor/anomaly/streams-platform/resources/stubs/entity/test.stub")
+            base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/test.stub")
         );
 
         /* @var SplFileInfo $file */
diff --git a/src/Stream/Console/Command/WriteEntityTreeBuilder.php b/src/Stream/Console/Command/WriteEntityTreeBuilder.php
index 424d4135b..968db3225 100644
--- a/src/Stream/Console/Command/WriteEntityTreeBuilder.php
+++ b/src/Stream/Console/Command/WriteEntityTreeBuilder.php
@@ -67,7 +67,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $path = $this->addon->getPath("src/{$entity}/Tree/{$entity}TreeBuilder.php");
 
         $template = $filesystem->get(
-            base_path('vendor/anomaly/streams-platform/resources/stubs/entity/tree/builder.stub')
+            base_path('vendor/visiosoft/streams-platform/resources/stubs/entity/tree/builder.stub')
         );
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
diff --git a/src/StreamsCompilerProvider.php b/src/StreamsCompilerProvider.php
index 7ab41e6a2..b71d35c48 100644
--- a/src/StreamsCompilerProvider.php
+++ b/src/StreamsCompilerProvider.php
@@ -21,46 +21,46 @@ public static function compiles()
         return [
 
             // Models
-            'vendor/anomaly/streams-platform/src/Entry/EntryModel.php',
-            'vendor/anomaly/streams-platform/src/Field/FieldModel.php',
-            'vendor/anomaly/streams-platform/src/Stream/StreamModel.php',
-            'vendor/anomaly/streams-platform/src/Assignment/AssignmentModel.php',
+            'vendor/visiosoft/streams-platform/src/Entry/EntryModel.php',
+            'vendor/visiosoft/streams-platform/src/Field/FieldModel.php',
+            'vendor/visiosoft/streams-platform/src/Stream/StreamModel.php',
+            'vendor/visiosoft/streams-platform/src/Assignment/AssignmentModel.php',
 
             // Addons
-            'vendor/anomaly/streams-platform/src/Addon/Theme/Theme.php',
-            'vendor/anomaly/streams-platform/src/Addon/Module/Module.php',
-            'vendor/anomaly/streams-platform/src/Addon/Plugin/Plugin.php',
-            'vendor/anomaly/streams-platform/src/Addon/Extension/Extension.php',
-            'vendor/anomaly/streams-platform/src/Addon/FieldType/FieldType.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Theme/Theme.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Module/Module.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Plugin/Plugin.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Extension/Extension.php',
+            'vendor/visiosoft/streams-platform/src/Addon/FieldType/FieldType.php',
 
             // Addon Collections
-            'vendor/anomaly/streams-platform/src/Addon/Theme/ThemeCollection.php',
-            'vendor/anomaly/streams-platform/src/Addon/Module/ModuleCollection.php',
-            'vendor/anomaly/streams-platform/src/Addon/Plugin/PluginCollection.php',
-            'vendor/anomaly/streams-platform/src/Addon/Extension/ExtensionCollection.php',
-            'vendor/anomaly/streams-platform/src/Addon/FieldType/FieldTypeCollection.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Theme/ThemeCollection.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Module/ModuleCollection.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Plugin/PluginCollection.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Extension/ExtensionCollection.php',
+            'vendor/visiosoft/streams-platform/src/Addon/FieldType/FieldTypeCollection.php',
 
             // Support
-            'vendor/anomaly/streams-platform/src/Support/Parser.php',
-            'vendor/anomaly/streams-platform/src/Support/Template.php',
-            'vendor/anomaly/streams-platform/src/Support/Observer.php',
-            'vendor/anomaly/streams-platform/src/Support/Resolver.php',
-            'vendor/anomaly/streams-platform/src/Support/Decorator.php',
-            'vendor/anomaly/streams-platform/src/Support/Evaluator.php',
-            'vendor/anomaly/streams-platform/src/Support/Authorizer.php',
-            'vendor/anomaly/streams-platform/src/Support/Translator.php',
-            'vendor/anomaly/streams-platform/src/Support/Configurator.php',
+            'vendor/visiosoft/streams-platform/src/Support/Parser.php',
+            'vendor/visiosoft/streams-platform/src/Support/Template.php',
+            'vendor/visiosoft/streams-platform/src/Support/Observer.php',
+            'vendor/visiosoft/streams-platform/src/Support/Resolver.php',
+            'vendor/visiosoft/streams-platform/src/Support/Decorator.php',
+            'vendor/visiosoft/streams-platform/src/Support/Evaluator.php',
+            'vendor/visiosoft/streams-platform/src/Support/Authorizer.php',
+            'vendor/visiosoft/streams-platform/src/Support/Translator.php',
+            'vendor/visiosoft/streams-platform/src/Support/Configurator.php',
 
             // Miscellaneous
-            'vendor/anomaly/streams-platform/src/Http/Middleware/MiddlewareCollection.php',
-            'vendor/anomaly/streams-platform/src/Addon/Extension/ExtensionModel.php',
-            'vendor/anomaly/streams-platform/src/Addon/Module/ModuleModel.php',
-            'vendor/anomaly/streams-platform/src/View/ViewMobileOverrides.php',
-            'vendor/anomaly/streams-platform/src/Model/EloquentPresenter.php',
-            'vendor/anomaly/streams-platform/src/Addon/AddonIntegrator.php',
-            'vendor/anomaly/streams-platform/src/Entry/EntryPresenter.php',
-            'vendor/anomaly/streams-platform/src/Addon/AddonManager.php',
-            'vendor/anomaly/streams-platform/src/View/ViewOverrides.php',
+            'vendor/visiosoft/streams-platform/src/Http/Middleware/MiddlewareCollection.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Extension/ExtensionModel.php',
+            'vendor/visiosoft/streams-platform/src/Addon/Module/ModuleModel.php',
+            'vendor/visiosoft/streams-platform/src/View/ViewMobileOverrides.php',
+            'vendor/visiosoft/streams-platform/src/Model/EloquentPresenter.php',
+            'vendor/visiosoft/streams-platform/src/Addon/AddonIntegrator.php',
+            'vendor/visiosoft/streams-platform/src/Entry/EntryPresenter.php',
+            'vendor/visiosoft/streams-platform/src/Addon/AddonManager.php',
+            'vendor/visiosoft/streams-platform/src/View/ViewOverrides.php',
         ];
     }
 }
diff --git a/tests/Unit/Asset/AssetTest.php b/tests/Unit/Asset/AssetTest.php
index 2e906527d..d7bfd7e32 100644
--- a/tests/Unit/Asset/AssetTest.php
+++ b/tests/Unit/Asset/AssetTest.php
@@ -73,7 +73,7 @@ public function testUrl()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            url('app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js'),
+            url('app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js'),
             $asset->url('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -84,7 +84,7 @@ public function testPath()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
+            '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
             $asset->path('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -95,7 +95,7 @@ public function testAsset()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
+            '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
             $asset->asset('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -106,7 +106,7 @@ public function testScript()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '<script foo="bar" src="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
+            '<script foo="bar" src="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
             $asset->script('anomaly.module.test::scripts/test.js', ['noversion'], ['foo' => 'bar'])
         );
     }
@@ -117,7 +117,7 @@ public function testStyle()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
+            '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
             $asset->style('anomaly.module.test::styles/test.css', ['noversion'], ['foo' => 'bar'])
         );
     }
@@ -132,8 +132,8 @@ public function testScripts()
 
         $this->assertEquals(
             [
-                '<script foo="bar" src="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
-                '<script foo="bar" src="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test2.js"></script>',
+                '<script foo="bar" src="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
+                '<script foo="bar" src="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test2.js"></script>',
             ],
             $asset->scripts('test.js', ['noversion'], ['foo' => 'bar'])
         );
@@ -149,8 +149,8 @@ public function testStyles()
 
         $this->assertEquals(
             [
-                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
-                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css">',
+                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
+                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test2.css">',
             ],
             $asset->styles('test.css', ['noversion'], ['foo' => 'bar'])
         );
@@ -166,8 +166,8 @@ public function testPaths()
 
         $this->assertEquals(
             [
-                '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css',
-                '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css',
+                '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css',
+                '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test2.css',
             ],
             $asset->paths('test.css', ['noversion'], ['foo' => 'bar'])
         );
@@ -184,10 +184,10 @@ public function testUrls()
         $this->assertEquals(
             [
                 url(
-                    'app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'
+                    'app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css'
                 ),
                 url(
-                    'app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css'
+                    'app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test2.css'
                 ),
             ],
             $asset->urls('test.css', ['noversion'])
@@ -233,11 +233,11 @@ public function testAddPath()
 
         $asset->addPath(
             'test',
-            base_path('vendor/anomaly/streams-platform/addons/anomaly/test-module/resources')
+            base_path('vendor/visiosoft/streams-platform/addons/anomaly/test-module/resources')
         );
 
         $this->assertEquals(
-            base_path('vendor/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'),
+            base_path('vendor/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css'),
             $asset->realPath('test::styles/test.css')
         );
     }

From cfa93baafa9265d5b7dd3f48e5c527f5b9c2348c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Tue, 18 Feb 2020 16:39:32 +0700
Subject: [PATCH 038/256] Should use ttl as ttl :)

---
 src/Http/Middleware/HttpCache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Middleware/HttpCache.php b/src/Http/Middleware/HttpCache.php
index dba83f306..95aaaba4f 100644
--- a/src/Http/Middleware/HttpCache.php
+++ b/src/Http/Middleware/HttpCache.php
@@ -164,7 +164,7 @@ public function handle(Request $request, Closure $next)
         /**
          * Determine the default TTL value.
          */
-        $default = $route->getAction('streams::http_cache') ?: config('streams::httpcache.ttl', 3600);
+        $default = $route->getAction('ttl') ?: config('streams::httpcache.ttl', 3600);
 
         /**
          * Exclude these paths from caching

From 2aa03f756c4eeedf4f238f004726267f2e2c7dfb Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Thu, 20 Feb 2020 18:08:46 +0300
Subject: [PATCH 039/256] Update EloquentQueryBuilder.php

fix dublicate
---
 src/Model/EloquentQueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index c81fee902..576967253 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -361,7 +361,7 @@ function ($column) use ($model) {
                 )
         );
 
-        $this->query->groupBy([$model->getTableName() . '.id', $model->getTranslationsTableName() . '.id']);
+        $this->query->groupBy([$model->getTableName() . '.id']);
 
         /**
          * Grab either what matches or null because

From 84153df17135553ef6ff3d1d142b6037d2030308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 21 Feb 2020 18:33:09 +0700
Subject: [PATCH 040/256] Use static, so it can be overrided

---
 src/Http/CacheKernel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/CacheKernel.php b/src/Http/CacheKernel.php
index 554510516..0f7d4a171 100644
--- a/src/Http/CacheKernel.php
+++ b/src/Http/CacheKernel.php
@@ -82,7 +82,7 @@ function () use ($cache) {
         /**
          * Disable for Control Panel
          */
-        if (str_is(self::$excluded, $_SERVER['REQUEST_URI']) || in_array($_SERVER['HTTP_HOST'], $domains)) {
+        if (str_is(static::$excluded, $_SERVER['REQUEST_URI']) || in_array($_SERVER['HTTP_HOST'], $domains)) {
             return $kernel;
         }
 

From 1343da52a7364bdd3d5479960bd52e1757d7f1fd Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 21 Feb 2020 09:17:39 -0600
Subject: [PATCH 041/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index bd47bb74c..f01f30954 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,17 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.23] - 2020-02-21
+#### Added
+- `FiresCallbacks` and `Hookable` along with `registering` and `registered` callbacks to `AddonServiceProvider`.
+
+#### Changed
+- Optimized viewport declaration in `metadata.twig` stub.
+
+#### Fixed
+- Fixed issue where dropdown items were not being hidden by permissions in UI where applicable.
+- Fixed incorrect argument cast on `IconRegistry`.
+
 ### [1.7.22] - 2020-01-21
 #### Fixed
 - Fixed issue where `--message` option was not working with `php artisan down`.

From 27a31956a2c45bf9b6a11681e9833afc85075800 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 28 Feb 2020 11:42:21 -0600
Subject: [PATCH 042/256] Use the URL which has been corrected for local files.

---
 src/Image/Image.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Image/Image.php b/src/Image/Image.php
index 6e39d6580..ccac2b0bc 100644
--- a/src/Image/Image.php
+++ b/src/Image/Image.php
@@ -600,7 +600,7 @@ protected function getCachePath()
         if (starts_with($this->getImage(), ['http://', 'https://', '//'])) {
             return $this->getImage();
         }
-
+        
         $path = $this->paths->outputPath($this);
 
         try {
@@ -933,11 +933,11 @@ public function setImage($image)
     protected function makeImage()
     {
         if ($this->image instanceof FileInterface) {
-            return $this->manager->make(app(MountManager::class)->read($this->image->location()));
+            return $this->manager->make(app(MountManager::class)->url($this->image->location()));
         }
 
         if (is_string($this->image) && str_is('*://*', $this->image)) {
-            return $this->manager->make(app(MountManager::class)->read($this->image));
+            return $this->manager->make(app(MountManager::class)->url($this->image));
         }
 
         if ($this->image instanceof File) {

From 33eda10c4486dc0081fefd99cdac7cc9102751d6 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 28 Feb 2020 11:45:42 -0600
Subject: [PATCH 043/256] Fix orientation

---
 docs/en/01.prologue/02.change-log.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f01f30954..e7b8c881f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,14 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.24] - 2020-02-28
+#### Changed
+- Changed `makeImage` in `Image` to use `url` instead of `read` for making intervention instances.
+
+#### Fixed
+- Fixed issue with `Image` instances not being able to access local resources by path in order to properly `Orientate`.
+
+
 ### [1.7.23] - 2020-02-21
 #### Added
 - `FiresCallbacks` and `Hookable` along with `registering` and `registered` callbacks to `AddonServiceProvider`.

From 36a537e3b1dcbe4de9ff71db3f0085675c1e56ba Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 16 Mar 2020 14:06:27 -0500
Subject: [PATCH 044/256] Correct issue where messages were doubling up /
 erroneous for locking.

---
 docs/en/01.prologue/02.change-log.md         | 5 +++++
 src/Ui/Form/Multiple/Command/HandleLocks.php | 9 ---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index e7b8c881f..0f89921e9 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.25] - 2020-03-16
+#### Fixed
+- Fixed issue where doubling up / erroneous form `locking` messages were being generated.
+
+
 ### [1.7.24] - 2020-02-28
 #### Changed
 - Changed `makeImage` in `Image` to use `url` instead of `read` for making intervention instances.
diff --git a/src/Ui/Form/Multiple/Command/HandleLocks.php b/src/Ui/Form/Multiple/Command/HandleLocks.php
index af16ca60b..bebb257c8 100644
--- a/src/Ui/Form/Multiple/Command/HandleLocks.php
+++ b/src/Ui/Form/Multiple/Command/HandleLocks.php
@@ -76,14 +76,5 @@ public function handle(
         $this->builder->setSave(false);
 
         $this->builder->setOption('locked', true);
-
-        $messages->important(
-            trans(
-                'streams::lock.locked_by_user',
-                [
-                    'username' => $user->getUsername(),
-                ]
-            )
-        );
     }
 }

From c4a06437a2be1dc6e62ab8d727df91a780a5716f Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Wed, 18 Mar 2020 19:46:32 -0700
Subject: [PATCH 045/256] support secure cookie

Set the cookie as secure by default as best practice, but allow override for non ssl devs if wanted.
---
 src/Http/Middleware/ProxySession.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Middleware/ProxySession.php b/src/Http/Middleware/ProxySession.php
index 1f9206ff1..b25410460 100644
--- a/src/Http/Middleware/ProxySession.php
+++ b/src/Http/Middleware/ProxySession.php
@@ -33,7 +33,7 @@ public function handle(Request $request, Closure $next)
 
         if (method_exists($response, 'withCookie')) {
             return $response->withCookie(
-                cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1)
+                cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1, null, null, env('SESSION_SECURE_COOKIE', true))
             );
         }
 

From a44c744f0fd33fa44b5a3869b9f86032e060147b Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Sun, 22 Mar 2020 14:30:26 -0700
Subject: [PATCH 046/256] If the request is SSL, make the cookie ssl!

---
 src/Http/Middleware/ProxySession.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Middleware/ProxySession.php b/src/Http/Middleware/ProxySession.php
index b25410460..eed033b3f 100644
--- a/src/Http/Middleware/ProxySession.php
+++ b/src/Http/Middleware/ProxySession.php
@@ -33,7 +33,7 @@ public function handle(Request $request, Closure $next)
 
         if (method_exists($response, 'withCookie')) {
             return $response->withCookie(
-                cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1, null, null, env('SESSION_SECURE_COOKIE', true))
+                 cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1, null, null, $request->isSecure())
             );
         }
 

From e60018e49d24e11bdcc0f2531ad5bbdcad61e43a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Sun, 22 Mar 2020 21:34:25 -0500
Subject: [PATCH 047/256] CS

---
 src/Http/Middleware/ProxySession.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Middleware/ProxySession.php b/src/Http/Middleware/ProxySession.php
index eed033b3f..e57d80c8a 100644
--- a/src/Http/Middleware/ProxySession.php
+++ b/src/Http/Middleware/ProxySession.php
@@ -33,7 +33,7 @@ public function handle(Request $request, Closure $next)
 
         if (method_exists($response, 'withCookie')) {
             return $response->withCookie(
-                 cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1, null, null, $request->isSecure())
+                cookie('session_proxy', $check, $check ? config('session.lifetime', 120) : -1, null, null, $request->isSecure())
             );
         }
 

From 25b624129cdc9b7395691d84b306a45596733d44 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Sun, 22 Mar 2020 21:35:32 -0500
Subject: [PATCH 048/256] Change log

---
 docs/en/01.prologue/02.change-log.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 70ed44e05..5761d9e6e 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,7 +29,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
-### Unreleased
+### [1.6.185] - 2020-01-08
+#### Changed
+- Changed `ProxySession` to set the `secure cookie` flag to a sensible default.
+
 #### Fixed
 - Fixed issue where `app('url')` was not returning Streams' URL generator.
 

From 4a39b407237e633407d895bb81bc0f8a73cf2026 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Sun, 22 Mar 2020 21:35:51 -0500
Subject: [PATCH 049/256] Bump

---
 docs/en/01.prologue/02.change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 5761d9e6e..ff0a796e9 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,7 +29,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
-### [1.6.185] - 2020-01-08
+### [1.6.189] - 2020-03-22
 #### Changed
 - Changed `ProxySession` to set the `secure cookie` flag to a sensible default.
 

From 98eed4abdf5cbf0b1d6911f96a220532f0371563 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Sun, 22 Mar 2020 21:36:06 -0500
Subject: [PATCH 050/256] Bump

---
 docs/en/01.prologue/02.change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index ff0a796e9..911804e70 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,7 +29,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
-### [1.6.189] - 2020-03-22
+### [1.6.186] - 2020-03-22
 #### Changed
 - Changed `ProxySession` to set the `secure cookie` flag to a sensible default.
 

From 81c30baf292c085be90454a0d12c0026f04a71e1 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 25 Mar 2020 14:15:57 -0500
Subject: [PATCH 051/256] Fix versioning order

---
 src/Ui/Form/Command/PostForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ui/Form/Command/PostForm.php b/src/Ui/Form/Command/PostForm.php
index 7dce5efe6..5456c3517 100644
--- a/src/Ui/Form/Command/PostForm.php
+++ b/src/Ui/Form/Command/PostForm.php
@@ -54,9 +54,9 @@ public function handle()
 
         $this->dispatchNow(new LoadFormValues($this->builder));
         $this->dispatchNow(new RemoveSkippedFields($this->builder));
+        $this->dispatchNow(new HandleVersioning($this->builder));
         $this->dispatchNow(new HandleForm($this->builder));
         $this->dispatchNow(new SetSuccessMessage($this->builder));
-        $this->dispatchNow(new HandleVersioning($this->builder));
         $this->dispatchNow(new SetActionResponse($this->builder));
 
         if ($this->builder->isAjax()) {

From 3dac315313ae73bdbb81215831622c9e0ed2505c Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 25 Mar 2020 14:19:28 -0500
Subject: [PATCH 052/256] Fix versioning issues where deep arrays were lost.

---
 src/Model/Traits/Versionable.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/Model/Traits/Versionable.php b/src/Model/Traits/Versionable.php
index 55f2fd205..26a4c7153 100644
--- a/src/Model/Traits/Versionable.php
+++ b/src/Model/Traits/Versionable.php
@@ -239,6 +239,26 @@ public function getVersionDifferences()
             return $this->versionDifferences = $this->toArrayForComparison();
         }
 
+        array_walk(
+            $data,
+            function (&$value) {
+
+                if (is_array($value)) {
+                    $value = serialize($value);
+                }
+            }
+        );
+
+        array_walk(
+            $comparison,
+            function (&$value) {
+
+                if (is_array($value)) {
+                    $value = serialize($value);
+                }
+            }
+        );
+
         $this->versionDifferences = array_diff_assoc(
             $comparison,
             $this->toArrayForComparison()

From d770afa0cbc462658e66485751cbf46ae2e1511c Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 25 Mar 2020 14:45:48 -0500
Subject: [PATCH 053/256] Return the full array

---
 src/Entry/EntryModel.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/Entry/EntryModel.php b/src/Entry/EntryModel.php
index 14b37dfa3..85bcee29a 100644
--- a/src/Entry/EntryModel.php
+++ b/src/Entry/EntryModel.php
@@ -1057,19 +1057,6 @@ public function toArrayForComparison()
             }
         }
 
-        array_walk(
-            $array,
-            function ($value, $key) use (&$array) {
-
-                /**
-                 * Make sure any nested arrays are serialized.
-                 */
-                if (is_array($value)) {
-                    $array[$key] = serialize($value);
-                }
-            }
-        );
-
         return $array;
     }
 

From cde2ac3b6e2051a215c65c257cac4980e24edd51 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 25 Mar 2020 14:49:06 -0500
Subject: [PATCH 054/256] Data

---
 src/Model/Traits/Versionable.php         |  4 +++-
 src/Ui/Form/Command/HandleVersioning.php | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/Model/Traits/Versionable.php b/src/Model/Traits/Versionable.php
index 26a4c7153..723e8ed63 100644
--- a/src/Model/Traits/Versionable.php
+++ b/src/Model/Traits/Versionable.php
@@ -239,6 +239,8 @@ public function getVersionDifferences()
             return $this->versionDifferences = $this->toArrayForComparison();
         }
 
+        $data = $this->toArrayForComparison();
+
         array_walk(
             $data,
             function (&$value) {
@@ -261,7 +263,7 @@ function (&$value) {
 
         $this->versionDifferences = array_diff_assoc(
             $comparison,
-            $this->toArrayForComparison()
+            $data
         );
 
         return $this->versionDifferences;
diff --git a/src/Ui/Form/Command/HandleVersioning.php b/src/Ui/Form/Command/HandleVersioning.php
index d68f98335..cdbee8739 100644
--- a/src/Ui/Form/Command/HandleVersioning.php
+++ b/src/Ui/Form/Command/HandleVersioning.php
@@ -1,8 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
 
-use Anomaly\Streams\Platform\Entry\EntryModel;
 use Anomaly\Streams\Platform\Message\MessageBag;
-use Anomaly\Streams\Platform\Model\EloquentModel;
 use Anomaly\Streams\Platform\Model\Traits\Versionable;
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 use Anomaly\Streams\Platform\Ui\Form\Multiple\MultipleFormBuilder;
@@ -74,11 +72,13 @@ public function handle(MessageBag $messages)
         ) {
             $entry->unguard();
 
-            try {
-                $entry->version();
-            } catch (\Exception $exception) {
-                $messages->error('Versioning failed: ' . $exception->getMessage());
-            }
+            // try {
+            //     $entry->version();
+            // } catch (\Exception $exception) {
+            //     $messages->error('Versioning failed: ' . $exception->getMessage());
+            // }
+
+            $entry->version();
 
             $entry->reguard();
         }

From 38682b770738ddd7470536bcf67f1164f14b2afc Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Mon, 1 Jun 2020 12:41:49 +1000
Subject: [PATCH 055/256] Update composer.json

Version lock to prevent symfony php 8 polyfill breaking Laravel str helpers.
---
 composer.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ed5ba851d..a9d61436f 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,13 @@
         "barryvdh/laravel-httpcache": "^0.3.0",
         "tubalmartin/cssmin": "~4.0",
         "mrclay/jsmin-php": "~2.4",
-        "fzaninotto/faker": "~1.4"
+        "fzaninotto/faker": "~1.4",
+        "symfony/console": "v4.4.8",
+        "symfony/debug": "v4.4.8",
+        "symfony/error-handler": "v4.4.8",
+        "symfony/http-kernel": "v4.4.8",
+        "symfony/mime": "v5.0.9",
+        "symfony/var-dumper": "v4.4.8"
     },
     "autoload": {
         "psr-4": {

From 326676a3fb4af07f4e12da3a432930dc99238508 Mon Sep 17 00:00:00 2001
From: Fatih Alp <fatihalp89@gmail.com>
Date: Mon, 1 Jun 2020 14:29:17 +0300
Subject: [PATCH 056/256] Update composer.json

 Version lock to prevent symfony php 8 polyfill breaking Laravel str helpers.
---
 composer.json | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index afc0a5a0a..1bc2f62b8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "visiosoft/streams-platform",
+    "name": "visiosoft/streams-platform",	
     "description": "A powerful, inclusive, modular PHP application engine built lovingly for Laravel.",
     "authors": [
         {
@@ -34,7 +34,13 @@
         "barryvdh/laravel-httpcache": "^0.3.0",
         "tubalmartin/cssmin": "~4.0",
         "mrclay/jsmin-php": "~2.4",
-        "fzaninotto/faker": "~1.4"
+        "fzaninotto/faker": "~1.4",
+        "symfony/console": "v4.4.8",
+        "symfony/debug": "v4.4.8",
+        "symfony/error-handler": "v4.4.8",
+        "symfony/http-kernel": "v4.4.8",
+        "symfony/mime": "v5.0.9",
+        "symfony/var-dumper": "v4.4.8"
     },
     "autoload": {
         "psr-4": {

From f7d07c6b4f6eb365677c97b4d6e1ff73b4c40c59 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 9 Jun 2020 12:42:53 -0500
Subject: [PATCH 057/256] Str::contains fixing

---
 composer.json                                 |   8 +-
 src/Addon/Addon.php                           |  21 ++--
 src/Addon/AddonProvider.php                   |  42 +++----
 src/Addon/FieldType/FieldTypeBuilder.php      |  13 ++-
 src/Addon/FieldType/FieldTypeSchema.php       |  30 ++---
 .../Command/WriteEnvironmentFile.php          |   9 +-
 src/Asset/Asset.php                           |  45 ++++----
 src/Asset/AssetPaths.php                      |  13 ++-
 src/Entry/EntryRouter.php                     | 105 +++++++++---------
 src/Image/Image.php                           |  42 +++----
 src/Image/ImagePaths.php                      |  19 ++--
 src/Model/EloquentCollection.php              |  11 +-
 .../Console/Command/WriteEntityTestCases.php  |  17 +--
 src/StreamsServiceProvider.php                |  87 ++++++++-------
 src/Support/Parser.php                        |   9 +-
 src/Support/Resolver.php                      |  10 +-
 src/Support/Value.php                         |  28 +++--
 .../Command/SetActiveNavigationLink.php       |  13 ++-
 .../Section/Command/SetActiveSection.php      |  13 ++-
 src/Ui/Form/Command/HandleForm.php            |   9 +-
 src/Ui/Form/Command/SetDefaultParameters.php  |   9 +-
 src/Ui/Form/Command/SetSuccessMessage.php     |  13 ++-
 src/Ui/Form/Command/ValidateForm.php          |  11 +-
 .../Form/Component/Action/ActionResponder.php |  13 ++-
 .../Component/Button/Guesser/HrefGuesser.php  |  18 +--
 src/Ui/Form/FormAttributes.php                |   7 +-
 src/Ui/Form/FormExtender.php                  |   7 +-
 src/Ui/Form/FormMessages.php                  |  17 ++-
 src/Ui/Table/Command/SetDefaultParameters.php |   7 +-
 .../Table/Component/Action/ActionExecutor.php |  17 +--
 .../Component/Button/Guesser/HrefGuesser.php  |  21 ++--
 .../Component/Filter/FilterNormalizer.php     |  11 +-
 src/Ui/Table/Component/Filter/FilterQuery.php |  13 ++-
 src/Ui/Table/Component/View/ViewQuery.php     |  13 ++-
 src/View/Command/GetLayoutName.php            |   9 +-
 src/View/Twig/Loader.php                      |  21 ++--
 src/View/ViewComposer.php                     |  20 ++--
 37 files changed, 435 insertions(+), 336 deletions(-)

diff --git a/composer.json b/composer.json
index a9d61436f..ed5ba851d 100644
--- a/composer.json
+++ b/composer.json
@@ -34,13 +34,7 @@
         "barryvdh/laravel-httpcache": "^0.3.0",
         "tubalmartin/cssmin": "~4.0",
         "mrclay/jsmin-php": "~2.4",
-        "fzaninotto/faker": "~1.4",
-        "symfony/console": "v4.4.8",
-        "symfony/debug": "v4.4.8",
-        "symfony/error-handler": "v4.4.8",
-        "symfony/http-kernel": "v4.4.8",
-        "symfony/mime": "v5.0.9",
-        "symfony/var-dumper": "v4.4.8"
+        "fzaninotto/faker": "~1.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Addon/Addon.php b/src/Addon/Addon.php
index 9ac376cb2..f060a22a8 100644
--- a/src/Addon/Addon.php
+++ b/src/Addon/Addon.php
@@ -1,11 +1,14 @@
-<?php namespace Anomaly\Streams\Platform\Addon;
+<?php
 
-use Anomaly\Streams\Platform\Traits\FiresCallbacks;
-use Anomaly\Streams\Platform\Traits\Hookable;
+namespace Anomaly\Streams\Platform\Addon;
+
+use Illuminate\Support\Str;
+use Robbo\Presenter\Presenter;
+use Robbo\Presenter\PresentableInterface;
 use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Traits\Hookable;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Robbo\Presenter\PresentableInterface;
-use Robbo\Presenter\Presenter;
+use Anomaly\Streams\Platform\Traits\FiresCallbacks;
 
 /**
  * Class Addon
@@ -141,7 +144,7 @@ public function getServiceProvider()
      */
     public function isCore()
     {
-        return str_contains($this->getPath(), 'core/' . $this->getVendor());
+        return Str::contains($this->getPath(), 'core/' . $this->getVendor());
     }
 
     /**
@@ -151,7 +154,7 @@ public function isCore()
      */
     public function isShared()
     {
-        return str_contains($this->getPath(), 'addons/shared/' . $this->getVendor());
+        return Str::contains($this->getPath(), 'addons/shared/' . $this->getVendor());
     }
 
     /**
@@ -161,7 +164,7 @@ public function isShared()
      */
     public function isTesting()
     {
-        return str_contains($this->getPath(), 'vendor/anomaly/streams-platform/addons/' . $this->getVendor());
+        return Str::contains($this->getPath(), 'vendor/anomaly/streams-platform/addons/' . $this->getVendor());
     }
 
     /**
@@ -283,7 +286,7 @@ public function getId()
      */
     public function hasConfig($key = '*')
     {
-        return (bool)config($this->getNamespace($key));
+        return (bool) config($this->getNamespace($key));
     }
 
     /**
diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index fd0e576ad..85259e8fa 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -2,22 +2,23 @@
 
 namespace Anomaly\Streams\Platform\Addon;
 
-use Anomaly\Streams\Platform\Addon\Extension\Extension;
-use Anomaly\Streams\Platform\Addon\Module\Module;
-use Anomaly\Streams\Platform\Addon\Theme\Theme;
-use Anomaly\Streams\Platform\Http\Middleware\MiddlewareCollection;
-use Anomaly\Streams\Platform\Traits\FiresCallbacks;
-use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
-use Anomaly\Streams\Platform\View\ViewMobileOverrides;
-use Anomaly\Streams\Platform\View\ViewOverrides;
-use Illuminate\Console\Events\ArtisanStarting;
+use Illuminate\Support\Str;
+use Illuminate\Routing\Router;
+use Illuminate\Foundation\AliasLoader;
+use Illuminate\Support\Traits\Macroable;
+use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Console\Events\ArtisanStarting;
+use Anomaly\Streams\Platform\Addon\Theme\Theme;
+use Anomaly\Streams\Platform\View\ViewOverrides;
 use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Database\Eloquent\Factory;
-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Routing\Router;
-use Illuminate\Support\Traits\Macroable;
+use Anomaly\Streams\Platform\Addon\Module\Module;
+use Anomaly\Streams\Platform\Traits\FiresCallbacks;
+use Anomaly\Streams\Platform\View\ViewMobileOverrides;
+use Anomaly\Streams\Platform\Addon\Extension\Extension;
+use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
+use Anomaly\Streams\Platform\Http\Middleware\MiddlewareCollection;
 
 /**
  * Class AddonProvider
@@ -147,7 +148,7 @@ public function register(Addon $addon)
 
         $this->providers[] = $provider = $addon->newServiceProvider();
 
-        $this->fire('register', [ 'provider' => $provider, 'addon' => $addon, 'addonProvider' => $this ]);
+        $this->fire('register', ['provider' => $provider, 'addon' => $addon, 'addonProvider' => $this]);
 
         $this->bindAliases($provider);
         $this->bindClasses($provider);
@@ -174,7 +175,7 @@ public function register(Addon $addon)
         // Call other providers last.
         $this->registerProviders($provider);
 
-        $this->fire('registered', [ 'provider' => $provider, 'addon' => $addon, 'addonProvider' => $this ]);
+        $this->fire('registered', ['provider' => $provider, 'addon' => $addon, 'addonProvider' => $this]);
     }
 
     /**
@@ -331,7 +332,7 @@ protected function registerRoutes(AddonServiceProvider $provider, Addon $addon)
              * Check if the route is a view. In
              * which case we can simplify things.
              */
-            if (is_string($route) && str_contains($route, ['.', '::'])) {
+            if (is_string($route) && Str::contains($route, ['.', '::'])) {
 
                 \Route::view($uri, $route);
 
@@ -359,7 +360,7 @@ protected function registerRoutes(AddonServiceProvider $provider, Addon $addon)
 
             array_set($route, 'streams::addon', $addon->getNamespace());
 
-            if (is_string($route['uses']) && !str_contains($route['uses'], '@')) {
+            if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                 $this->router->resource($uri, $route['uses']);
             } else {
 
@@ -419,7 +420,7 @@ function (Router $router) use ($routes, $addon) {
 
                     array_set($route, 'streams::addon', $addon->getNamespace());
 
-                    if (is_string($route['uses']) && !str_contains($route['uses'], '@')) {
+                    if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                         $router->resource($uri, $route['uses']);
                     } else {
 
@@ -491,7 +492,7 @@ public function registerFieldsRoutes(Addon $addon, $controller, $segment = null)
 
             array_set($route, 'streams::addon', $addon->getNamespace());
 
-            if (is_string($route['uses']) && !str_contains($route['uses'], '@')) {
+            if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                 $this->router->resource($uri, $route['uses']);
             } else {
 
@@ -655,7 +656,8 @@ protected function registerAdditionalRoutes(AddonServiceProvider $provider)
                  * If, for whatever reason, this fails let
                  * it fail silently. Mapping additional routes
                  * could be volatile at certain application states.
-                 */ }
+                 */
+            }
         }
     }
 
diff --git a/src/Addon/FieldType/FieldTypeBuilder.php b/src/Addon/FieldType/FieldTypeBuilder.php
index 123e3ccc9..b8cfe85c6 100644
--- a/src/Addon/FieldType/FieldTypeBuilder.php
+++ b/src/Addon/FieldType/FieldTypeBuilder.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Addon\FieldType;
+<?php
 
-use Anomaly\Streams\Platform\Support\Hydrator;
+namespace Anomaly\Streams\Platform\Addon\FieldType;
+
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Anomaly\Streams\Platform\Support\Hydrator;
 
 /**
  * Class FieldTypeBuilder
@@ -66,7 +69,7 @@ public function build(array $parameters)
          * parameter has been set.
          */
         if (!is_string($type)) {
-            throw new \Exception("The [type] parameter of [".array_get($parameters, 'field')."] is required and should be string.");
+            throw new \Exception("The [type] parameter of [" . array_get($parameters, 'field') . "] is required and should be string.");
         }
 
         /*
@@ -75,8 +78,8 @@ public function build(array $parameters)
          * streams then it's a class path and
          * we can resolve it from the container.
          */
-        if (str_contains($type, '\\') && class_exists($type)) {
-            $fieldType = clone($this->container->make($type));
+        if (Str::contains($type, '\\') && class_exists($type)) {
+            $fieldType = clone ($this->container->make($type));
         }
 
         /*
diff --git a/src/Addon/FieldType/FieldTypeSchema.php b/src/Addon/FieldType/FieldTypeSchema.php
index 2b652a0ab..5a5d82936 100644
--- a/src/Addon/FieldType/FieldTypeSchema.php
+++ b/src/Addon/FieldType/FieldTypeSchema.php
@@ -1,12 +1,16 @@
-<?php namespace Anomaly\Streams\Platform\Addon\FieldType;
+<?php
 
-use Anomaly\Streams\Platform\Assignment\Contract\AssignmentInterface;
-use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Contracts\Container\Container;
+namespace Anomaly\Streams\Platform\Addon\FieldType;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Illuminate\Support\Fluent;
 use Illuminate\Database\Connection;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
-use Illuminate\Support\Fluent;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Assignment\Contract\AssignmentInterface;
 
 /**
  * Class FieldTypeSchema
@@ -105,8 +109,8 @@ public function addColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true);
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
-            $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+            $column->default(Arr::get($this->fieldType->getConfig(), 'default_value'));
         }
     }
 
@@ -164,8 +168,8 @@ public function updateColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true)->change();
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
-            $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+            $column->default(Arr::get($this->fieldType->getConfig(), 'default_value'));
         }
     }
 
@@ -243,8 +247,8 @@ public function changeColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true)->change();
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
-            $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+            $column->default(Arr::get($this->fieldType->getConfig(), 'default_value'));
         }
     }
 
@@ -370,7 +374,7 @@ public function restoreColumn(Blueprint $table, AssignmentInterface $assignment)
 
         foreach ($results as $result) {
 
-            $result = (array)$result;
+            $result = (array) $result;
 
             $this->connection
                 ->table($table->getTable())
diff --git a/src/Application/Command/WriteEnvironmentFile.php b/src/Application/Command/WriteEnvironmentFile.php
index 47849dbdc..569c9d978 100644
--- a/src/Application/Command/WriteEnvironmentFile.php
+++ b/src/Application/Command/WriteEnvironmentFile.php
@@ -1,5 +1,8 @@
-<?php namespace Anomaly\Streams\Platform\Application\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Application\Command;
+
+use Illuminate\Support\Str;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
@@ -39,8 +42,8 @@ public function handle()
         $contents = '';
 
         foreach ($this->data as $key => $value) {
-            
-            if (str_contains($value, [' ', '$', '\n'])) {
+
+            if (Str::contains($value, [' ', '$', '\n'])) {
                 $value = '"' . trim($value, '"') . '"';
             }
 
diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index 6c6653485..642d16068 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -1,15 +1,18 @@
-<?php namespace Anomaly\Streams\Platform\Asset;
+<?php
 
-use Anomaly\Streams\Platform\Addon\Theme\ThemeCollection;
-use Anomaly\Streams\Platform\Application\Application;
-use Anomaly\Streams\Platform\Support\Template;
-use Assetic\Asset\AssetCollection;
+namespace Anomaly\Streams\Platform\Asset;
+
+use Illuminate\Support\Str;
 use Assetic\Asset\FileAsset;
 use Assetic\Asset\GlobAsset;
 use Collective\Html\HtmlBuilder;
-use Illuminate\Filesystem\Filesystem;
-use League\Flysystem\MountManager;
 use tubalmartin\CssMin\Minifier;
+use Assetic\Asset\AssetCollection;
+use League\Flysystem\MountManager;
+use Illuminate\Filesystem\Filesystem;
+use Anomaly\Streams\Platform\Support\Template;
+use Anomaly\Streams\Platform\Application\Application;
+use Anomaly\Streams\Platform\Addon\Theme\ThemeCollection;
 
 /**
  * Class Asset
@@ -550,7 +553,7 @@ protected function publish($path, $collection, $additionalFilters)
     {
         $path = ltrim($path, '/\\');
 
-        if (str_contains($collection, public_path())) {
+        if (Str::contains($collection, public_path())) {
             return;
         }
 
@@ -621,7 +624,7 @@ protected function publishWithoutAssetic($path, $collection, $additionalFilters)
     {
         $path = ltrim($path, '/\\');
 
-        if (str_contains($collection, public_path())) {
+        if (Str::contains($collection, public_path())) {
             return;
         }
 
@@ -640,7 +643,7 @@ protected function publishWithoutAssetic($path, $collection, $additionalFilters)
          */
         if (in_array('parse', $filters) || $hint == 'css') {
             try {
-                $contents = (string)render($contents);
+                $contents = (string) render($contents);
             } catch (\Exception $e) {
 
                 if (config('app.debug')) {
@@ -758,17 +761,16 @@ protected function shouldPublish($path, $collection, array $filters = [])
          * files that have been modified then publish.
          */
         if (request()->isNoCache() && array_filter(
-                $filters,
-                function ($filter) use ($path) {
+            $filters,
+            function ($filter) use ($path) {
 
-                    if (!starts_with($filter, 'watch@')) {
-                        return false;
-                    }
-
-                    return $this->lastModifiedAt(substr($filter, 6)) > filemtime($path);
+                if (!starts_with($filter, 'watch@')) {
+                    return false;
                 }
-            )
-        ) {
+
+                return $this->lastModifiedAt(substr($filter, 6)) > filemtime($path);
+            }
+        )) {
             return true;
         }
 
@@ -860,7 +862,8 @@ protected function getAssetCollection($collection, $additionalFilters = [])
             }
 
             $file = new $asset(
-                $file, array_filter(
+                $file,
+                array_filter(
                     $filters,
                     function ($value) {
                         return !is_string($value);
@@ -981,6 +984,4 @@ function __toString()
     {
         return '';
     }
-
-
 }
diff --git a/src/Asset/AssetPaths.php b/src/Asset/AssetPaths.php
index 805534512..95ef3c15a 100644
--- a/src/Asset/AssetPaths.php
+++ b/src/Asset/AssetPaths.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Asset;
+<?php
 
-use Anomaly\Streams\Platform\Application\Application;
-use Illuminate\Contracts\Config\Repository;
+namespace Anomaly\Streams\Platform\Asset;
+
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
+use Illuminate\Contracts\Config\Repository;
+use Anomaly\Streams\Platform\Application\Application;
 
 /**
  * Class AssetPaths
@@ -144,7 +147,7 @@ public function extension($path)
      */
     public function realPath($path)
     {
-        if (str_contains($path, '::')) {
+        if (Str::contains($path, '::')) {
 
             list($namespace, $path) = explode('::', $path);
 
@@ -190,7 +193,7 @@ public function outputPath($collection)
          * If the path is already public
          * then just use it as it is.
          */
-        if (str_contains($collection, public_path())) {
+        if (Str::contains($collection, public_path())) {
             return str_replace(public_path(), '', $collection);
         }
 
diff --git a/src/Entry/EntryRouter.php b/src/Entry/EntryRouter.php
index 09c5ac65e..90c63af8d 100644
--- a/src/Entry/EntryRouter.php
+++ b/src/Entry/EntryRouter.php
@@ -1,10 +1,13 @@
-<?php namespace Anomaly\Streams\Platform\Entry;
+<?php
 
-use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
-use Anomaly\Streams\Platform\Routing\UrlGenerator;
+namespace Anomaly\Streams\Platform\Entry;
+
+use Illuminate\Support\Str;
 use Anomaly\Streams\Platform\Support\Locator;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Anomaly\Streams\Platform\Routing\UrlGenerator;
+use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 /**
  * Class EntryRouter
@@ -82,61 +85,61 @@ public function make($route, array $parameters = [])
             return $this->container->call([$this, $method], $parameters);
         }
 
-        if (!str_contains($route, '.') && $stream = $this->entry->getStreamSlug()) {
+        if (!Str::contains($route, '.') && $stream = $this->entry->getStreamSlug()) {
             $route = "{$stream}.{$route}";
         }
 
-        if (!str_contains($route, '::') && $namespace = $this->locator->locate($this->entry)) {
+        if (!Str::contains($route, '::') && $namespace = $this->locator->locate($this->entry)) {
             $route = "{$namespace}::{$route}";
         }
 
         return $this->url->make($route, $this->entry, $parameters);
     }
 
-//    /**
-//     * Return the create route.
-//     *
-//     * @return string|null
-//     */
-//    public function create()
-//    {
-//        $namespace = explode('.', $this->locator->locate($this->entry));
-//
-//        if (!$addon = $this->locator->locate($this->entry)) {
-//            return null;
-//        }
-//
-//        $segments = [
-//            'admin',
-//            array_pop($namespace),
-//            $this->entry->getStreamSlug(),
-//            'create',
-//        ];
-//
-//        return implode('/', array_unique($segments));
-//    }
-//
-//    /**
-//     * Return the edit route.
-//     *
-//     * @return string|null
-//     */
-//    public function edit()
-//    {
-//        $namespace = explode('.', $this->locator->locate($this->entry));
-//
-//        if (!$addon = $this->locator->locate($this->entry)) {
-//            return null;
-//        }
-//
-//        $segments = [
-//            'admin',
-//            array_pop($namespace),
-//            $this->entry->getStreamSlug(),
-//            'edit',
-//            $this->entry->getId(),
-//        ];
-//
-//        return implode('/', array_unique($segments));
-//    }
+    //    /**
+    //     * Return the create route.
+    //     *
+    //     * @return string|null
+    //     */
+    //    public function create()
+    //    {
+    //        $namespace = explode('.', $this->locator->locate($this->entry));
+    //
+    //        if (!$addon = $this->locator->locate($this->entry)) {
+    //            return null;
+    //        }
+    //
+    //        $segments = [
+    //            'admin',
+    //            array_pop($namespace),
+    //            $this->entry->getStreamSlug(),
+    //            'create',
+    //        ];
+    //
+    //        return implode('/', array_unique($segments));
+    //    }
+    //
+    //    /**
+    //     * Return the edit route.
+    //     *
+    //     * @return string|null
+    //     */
+    //    public function edit()
+    //    {
+    //        $namespace = explode('.', $this->locator->locate($this->entry));
+    //
+    //        if (!$addon = $this->locator->locate($this->entry)) {
+    //            return null;
+    //        }
+    //
+    //        $segments = [
+    //            'admin',
+    //            array_pop($namespace),
+    //            $this->entry->getStreamSlug(),
+    //            'edit',
+    //            $this->entry->getId(),
+    //        ];
+    //
+    //        return implode('/', array_unique($segments));
+    //    }
 }
diff --git a/src/Image/Image.php b/src/Image/Image.php
index ccac2b0bc..9066038d4 100644
--- a/src/Image/Image.php
+++ b/src/Image/Image.php
@@ -1,19 +1,22 @@
-<?php namespace Anomaly\Streams\Platform\Image;
+<?php
 
-use Anomaly\FilesModule\File\Contract\FileInterface;
-use Anomaly\FilesModule\File\FilePresenter;
-use Anomaly\Streams\Platform\Addon\FieldType\FieldType;
-use Anomaly\Streams\Platform\Application\Application;
-use Anomaly\Streams\Platform\Routing\UrlGenerator;
-use Collective\Html\HtmlBuilder;
-use Illuminate\Filesystem\Filesystem;
+namespace Anomaly\Streams\Platform\Image;
+
+use Mobile_Detect;
+use League\Flysystem\File;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
+use Robbo\Presenter\Presenter;
+use Collective\Html\HtmlBuilder;
 use Intervention\Image\Constraint;
-use Intervention\Image\ImageManager;
-use League\Flysystem\File;
 use League\Flysystem\MountManager;
-use Mobile_Detect;
-use Robbo\Presenter\Presenter;
+use Intervention\Image\ImageManager;
+use Illuminate\Filesystem\Filesystem;
+use Anomaly\FilesModule\File\FilePresenter;
+use Anomaly\Streams\Platform\Routing\UrlGenerator;
+use Anomaly\FilesModule\File\Contract\FileInterface;
+use Anomaly\Streams\Platform\Application\Application;
+use Anomaly\Streams\Platform\Addon\FieldType\FieldType;
 
 /**
  * Class Image
@@ -284,7 +287,7 @@ public function make($image, $output = null)
             $this->setOutput($output);
         }
 
-        $clone = clone($this);
+        $clone = clone ($this);
 
         $clone->setAlterations([]);
         $clone->setSources([]);
@@ -585,7 +588,7 @@ public function height($height = null)
      */
     public function setQuality($quality)
     {
-        $this->quality = (int)$quality;
+        $this->quality = (int) $quality;
 
         return $this;
     }
@@ -600,7 +603,7 @@ protected function getCachePath()
         if (starts_with($this->getImage(), ['http://', 'https://', '//'])) {
             return $this->getImage();
         }
-        
+
         $path = $this->paths->outputPath($this);
 
         try {
@@ -637,9 +640,8 @@ private function shouldPublish($path)
         }
 
         if (is_string($this->image) && str_is('*://*', $this->image) && filemtime($path) < app(
-                'League\Flysystem\MountManager'
-            )->getTimestamp($this->image)
-        ) {
+            'League\Flysystem\MountManager'
+        )->getTimestamp($this->image)) {
             return true;
         }
 
@@ -869,7 +871,7 @@ public function setImage($image)
         }
 
         // Replace path prefixes.
-        if (is_string($image) && str_contains($image, '::')) {
+        if (is_string($image) && Str::contains($image, '::')) {
 
             $image = $this->paths->realPath($image);
 
@@ -1362,7 +1364,7 @@ public function setDirectory($directory)
      */
     public function __toString()
     {
-        return (string)$this->output();
+        return (string) $this->output();
     }
 
     /**
diff --git a/src/Image/ImagePaths.php b/src/Image/ImagePaths.php
index 3c6f1c6e1..e15db84f5 100644
--- a/src/Image/ImagePaths.php
+++ b/src/Image/ImagePaths.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Image;
+<?php
 
+namespace Anomaly\Streams\Platform\Image;
+
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\FilesModule\File\Contract\FileInterface;
 use Anomaly\Streams\Platform\Application\Application;
-use Illuminate\Http\Request;
 
 /**
  * Class ImagePaths
@@ -95,7 +98,7 @@ public function addPath($namespace, $path)
      */
     public function realPath($path)
     {
-        if (str_contains($path, '::')) {
+        if (Str::contains($path, '::')) {
             list($namespace, $path) = explode('::', $path);
 
             if (!isset($this->paths[$namespace])) {
@@ -127,7 +130,7 @@ public function outputPath(Image $image)
          * and we don't have alterations
          * then just use it as it is.
          */
-        if (str_contains($path, public_path()) && !$image->getAlterations() && !$image->getQuality()) {
+        if (Str::contains($path, public_path()) && !$image->getAlterations() && !$image->getQuality()) {
             return str_replace(public_path(), '', $path);
         }
 
@@ -143,8 +146,8 @@ public function outputPath(Image $image)
 
             if ($image->getAlterations() || $image->getQuality()) {
                 $filename = md5(
-                        var_export([$path, $image->getAlterations()], true) . $image->getQuality()
-                    ) . '.' . $image->getExtension();
+                    var_export([$path, $image->getAlterations()], true) . $image->getQuality()
+                ) . '.' . $image->getExtension();
             }
 
             if ($rename = $image->getFilename()) {
@@ -173,8 +176,8 @@ public function outputPath(Image $image)
 
         if ($image->getAlterations() || $image->getQuality()) {
             $filename = md5(
-                    var_export([$path, $image->getAlterations()], true) . $image->getQuality()
-                ) . '.' . $image->getExtension();
+                var_export([$path, $image->getAlterations()], true) . $image->getQuality()
+            ) . '.' . $image->getExtension();
         }
 
         if ($rename = $image->getFilename()) {
diff --git a/src/Model/EloquentCollection.php b/src/Model/EloquentCollection.php
index 6f6ce792a..c830b9d33 100644
--- a/src/Model/EloquentCollection.php
+++ b/src/Model/EloquentCollection.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Model;
+<?php
 
-use Anomaly\Streams\Platform\Support\Decorator;
-use Anomaly\Streams\Platform\Traits\Hookable;
+namespace Anomaly\Streams\Platform\Model;
+
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Collection;
+use Anomaly\Streams\Platform\Traits\Hookable;
+use Anomaly\Streams\Platform\Support\Decorator;
 use Illuminate\Support\HigherOrderCollectionProxy;
 
 /**
@@ -117,7 +120,7 @@ public function whereLike($key, $values)
     {
         return $this->filter(
             function ($item) use ($key, $values) {
-                return str_contains(data_get($item, $key), $values);
+                return Str::contains(data_get($item, $key), $values);
             }
         );
     }
diff --git a/src/Stream/Console/Command/WriteEntityTestCases.php b/src/Stream/Console/Command/WriteEntityTestCases.php
index fbe5335e0..2e0dd51e5 100644
--- a/src/Stream/Console/Command/WriteEntityTestCases.php
+++ b/src/Stream/Console/Command/WriteEntityTestCases.php
@@ -1,9 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Stream\Console\Command;
+<?php
 
-use Anomaly\Streams\Platform\Addon\Addon;
-use Anomaly\Streams\Platform\Support\Parser;
+namespace Anomaly\Streams\Platform\Stream\Console\Command;
+
+use Illuminate\Support\Str;
 use Illuminate\Filesystem\Filesystem;
+use Anomaly\Streams\Platform\Addon\Addon;
 use Symfony\Component\Finder\SplFileInfo;
+use Anomaly\Streams\Platform\Support\Parser;
 
 /**
  * Class WriteEntityTestCases
@@ -59,10 +62,10 @@ public function __construct(Addon $addon, $slug, $namespace)
      */
     public function handle(Parser $parser, Filesystem $filesystem)
     {
-        $suffix = ucfirst(camel_case($this->slug));
-        $entity = str_singular($suffix);
+        $suffix = ucfirst(Str::camel($this->slug));
+        $entity = Str::singular($suffix);
 
-        $addon     = ucfirst(camel_case($this->addon->getSlug() . '_' . $this->addon->getType()));
+        $addon     = ucfirst(Str::camel($this->addon->getSlug() . '_' . $this->addon->getType()));
         $base      = $this->addon->getTransformedClass("Test\\{$addon}TestCase");
         $namespace = $this->addon->getTransformedClass("Test\\Unit\\{$entity}");
         $extends   = "{$addon}TestCase";
@@ -75,7 +78,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
         foreach ($filesystem->allFiles($this->addon->getPath("src/{$entity}")) as $file) {
 
             // Skip interfaces.
-            if (str_contains($file->getFilename(), 'Interface')) {
+            if (Str::contains($file->getFilename(), 'Interface')) {
                 continue;
             }
 
diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 127ca16aa..1dd8ebe32 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -1,49 +1,52 @@
-<?php namespace Anomaly\Streams\Platform;
+<?php
 
-use Anomaly\Streams\Platform\Addon\AddonManager;
-use Anomaly\Streams\Platform\Addon\Theme\Command\LoadCurrentTheme;
-use Anomaly\Streams\Platform\Application\Command\ConfigureFileCacheStore;
-use Anomaly\Streams\Platform\Application\Command\ConfigureTranslator;
-use Anomaly\Streams\Platform\Application\Command\ConfigureUriValidator;
-use Anomaly\Streams\Platform\Application\Command\InitializeApplication;
-use Anomaly\Streams\Platform\Application\Command\LoadEnvironmentOverrides;
-use Anomaly\Streams\Platform\Application\Command\LoadStreamsConfiguration;
-use Anomaly\Streams\Platform\Application\Command\SetApplicationDomain;
-use Anomaly\Streams\Platform\Application\Command\SetCoreConnection;
-use Anomaly\Streams\Platform\Asset\Command\AddAssetNamespaces;
-use Anomaly\Streams\Platform\Assignment\AssignmentModel;
-use Anomaly\Streams\Platform\Assignment\AssignmentObserver;
-use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
-use Anomaly\Streams\Platform\Entry\EntryModel;
-use Anomaly\Streams\Platform\Entry\EntryObserver;
+namespace Anomaly\Streams\Platform;
+
+use Illuminate\Support\Str;
+use Illuminate\Routing\Redirector;
+use Illuminate\Pagination\Paginator;
+use Illuminate\Support\ServiceProvider;
+use Asm89\Twig\CacheExtension\Extension;
+use Anomaly\Streams\Platform\Event\Ready;
 use Anomaly\Streams\Platform\Event\Booted;
+use Illuminate\Contracts\Cache\Repository;
 use Anomaly\Streams\Platform\Event\Booting;
-use Anomaly\Streams\Platform\Event\Ready;
+use Illuminate\Console\Scheduling\Schedule;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Anomaly\Streams\Platform\Entry\EntryModel;
 use Anomaly\Streams\Platform\Field\FieldModel;
+use Anomaly\Streams\Platform\Addon\AddonManager;
+use Anomaly\Streams\Platform\Stream\StreamModel;
+use Anomaly\Streams\Platform\Entry\EntryObserver;
 use Anomaly\Streams\Platform\Field\FieldObserver;
-use Anomaly\Streams\Platform\Http\Command\ConfigureRequest;
-use Anomaly\Streams\Platform\Image\Command\AddImageNamespaces;
 use Anomaly\Streams\Platform\Model\EloquentModel;
-use Anomaly\Streams\Platform\Model\EloquentObserver;
-use Anomaly\Streams\Platform\Routing\Command\IncludeRoutes;
+use Anomaly\Streams\Platform\View\Cache\CacheKey;
 use Anomaly\Streams\Platform\Routing\UrlGenerator;
-use Anomaly\Streams\Platform\Search\Command\ConfigureScout;
-use Anomaly\Streams\Platform\Stream\StreamModel;
 use Anomaly\Streams\Platform\Stream\StreamObserver;
+use Anomaly\Streams\Platform\Model\EloquentObserver;
 use Anomaly\Streams\Platform\View\Cache\CacheAdapter;
-use Anomaly\Streams\Platform\View\Cache\CacheKey;
 use Anomaly\Streams\Platform\View\Cache\CacheStrategy;
+use Anomaly\Streams\Platform\View\ViewServiceProvider;
+use Anomaly\Streams\Platform\Assignment\AssignmentModel;
+use Anomaly\Streams\Platform\Assignment\AssignmentObserver;
+use Anomaly\Streams\Platform\Http\Command\ConfigureRequest;
+use Anomaly\Streams\Platform\Routing\Command\IncludeRoutes;
+use Anomaly\Streams\Platform\Search\Command\ConfigureScout;
 use Anomaly\Streams\Platform\View\Command\AddViewNamespaces;
+use Anomaly\Streams\Platform\Asset\Command\AddAssetNamespaces;
+use Anomaly\Streams\Platform\Image\Command\AddImageNamespaces;
+use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
 use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
-use Anomaly\Streams\Platform\View\ViewServiceProvider;
-use Asm89\Twig\CacheExtension\Extension;
-use Illuminate\Console\Scheduling\Schedule;
-use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Pagination\Paginator;
-use Illuminate\Routing\Redirector;
-use Illuminate\Support\ServiceProvider;
+use Anomaly\Streams\Platform\Addon\Theme\Command\LoadCurrentTheme;
+use Anomaly\Streams\Platform\Application\Command\SetCoreConnection;
+use Anomaly\Streams\Platform\Application\Command\ConfigureTranslator;
+use Anomaly\Streams\Platform\Application\Command\SetApplicationDomain;
+use Anomaly\Streams\Platform\Application\Command\ConfigureUriValidator;
+use Anomaly\Streams\Platform\Application\Command\InitializeApplication;
+use Anomaly\Streams\Platform\Application\Command\ConfigureFileCacheStore;
+use Anomaly\Streams\Platform\Application\Command\LoadEnvironmentOverrides;
+use Anomaly\Streams\Platform\Application\Command\LoadStreamsConfiguration;
 
 /**
  * Class StreamsServiceProvider
@@ -234,12 +237,12 @@ function () use ($events) {
                 foreach (array_merge($this->schedule, config('streams.schedules', [])) as $frequency => $commands) {
                     foreach (array_filter($commands) as $command) {
 
-                        if (str_contains($frequency, ' ')) {
+                        if (Str::contains($frequency, ' ')) {
                             $schedule->command($command)->cron($frequency);
                         }
 
-                        if (!str_contains($frequency, ' ')) {
-                            $schedule->command($command)->{camel_case($frequency)}();
+                        if (!Str::contains($frequency, ' ')) {
+                            $schedule->command($command)->{Str::camel($frequency)}();
                         }
                     }
                 }
@@ -264,7 +267,8 @@ function (RegisteringTwigPlugins $event) {
                         $twig->addExtension(
                             new Extension(
                                 new CacheStrategy(
-                                    new CacheAdapter($this->app->make(Repository::class)), new CacheKey()
+                                    new CacheAdapter($this->app->make(Repository::class)),
+                                    new CacheKey()
                                 )
                             )
                         );
@@ -476,8 +480,10 @@ protected function overrideUrlSingleton()
             $routes = $app['router']->getRoutes();
 
             $url = new \Anomaly\Streams\Platform\Routing\UrlGenerator(
-                $routes, $app->rebinding(
-                    'request', function ($app, $request) {
+                $routes,
+                $app->rebinding(
+                    'request',
+                    function ($app, $request) {
                         $app['url']->setRequest($request);
                     }
                 )
@@ -504,5 +510,4 @@ protected function overrideUrlSingleton()
             return $url;
         });
     }
-
 }
diff --git a/src/Support/Parser.php b/src/Support/Parser.php
index 5ee5155ac..55cd25839 100644
--- a/src/Support/Parser.php
+++ b/src/Support/Parser.php
@@ -2,10 +2,11 @@
 
 namespace Anomaly\Streams\Platform\Support;
 
-use Anomaly\Streams\Platform\Routing\UrlGenerator;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Http\Request;
 use StringTemplate\Engine;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Routing\UrlGenerator;
 
 /**
  * Class Parser
@@ -77,7 +78,7 @@ public function parse($target, array $data = [])
          * if the target is a string and is in a parsable
          * format then parse the target with the payload.
          */
-        if (is_string($target) && str_contains($target, ['{', '}'])) {
+        if (is_string($target) && Str::contains($target, ['{', '}'])) {
             $target = $this->parser->render($target, $data);
         }
 
diff --git a/src/Support/Resolver.php b/src/Support/Resolver.php
index 688b70687..86b0ed3c1 100644
--- a/src/Support/Resolver.php
+++ b/src/Support/Resolver.php
@@ -1,5 +1,9 @@
-<?php namespace Anomaly\Streams\Platform\Support;
+<?php
 
+namespace Anomaly\Streams\Platform\Support;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Container\Container;
 
 /**
@@ -44,9 +48,9 @@ public function __construct(Container $container)
      */
     public function resolve($target, array $arguments = [], array $options = [])
     {
-        $method = array_get($options, 'method', 'handle');
+        $method = Arr::get($options, 'method', 'handle');
 
-        if ((is_string($target) && str_contains($target, '@')) || is_callable($target)) {
+        if ((is_string($target) && Str::contains($target, '@')) || is_callable($target)) {
             $target = $this->container->call($target, $arguments);
         } elseif (is_string($target) && class_exists($target) && method_exists($target, $method)) {
             $target = $this->container->call($target . '@' . $method, $arguments);
diff --git a/src/Support/Value.php b/src/Support/Value.php
index 89458ebb2..bf3d50acb 100644
--- a/src/Support/Value.php
+++ b/src/Support/Value.php
@@ -1,8 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Support;
+<?php
 
-use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
-use Anomaly\Streams\Platform\Model\EloquentModel;
+namespace Anomaly\Streams\Platform\Support;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Model\EloquentModel;
+use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 /**
  * Class Value
@@ -94,20 +98,20 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
             ];
         }
 
-        $value = array_get($parameters, 'value');
+        $value = Arr::get($parameters, 'value');
 
         /*
          * If the value is a view path then return a view.
          */
-        if ($view = array_get($parameters, 'view')) {
+        if ($view = Arr::get($parameters, 'view')) {
             return view($view, ['value' => $value, $term => $entry])->render();
         }
 
         /*
          * If the value uses a template then parse it.
          */
-        if ($template = array_get($parameters, 'template')) {
-            return (string)$this->template->render($template, ['value' => $value, $term => $entry]);
+        if ($template = Arr::get($parameters, 'template')) {
+            return (string) $this->template->render($template, ['value' => $value, $term => $entry]);
         }
 
         /*
@@ -138,7 +142,7 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
          * then parse it as a template.
          */
         if (is_string($value) && preg_match("/^{$term}.([a-zA-Z\\_]+)/", $value, $match)) {
-            $value = (string)$this->template->render("{{ {$value}|raw }}", $payload);
+            $value = (string) $this->template->render("{{ {$value}|raw }}", $payload);
         }
 
         $payload[$term] = $entry;
@@ -160,7 +164,7 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
         /*
          * Parse the value with the entry.
          */
-        if ($wrapper = array_get($parameters, 'wrapper')) {
+        if ($wrapper = Arr::get($parameters, 'wrapper')) {
             $value = $this->parser->parse(
                 $wrapper,
                 ['value' => $value, $term => $entry]
@@ -192,11 +196,11 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
          * If the value looks like a render-able
          * string then render it.
          */
-        if (is_string($value) && str_contains($value, ['{{', '{%'])) {
-            $value = (string)$this->template->render($value, [$term => $entry]);
+        if (is_string($value) && Str::contains($value, ['{{', '{%'])) {
+            $value = (string) $this->template->render($value, [$term => $entry]);
         }
 
-        if (is_string($value) && array_get($parameters, 'is_safe') !== true) {
+        if (is_string($value) && Arr::get($parameters, 'is_safe') !== true) {
             $value = $this->purifier->purify($value);
         }
 
diff --git a/src/Ui/ControlPanel/Component/Navigation/Command/SetActiveNavigationLink.php b/src/Ui/ControlPanel/Component/Navigation/Command/SetActiveNavigationLink.php
index ba5fb6439..452ad3872 100644
--- a/src/Ui/ControlPanel/Component/Navigation/Command/SetActiveNavigationLink.php
+++ b/src/Ui/ControlPanel/Component/Navigation/Command/SetActiveNavigationLink.php
@@ -1,10 +1,13 @@
-<?php namespace Anomaly\Streams\Platform\Ui\ControlPanel\Component\Navigation\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\ControlPanel\Component\Navigation\Command;
+
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\Streams\Platform\Support\Authorizer;
 use Anomaly\Streams\Platform\Ui\Breadcrumb\BreadcrumbCollection;
-use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Navigation\Contract\NavigationLinkInterface;
 use Anomaly\Streams\Platform\Ui\ControlPanel\ControlPanelBuilder;
-use Illuminate\Http\Request;
+use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Navigation\Contract\NavigationLinkInterface;
 
 /**
  * Class SetActiveNavigationLink
@@ -70,7 +73,7 @@ public function handle(Request $request, Authorizer $authorizer, BreadcrumbColle
              * If the request URL does not even
              * contain the HREF then skip it.
              */
-            if (!str_contains($request->url(), $href)) {
+            if (!Str::contains($request->url(), $href)) {
                 continue;
             }
 
@@ -93,7 +96,7 @@ public function handle(Request $request, Authorizer $authorizer, BreadcrumbColle
         if (!$active) {
             return;
         }
-        
+
         // Active navigation link!
         $active->setActive(true);
 
diff --git a/src/Ui/ControlPanel/Component/Section/Command/SetActiveSection.php b/src/Ui/ControlPanel/Component/Section/Command/SetActiveSection.php
index 3723d3920..65cb096fd 100644
--- a/src/Ui/ControlPanel/Component/Section/Command/SetActiveSection.php
+++ b/src/Ui/ControlPanel/Component/Section/Command/SetActiveSection.php
@@ -1,11 +1,14 @@
-<?php namespace Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\Command;
+<?php
 
-use Anomaly\Streams\Platform\Support\Authorizer;
+namespace Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\Command;
+
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\Streams\Platform\Support\Parser;
+use Anomaly\Streams\Platform\Support\Authorizer;
 use Anomaly\Streams\Platform\Ui\Breadcrumb\BreadcrumbCollection;
-use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\Contract\SectionInterface;
 use Anomaly\Streams\Platform\Ui\ControlPanel\ControlPanelBuilder;
-use Illuminate\Http\Request;
+use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\Contract\SectionInterface;
 
 /**
  * Class SetActiveSection
@@ -76,7 +79,7 @@ public function handle(Parser $parser, Request $request, Authorizer $authorizer,
              * If the request URL does not even
              * contain the HREF then skip it.
              */
-            if (!str_contains($request->url(), $href)) {
+            if (!Str::contains($request->url(), $href)) {
                 continue;
             }
 
diff --git a/src/Ui/Form/Command/HandleForm.php b/src/Ui/Form/Command/HandleForm.php
index ad95bad71..44ce5136c 100644
--- a/src/Ui/Form/Command/HandleForm.php
+++ b/src/Ui/Form/Command/HandleForm.php
@@ -1,7 +1,10 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php
 
-use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+namespace Anomaly\Streams\Platform\Ui\Form\Command;
+
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 
 /**
  * Class HandleForm
@@ -43,7 +46,7 @@ public function handle(Container $container)
 
         $handler = $this->builder->getHandler();
 
-        if ($handler && !str_contains($handler, '@')) {
+        if ($handler && !Str::contains($handler, '@')) {
             $handler .= '@handle';
         }
 
diff --git a/src/Ui/Form/Command/SetDefaultParameters.php b/src/Ui/Form/Command/SetDefaultParameters.php
index 708a728b6..cdf660a42 100644
--- a/src/Ui/Form/Command/SetDefaultParameters.php
+++ b/src/Ui/Form/Command/SetDefaultParameters.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Form\Command;
+
+use Illuminate\Support\Str;
+use Anomaly\Streams\Platform\Ui\Form\FormRules;
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 use Anomaly\Streams\Platform\Ui\Form\FormHandler;
-use Anomaly\Streams\Platform\Ui\Form\FormRules;
 use Anomaly\Streams\Platform\Ui\Form\FormValidator;
 
 /**
@@ -112,7 +115,7 @@ public function handle()
                  * Make sure the handler is
                  * formatted properly.
                  */
-                if (!str_contains($handler, '@')) {
+                if (!Str::contains($handler, '@')) {
                     $handler .= '@handle';
                 }
 
diff --git a/src/Ui/Form/Command/SetSuccessMessage.php b/src/Ui/Form/Command/SetSuccessMessage.php
index 7703b5979..5890e86a1 100644
--- a/src/Ui/Form/Command/SetSuccessMessage.php
+++ b/src/Ui/Form/Command/SetSuccessMessage.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Form\Command;
+
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\Streams\Platform\Message\MessageBag;
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
-use Illuminate\Http\Request;
 
 /**
  * Class SetSuccessMessage
@@ -61,10 +64,10 @@ public function handle(Request $request, MessageBag $messages)
         ];
 
         // If the name doesn't exist we need to be clever.
-        if (str_contains($parameters['name'], '::') && !trans()->has($parameters['name']) && $stream) {
-            $parameters['name'] = ucfirst(str_singular(str_replace('_', ' ', $stream->getSlug())));
+        if (Str::contains($parameters['name'], '::') && !trans()->has($parameters['name']) && $stream) {
+            $parameters['name'] = ucfirst(Str::singular(str_replace('_', ' ', $stream->getSlug())));
         } elseif ($parameters['name']) {
-            $parameters['name'] = str_singular(trans($parameters['name']));
+            $parameters['name'] = Str::singular(trans($parameters['name']));
         } else {
             $parameters['name'] = trans('streams::entry.name');
         }
diff --git a/src/Ui/Form/Command/ValidateForm.php b/src/Ui/Form/Command/ValidateForm.php
index 3767b8acf..7570d818a 100644
--- a/src/Ui/Form/Command/ValidateForm.php
+++ b/src/Ui/Form/Command/ValidateForm.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php
 
-use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
-use Anomaly\Streams\Platform\Support\Resolver;
+namespace Anomaly\Streams\Platform\Ui\Form\Command;
+
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Support\Resolver;
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 
 /**
  * Class ValidateForm
@@ -47,7 +50,7 @@ public function handle(Container $container, Resolver $resolver)
         /*
          * If it's self handling just add @handle
          */
-        if ($validator && !str_contains($validator, '@')) {
+        if ($validator && !Str::contains($validator, '@')) {
             $validator .= '@handle';
         }
 
diff --git a/src/Ui/Form/Component/Action/ActionResponder.php b/src/Ui/Form/Component/Action/ActionResponder.php
index c162b45ab..b2e8d7573 100644
--- a/src/Ui/Form/Component/Action/ActionResponder.php
+++ b/src/Ui/Form/Component/Action/ActionResponder.php
@@ -1,9 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Component\Action;
+<?php
 
-use Anomaly\Streams\Platform\Ui\Form\Component\Action\Contract\ActionHandlerInterface;
-use Anomaly\Streams\Platform\Ui\Form\Component\Action\Contract\ActionInterface;
-use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+namespace Anomaly\Streams\Platform\Ui\Form\Component\Action;
+
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+use Anomaly\Streams\Platform\Ui\Form\Component\Action\Contract\ActionInterface;
+use Anomaly\Streams\Platform\Ui\Form\Component\Action\Contract\ActionHandlerInterface;
 
 /**
  * Class ActionResponder
@@ -44,7 +47,7 @@ public function setFormResponse(FormBuilder $builder, ActionInterface $action)
         $handler = $action->getHandler();
 
         // Self handling implies @handle
-        if (is_string($handler) && !str_contains($handler, '@')) {
+        if (is_string($handler) && !Str::contains($handler, '@')) {
             $handler .= '@handle';
         }
 
diff --git a/src/Ui/Form/Component/Button/Guesser/HrefGuesser.php b/src/Ui/Form/Component/Button/Guesser/HrefGuesser.php
index dc3c52c74..94b181c02 100644
--- a/src/Ui/Form/Component/Button/Guesser/HrefGuesser.php
+++ b/src/Ui/Form/Component/Button/Guesser/HrefGuesser.php
@@ -1,10 +1,14 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Component\Button\Guesser;
+<?php
 
-use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\SectionCollection;
-use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
-use Anomaly\Streams\Platform\Ui\Form\Multiple\MultipleFormBuilder;
+namespace Anomaly\Streams\Platform\Ui\Form\Component\Button\Guesser;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use Illuminate\Routing\UrlGenerator;
+use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
+use Anomaly\Streams\Platform\Ui\Form\Multiple\MultipleFormBuilder;
+use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\SectionCollection;
 
 /**
  * Class HrefGuesser
@@ -84,7 +88,7 @@ public function guess(FormBuilder $builder)
                 continue;
             }
 
-            switch (array_get($button, 'button')) {
+            switch (Arr::get($button, 'button')) {
 
                 case 'cancel':
                     $button['attributes']['href'] = $section->getHref();
@@ -97,9 +101,9 @@ public function guess(FormBuilder $builder)
                 default:
 
                     // Determine the HREF based on the button type.
-                    $type = array_get($button, 'segment', array_get($button, 'button'));
+                    $type = Arr::get($button, 'segment', Arr::get($button, 'button'));
 
-                    if ($type && !str_contains($type, '\\') && !class_exists($type)) {
+                    if ($type && !Str::contains($type, '\\') && !class_exists($type)) {
                         if ($builder instanceof MultipleFormBuilder) {
                             $button['attributes']['href'] = $section->getHref($type . '/{request.route.parameters.id}');
                         } else {
diff --git a/src/Ui/Form/FormAttributes.php b/src/Ui/Form/FormAttributes.php
index ac48aebec..5a1a3553c 100644
--- a/src/Ui/Form/FormAttributes.php
+++ b/src/Ui/Form/FormAttributes.php
@@ -1,5 +1,8 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Form;
+
+use Illuminate\Support\Str;
 use Anomaly\Streams\Platform\Addon\FieldType\FieldType;
 
 /**
@@ -27,7 +30,7 @@ public function make(FormBuilder $builder)
 
             $label = $field->getLabel() ?: ucfirst(humanize($field->getField()));
 
-            if (str_contains($label, '::')) {
+            if (Str::contains($label, '::')) {
                 $label = trans($label);
             }
 
diff --git a/src/Ui/Form/FormExtender.php b/src/Ui/Form/FormExtender.php
index c1907a84c..b4a7b26ff 100644
--- a/src/Ui/Form/FormExtender.php
+++ b/src/Ui/Form/FormExtender.php
@@ -2,10 +2,11 @@
 
 namespace Anomaly\Streams\Platform\Ui\Form;
 
-use Anomaly\Streams\Platform\Addon\FieldType\FieldType;
-use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Factory;
 use Illuminate\Validation\Validator;
+use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Addon\FieldType\FieldType;
 
 /**
  * Class FormExtender
@@ -59,7 +60,7 @@ protected function registerValidators(Factory $factory, FormBuilder $builder, Fi
         foreach ($fieldType->getValidators() as $rule => $validator) {
             $handler = array_get($validator, 'handler');
 
-            if (is_string($handler) && !str_contains($handler, '@')) {
+            if (is_string($handler) && !Str::contains($handler, '@')) {
                 $handler .= '@handle';
             }
 
diff --git a/src/Ui/Form/FormMessages.php b/src/Ui/Form/FormMessages.php
index 289e37b10..e85aff9c3 100644
--- a/src/Ui/Form/FormMessages.php
+++ b/src/Ui/Form/FormMessages.php
@@ -1,4 +1,9 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form;
+<?php
+
+namespace Anomaly\Streams\Platform\Ui\Form;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 
 /**
  * Class FormMessages
@@ -22,23 +27,23 @@ public function make(FormBuilder $builder)
 
         foreach ($builder->getEnabledFormFields() as $field) {
             foreach ($field->getValidators() as $rule => $validator) {
-                if ($message = array_get($validator, 'message')) {
+                if ($message = Arr::get($validator, 'message')) {
                     $message = trans($message);
                 }
 
-                if ($message && str_contains($message, '::')) {
+                if ($message && Str::contains($message, '::')) {
                     $message = trans($message);
                 }
 
-                $messages[$field->prefix.$field->field.'.'.$rule] = $message;
+                $messages[$field->prefix . $field->field . '.' . $rule] = $message;
             }
 
             foreach ($field->getMessages() as $rule => $message) {
-                if ($message && str_contains($message, '::')) {
+                if ($message && Str::contains($message, '::')) {
                     $message = trans($message);
                 }
 
-                $messages[$field->prefix.$field->field.'.'.$rule] = $message;
+                $messages[$field->prefix . $field->field . '.' . $rule] = $message;
             }
         }
 
diff --git a/src/Ui/Table/Command/SetDefaultParameters.php b/src/Ui/Table/Command/SetDefaultParameters.php
index 4b4117991..fef36c536 100644
--- a/src/Ui/Table/Command/SetDefaultParameters.php
+++ b/src/Ui/Table/Command/SetDefaultParameters.php
@@ -1,5 +1,8 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Table\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Table\Command;
+
+use Illuminate\Support\Str;
 use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
 
 /**
@@ -92,7 +95,7 @@ public function handle()
                  * Make sure the handler is
                  * formatted properly.
                  */
-                if (!str_contains($handler, '@')) {
+                if (!Str::contains($handler, '@')) {
                     $handler .= '@handle';
                 }
 
diff --git a/src/Ui/Table/Component/Action/ActionExecutor.php b/src/Ui/Table/Component/Action/ActionExecutor.php
index 80aca0e2d..c7b97a504 100644
--- a/src/Ui/Table/Component/Action/ActionExecutor.php
+++ b/src/Ui/Table/Component/Action/ActionExecutor.php
@@ -1,13 +1,16 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Table\Component\Action;
+<?php
 
-use Anomaly\Streams\Platform\Addon\Module\ModuleCollection;
+namespace Anomaly\Streams\Platform\Ui\Table\Component\Action;
+
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use Illuminate\Foundation\Application;
 use Anomaly\Streams\Platform\Message\MessageBag;
 use Anomaly\Streams\Platform\Support\Authorizer;
-use Anomaly\Streams\Platform\Ui\Table\Component\Action\Contract\ActionHandlerInterface;
-use Anomaly\Streams\Platform\Ui\Table\Component\Action\Contract\ActionInterface;
 use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
-use Illuminate\Foundation\Application;
-use Illuminate\Http\Request;
+use Anomaly\Streams\Platform\Addon\Module\ModuleCollection;
+use Anomaly\Streams\Platform\Ui\Table\Component\Action\Contract\ActionInterface;
+use Anomaly\Streams\Platform\Ui\Table\Component\Action\Contract\ActionHandlerInterface;
 
 /**
  * Class ActionExecutor
@@ -90,7 +93,7 @@ public function execute(TableBuilder $builder, ActionInterface $action)
         $handler = $action->getHandler();
 
         // Self handling implies @handle
-        if (is_string($handler) && !str_contains($handler, '@')) {
+        if (is_string($handler) && !Str::contains($handler, '@')) {
             $handler .= '@handle';
         }
 
diff --git a/src/Ui/Table/Component/Button/Guesser/HrefGuesser.php b/src/Ui/Table/Component/Button/Guesser/HrefGuesser.php
index 399a27b18..b5363e73e 100644
--- a/src/Ui/Table/Component/Button/Guesser/HrefGuesser.php
+++ b/src/Ui/Table/Component/Button/Guesser/HrefGuesser.php
@@ -1,11 +1,15 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Table\Component\Button\Guesser;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Table\Component\Button\Guesser;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use Illuminate\Routing\UrlGenerator;
+use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
 use Anomaly\Streams\Platform\Addon\Module\ModuleCollection;
 use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Section\SectionCollection;
-use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
-use Illuminate\Http\Request;
-use Illuminate\Routing\UrlGenerator;
 
 /**
  * Class HrefGuesser
@@ -106,13 +110,12 @@ public function guess(TableBuilder $builder)
                 continue;
             }
 
-            switch (array_get($button, 'button')) {
+            switch (Arr::get($button, 'button')) {
 
                 case 'restore':
 
                     $button['attributes']['href'] = $this->url->to(
-                        'entry/handle/restore/' . $module->getNamespace() . '/' . $stream->getNamespace(
-                        ) . '/' . $stream->getSlug() . '/{entry.id}'
+                        'entry/handle/restore/' . $module->getNamespace() . '/' . $stream->getNamespace() . '/' . $stream->getSlug() . '/{entry.id}'
                     );
 
                     break;
@@ -120,9 +123,9 @@ public function guess(TableBuilder $builder)
                 default:
 
                     // Determine the HREF based on the button type.
-                    $type = array_get($button, 'segment', array_get($button, 'button'));
+                    $type = Arr::get($button, 'segment', Arr::get($button, 'button'));
 
-                    if ($type && !str_contains($type, '\\') && !class_exists($type)) {
+                    if ($type && !Str::contains($type, '\\') && !class_exists($type)) {
                         $button['attributes']['href'] = $section->getHref($type . '/{entry.id}');
                     }
 
diff --git a/src/Ui/Table/Component/Filter/FilterNormalizer.php b/src/Ui/Table/Component/Filter/FilterNormalizer.php
index 444d35110..140be55a8 100644
--- a/src/Ui/Table/Component/Filter/FilterNormalizer.php
+++ b/src/Ui/Table/Component/Filter/FilterNormalizer.php
@@ -1,5 +1,8 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Table\Component\Filter;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Table\Component\Filter;
+
+use Illuminate\Support\Str;
 use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
 
 /**
@@ -42,7 +45,7 @@ public function normalize(TableBuilder $builder)
              * If the filter is a string and is
              * not core then use it for everything.
              */
-            if (is_string($filter) && !str_contains($filter, '/') && !$this->isCoreAttribute($filter)) {
+            if (is_string($filter) && !Str::contains($filter, '/') && !$this->isCoreAttribute($filter)) {
                 $filter = [
                     'slug'   => $filter,
                     'field'  => $filter,
@@ -54,7 +57,7 @@ public function normalize(TableBuilder $builder)
              * If the filter is a string and
              * core then use it for everything.
              */
-            if (is_string($filter) && !str_contains($filter, '/') && $this->isCoreAttribute($filter)) {
+            if (is_string($filter) && !Str::contains($filter, '/') && $this->isCoreAttribute($filter)) {
                 $filter = [
                     'slug'   => $filter,
                     'field'  => $filter,
@@ -66,7 +69,7 @@ public function normalize(TableBuilder $builder)
              * If the filter is a class string then use
              * it for the filter.
              */
-            if (is_string($filter) && str_contains($filter, '/')) {
+            if (is_string($filter) && Str::contains($filter, '/')) {
                 $filter = [
                     'slug'   => $slug,
                     'filter' => $filter,
diff --git a/src/Ui/Table/Component/Filter/FilterQuery.php b/src/Ui/Table/Component/Filter/FilterQuery.php
index 76c6617da..8d89bdd60 100644
--- a/src/Ui/Table/Component/Filter/FilterQuery.php
+++ b/src/Ui/Table/Component/Filter/FilterQuery.php
@@ -1,9 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Table\Component\Filter;
+<?php
 
-use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Contract\FilterInterface;
-use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
-use Illuminate\Contracts\Container\Container;
+namespace Anomaly\Streams\Platform\Ui\Table\Component\Filter;
+
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
+use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Contract\FilterInterface;
 
 /**
  * Class FilterQuery
@@ -61,7 +64,7 @@ public function filter(TableBuilder $builder, FilterInterface $filter, Builder $
         $handler = $filter->getQuery();
 
         // Self handling implies @handle
-        if (is_string($handler) && !str_contains($handler, '@')) {
+        if (is_string($handler) && !Str::contains($handler, '@')) {
             $handler .= '@handle';
         }
 
diff --git a/src/Ui/Table/Component/View/ViewQuery.php b/src/Ui/Table/Component/View/ViewQuery.php
index 92805194b..ad3a6c0bf 100644
--- a/src/Ui/Table/Component/View/ViewQuery.php
+++ b/src/Ui/Table/Component/View/ViewQuery.php
@@ -1,10 +1,13 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Table\Component\View;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Table\Component\View;
+
+use Illuminate\Support\Str;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
 use Anomaly\Streams\Platform\Ui\Table\Component\View\Contract\ViewInterface;
 use Anomaly\Streams\Platform\Ui\Table\Component\View\Contract\ViewQueryInterface;
-use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
-use Illuminate\Contracts\Container\Container;
-use Illuminate\Database\Eloquent\Builder;
 
 /**
  * Class ViewQuery
@@ -51,7 +54,7 @@ public function handle(TableBuilder $builder, Builder $query, ViewInterface $vie
         }
 
         // Self handling implies @handle
-        if (is_string($handler) && !str_contains($handler, '@')) {
+        if (is_string($handler) && !Str::contains($handler, '@')) {
             $handler .= '@handle';
         }
 
diff --git a/src/View/Command/GetLayoutName.php b/src/View/Command/GetLayoutName.php
index 014a7ad16..dd0e4ca07 100644
--- a/src/View/Command/GetLayoutName.php
+++ b/src/View/Command/GetLayoutName.php
@@ -1,5 +1,8 @@
-<?php namespace Anomaly\Streams\Platform\View\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\View\Command;
+
+use Illuminate\Support\Str;
 use Illuminate\Contracts\View\Factory;
 
 /**
@@ -46,7 +49,7 @@ public function __construct($layout, $default = 'default')
      */
     public function handle(Factory $view)
     {
-        if (str_contains($this->layout, '::')) {
+        if (Str::contains($this->layout, '::')) {
             return $this->layout;
         }
 
@@ -54,6 +57,6 @@ public function handle(Factory $view)
             return $layout;
         }
 
-        return str_contains($this->default, '::') ? $this->default : "theme::layouts/{$this->default}";
+        return Str::contains($this->default, '::') ? $this->default : "theme::layouts/{$this->default}";
     }
 }
diff --git a/src/View/Twig/Loader.php b/src/View/Twig/Loader.php
index 2c0dde0ec..4f397cd28 100644
--- a/src/View/Twig/Loader.php
+++ b/src/View/Twig/Loader.php
@@ -2,17 +2,18 @@
 
 namespace Anomaly\Streams\Platform\View\Twig;
 
-use Anomaly\Streams\Platform\Addon\AddonCollection;
-use Anomaly\Streams\Platform\Addon\Module\Module;
-use Anomaly\Streams\Platform\Addon\Theme\Theme;
-use Anomaly\Streams\Platform\View\ViewMobileOverrides;
-use Anomaly\Streams\Platform\View\ViewOverrides;
+use Mobile_Detect;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Illuminate\Console\Application;
-use Illuminate\Contracts\View\Factory;
 use Illuminate\Filesystem\Filesystem;
-use Illuminate\Http\Request;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\View\ViewFinderInterface;
-use Mobile_Detect;
+use Anomaly\Streams\Platform\Addon\Theme\Theme;
+use Anomaly\Streams\Platform\View\ViewOverrides;
+use Anomaly\Streams\Platform\Addon\Module\Module;
+use Anomaly\Streams\Platform\Addon\AddonCollection;
+use Anomaly\Streams\Platform\View\ViewMobileOverrides;
 
 /**
  * Basic loader using absolute paths.
@@ -185,7 +186,7 @@ protected function getOverloadPath($name)
          * We can only overload namespaced
          * views right now.
          */
-        if (!str_contains($name, '::')) {
+        if (!Str::contains($name, '::')) {
             return null;
         }
 
@@ -211,7 +212,7 @@ protected function getOverloadPath($name)
             $this->overrides->all(),
             config('streams.overrides', [])
         );
-        
+
         /**
          * Normalize the theme:: shortcut prefix.
          */
diff --git a/src/View/ViewComposer.php b/src/View/ViewComposer.php
index dec446348..326a902e6 100644
--- a/src/View/ViewComposer.php
+++ b/src/View/ViewComposer.php
@@ -1,14 +1,17 @@
-<?php namespace Anomaly\Streams\Platform\View;
+<?php
 
-use Anomaly\Streams\Platform\Addon\AddonCollection;
-use Anomaly\Streams\Platform\Addon\Module\Module;
+namespace Anomaly\Streams\Platform\View;
+
+use Mobile_Detect;
+use Illuminate\View\View;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\Streams\Platform\Addon\Theme\Theme;
-use Anomaly\Streams\Platform\Application\Application;
 use Anomaly\Streams\Platform\Support\Decorator;
+use Anomaly\Streams\Platform\Addon\Module\Module;
+use Anomaly\Streams\Platform\Addon\AddonCollection;
+use Anomaly\Streams\Platform\Application\Application;
 use Anomaly\Streams\Platform\View\Event\ViewComposed;
-use Illuminate\Http\Request;
-use Illuminate\View\View;
-use Mobile_Detect;
 
 /**
  * Class ViewComposer
@@ -211,7 +214,7 @@ public function getOverloadPath(View $view)
          * We can only overload namespaced
          * views right now.
          */
-        if (!str_contains($view->getName(), '::')) {
+        if (!Str::contains($view->getName(), '::')) {
             return null;
         }
 
@@ -250,5 +253,4 @@ public function getOverloadPath(View $view)
 
         return null;
     }
-
 }

From 9c3b654b9c1891ca0b3444725e824a19e4d58387 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 9 Jun 2020 12:44:47 -0500
Subject: [PATCH 058/256] Document

---
 docs/en/01.prologue/02.change-log.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 955e2b15a..640450b2f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,16 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.28] - 2020-09-09
+#### Fixed
+- Replaced all `str_contains()` with `Str::contains()` and unlocked Symfony dependencies.
+
+
+### [1.7.27] - 2020-09-01
+#### Fixed
+- Hotfixed PHP 8 `str_contains` function by locking dependencies before Symfony polyfil.
+
+
 ### [1.7.26] - 2020-03-22
 #### Changed
 - Changed `ProxySession` to set the `secure cookie` flag to a sensible default.

From 35670f2e0f4747026ed4e1273e9e8fc65991d2b6 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 9 Jun 2020 12:57:59 -0500
Subject: [PATCH 059/256] Necessary str_contains replacements.

---
 src/Addon/FieldType/FieldTypeSchema.php       | 23 +++++++++++--------
 .../Command/WriteEnvironmentFile.php          |  9 +++++---
 src/Model/EloquentCollection.php              | 11 +++++----
 src/Support/Parser.php                        | 13 +++++++----
 src/Support/Value.php                         | 17 ++++++++------
 5 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/src/Addon/FieldType/FieldTypeSchema.php b/src/Addon/FieldType/FieldTypeSchema.php
index 2b652a0ab..5d3c9dd60 100644
--- a/src/Addon/FieldType/FieldTypeSchema.php
+++ b/src/Addon/FieldType/FieldTypeSchema.php
@@ -1,12 +1,15 @@
-<?php namespace Anomaly\Streams\Platform\Addon\FieldType;
+<?php
 
-use Anomaly\Streams\Platform\Assignment\Contract\AssignmentInterface;
-use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Contracts\Container\Container;
+namespace Anomaly\Streams\Platform\Addon\FieldType;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\Fluent;
 use Illuminate\Database\Connection;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
-use Illuminate\Support\Fluent;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Assignment\Contract\AssignmentInterface;
 
 /**
  * Class FieldTypeSchema
@@ -105,7 +108,7 @@ public function addColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true);
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
             $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
         }
     }
@@ -164,7 +167,7 @@ public function updateColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true)->change();
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
             $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
         }
     }
@@ -243,7 +246,7 @@ public function changeColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true)->change();
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
             $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
         }
     }
@@ -370,7 +373,7 @@ public function restoreColumn(Blueprint $table, AssignmentInterface $assignment)
 
         foreach ($results as $result) {
 
-            $result = (array)$result;
+            $result = (array) $result;
 
             $this->connection
                 ->table($table->getTable())
diff --git a/src/Application/Command/WriteEnvironmentFile.php b/src/Application/Command/WriteEnvironmentFile.php
index 47849dbdc..569c9d978 100644
--- a/src/Application/Command/WriteEnvironmentFile.php
+++ b/src/Application/Command/WriteEnvironmentFile.php
@@ -1,5 +1,8 @@
-<?php namespace Anomaly\Streams\Platform\Application\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Application\Command;
+
+use Illuminate\Support\Str;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
@@ -39,8 +42,8 @@ public function handle()
         $contents = '';
 
         foreach ($this->data as $key => $value) {
-            
-            if (str_contains($value, [' ', '$', '\n'])) {
+
+            if (Str::contains($value, [' ', '$', '\n'])) {
                 $value = '"' . trim($value, '"') . '"';
             }
 
diff --git a/src/Model/EloquentCollection.php b/src/Model/EloquentCollection.php
index 6f6ce792a..c830b9d33 100644
--- a/src/Model/EloquentCollection.php
+++ b/src/Model/EloquentCollection.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Model;
+<?php
 
-use Anomaly\Streams\Platform\Support\Decorator;
-use Anomaly\Streams\Platform\Traits\Hookable;
+namespace Anomaly\Streams\Platform\Model;
+
+use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Collection;
+use Anomaly\Streams\Platform\Traits\Hookable;
+use Anomaly\Streams\Platform\Support\Decorator;
 use Illuminate\Support\HigherOrderCollectionProxy;
 
 /**
@@ -117,7 +120,7 @@ public function whereLike($key, $values)
     {
         return $this->filter(
             function ($item) use ($key, $values) {
-                return str_contains(data_get($item, $key), $values);
+                return Str::contains(data_get($item, $key), $values);
             }
         );
     }
diff --git a/src/Support/Parser.php b/src/Support/Parser.php
index 4d265f22f..8a935ff49 100644
--- a/src/Support/Parser.php
+++ b/src/Support/Parser.php
@@ -1,9 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Support;
+<?php
+
+namespace Anomaly\Streams\Platform\Support;
 
-use Anomaly\Streams\Platform\Routing\UrlGenerator;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Http\Request;
 use StringTemplate\Engine;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Routing\UrlGenerator;
 
 /**
  * Class Parser
@@ -75,7 +78,7 @@ public function parse($target, array $data = [])
          * if the target is a string and is in a parsable
          * format then parse the target with the payload.
          */
-        if (is_string($target) && str_contains($target, ['{', '}'])) {
+        if (is_string($target) && Str::contains($target, ['{', '}'])) {
             $target = $this->parser->render($target, $data);
         }
 
diff --git a/src/Support/Value.php b/src/Support/Value.php
index 89458ebb2..7f2568ed7 100644
--- a/src/Support/Value.php
+++ b/src/Support/Value.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Support;
+<?php
 
-use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
-use Anomaly\Streams\Platform\Model\EloquentModel;
+namespace Anomaly\Streams\Platform\Support;
+
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Model\EloquentModel;
+use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 /**
  * Class Value
@@ -107,7 +110,7 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
          * If the value uses a template then parse it.
          */
         if ($template = array_get($parameters, 'template')) {
-            return (string)$this->template->render($template, ['value' => $value, $term => $entry]);
+            return (string) $this->template->render($template, ['value' => $value, $term => $entry]);
         }
 
         /*
@@ -138,7 +141,7 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
          * then parse it as a template.
          */
         if (is_string($value) && preg_match("/^{$term}.([a-zA-Z\\_]+)/", $value, $match)) {
-            $value = (string)$this->template->render("{{ {$value}|raw }}", $payload);
+            $value = (string) $this->template->render("{{ {$value}|raw }}", $payload);
         }
 
         $payload[$term] = $entry;
@@ -192,8 +195,8 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
          * If the value looks like a render-able
          * string then render it.
          */
-        if (is_string($value) && str_contains($value, ['{{', '{%'])) {
-            $value = (string)$this->template->render($value, [$term => $entry]);
+        if (is_string($value) && Str::contains($value, ['{{', '{%'])) {
+            $value = (string) $this->template->render($value, [$term => $entry]);
         }
 
         if (is_string($value) && array_get($parameters, 'is_safe') !== true) {

From 10f67b259be515c64d66ea4415d6e0c13488e223 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 9 Jun 2020 12:59:23 -0500
Subject: [PATCH 060/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 911804e70..8b5b28a3d 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.187] - 2020-06-09
+#### Fixed
+- Fixed issues where `str_contains` was using arrays. Conflict with PHP8/polyfil. 
+
+
 ### [1.6.186] - 2020-03-22
 #### Changed
 - Changed `ProxySession` to set the `secure cookie` flag to a sensible default.

From 59832a72e81683c391ec6dcd986d6385948a3a69 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 11 Jun 2020 12:52:16 -0500
Subject: [PATCH 061/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 640450b2f..0ebdde4ae 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.29] - 2020-09-11
+#### Fixed
+- Replace a couple remaining "helper_function" instances with `Illuminate\Support\*` functionality.
+
+
 ### [1.7.28] - 2020-09-09
 #### Fixed
 - Replaced all `str_contains()` with `Str::contains()` and unlocked Symfony dependencies.

From 7eba0801509d27315b073b7007bb58a0c2eab20f Mon Sep 17 00:00:00 2001
From: schmidex <JonasSch@web.de>
Date: Sat, 13 Jun 2020 15:47:30 +0200
Subject: [PATCH 062/256] update twig

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ed5ba851d..dbbdfdf77 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",
         "laravelcollective/html": "5.8.*",
-        "twig/twig": "~2.6.0",
+        "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "3.2.*",
         "coffeescript/coffeescript": "1.3.*",
         "erusev/parsedown-extra": "0.7.1",

From cda7482f916b77495e4c08f2e7d8ecfee0e27ab1 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 15 Jun 2020 10:01:39 -0500
Subject: [PATCH 063/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 0ebdde4ae..9d728a8d6 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.7.30] - 2020-09-15
+#### Changed
+- Updated Twig slightly for better support with PHP 7.4.
+
+
 ### [1.7.29] - 2020-09-11
 #### Fixed
 - Replace a couple remaining "helper_function" instances with `Illuminate\Support\*` functionality.

From e568e6b52534c2073d42992d01e747bb5cdf4263 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 17 Jun 2020 10:52:59 -0500
Subject: [PATCH 064/256] Remove array use of str_contains

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 src/Image/ImagePaths.php             | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 8b5b28a3d..4430dc0a0 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.188] - 2020-06-17
+#### Fixed
+- More `str_contains` conflicts with PHP8/polyfil cleared out.
+
+
 ### [1.6.187] - 2020-06-09
 #### Fixed
 - Fixed issues where `str_contains` was using arrays. Conflict with PHP8/polyfil. 
diff --git a/src/Image/ImagePaths.php b/src/Image/ImagePaths.php
index 3c6f1c6e1..2f7b12c53 100644
--- a/src/Image/ImagePaths.php
+++ b/src/Image/ImagePaths.php
@@ -1,8 +1,9 @@
 <?php namespace Anomaly\Streams\Platform\Image;
 
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\FilesModule\File\Contract\FileInterface;
 use Anomaly\Streams\Platform\Application\Application;
-use Illuminate\Http\Request;
 
 /**
  * Class ImagePaths
@@ -95,7 +96,7 @@ public function addPath($namespace, $path)
      */
     public function realPath($path)
     {
-        if (str_contains($path, '::')) {
+        if (Str::contains($path, '::')) {
             list($namespace, $path) = explode('::', $path);
 
             if (!isset($this->paths[$namespace])) {
@@ -127,7 +128,7 @@ public function outputPath(Image $image)
          * and we don't have alterations
          * then just use it as it is.
          */
-        if (str_contains($path, public_path()) && !$image->getAlterations() && !$image->getQuality()) {
+        if (Str::contains($path, public_path()) && !$image->getAlterations() && !$image->getQuality()) {
             return str_replace(public_path(), '', $path);
         }
 

From 46df5abec7c5e478ef6e1311669d3039a9db4bb0 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Wed, 1 Jul 2020 14:28:38 +1000
Subject: [PATCH 065/256] Fix autoloading

---
 docs/en/01.prologue/02.change-log.md      | 11 +++++++----
 src/Config/Command/CacheConfig.php        |  2 +-
 src/StreamsPlugin.php                     |  2 +-
 src/Ui/Table/Command/GetTableCriteria.php |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 9d728a8d6..c54f6d719 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,23 +28,26 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.31] - 2020-07-01
+#### Changed
+- Fixed autoloading on several platform classes.
 
-### [1.7.30] - 2020-09-15
+### [1.7.30] - 2020-06-15
 #### Changed
 - Updated Twig slightly for better support with PHP 7.4.
 
 
-### [1.7.29] - 2020-09-11
+### [1.7.29] - 2020-06-11
 #### Fixed
 - Replace a couple remaining "helper_function" instances with `Illuminate\Support\*` functionality.
 
 
-### [1.7.28] - 2020-09-09
+### [1.7.28] - 2020-06-09
 #### Fixed
 - Replaced all `str_contains()` with `Str::contains()` and unlocked Symfony dependencies.
 
 
-### [1.7.27] - 2020-09-01
+### [1.7.27] - 2020-06-01
 #### Fixed
 - Hotfixed PHP 8 `str_contains` function by locking dependencies before Symfony polyfil.
 
diff --git a/src/Config/Command/CacheConfig.php b/src/Config/Command/CacheConfig.php
index b4780ba10..a5f44656b 100644
--- a/src/Config/Command/CacheConfig.php
+++ b/src/Config/Command/CacheConfig.php
@@ -1,4 +1,4 @@
-<?php namespace Anomaly\Streams\Platform\Cache\Command;
+<?php namespace Anomaly\Streams\Platform\Config\Command;
 
 use Anomaly\Streams\Platform\Console\Kernel;
 
diff --git a/src/StreamsPlugin.php b/src/StreamsPlugin.php
index ac5f152a9..b63a08978 100644
--- a/src/StreamsPlugin.php
+++ b/src/StreamsPlugin.php
@@ -25,7 +25,7 @@
 use Anomaly\Streams\Platform\Ui\Command\GetMemoryUsage;
 use Anomaly\Streams\Platform\Ui\Command\GetTranslatedString;
 use Anomaly\Streams\Platform\Ui\Form\Command\GetFormCriteria;
-use Anomaly\Streams\Platform\Ui\Form\Command\GetTableCriteria;
+use Anomaly\Streams\Platform\Ui\Table\Command\GetTableCriteria;
 use Anomaly\Streams\Platform\Ui\Icon\Command\GetIcon;
 use Anomaly\Streams\Platform\View\Command\GetConstants;
 use Anomaly\Streams\Platform\View\Command\GetLayoutName;
diff --git a/src/Ui/Table/Command/GetTableCriteria.php b/src/Ui/Table/Command/GetTableCriteria.php
index b3b8b4dbc..770bdbbcd 100644
--- a/src/Ui/Table/Command/GetTableCriteria.php
+++ b/src/Ui/Table/Command/GetTableCriteria.php
@@ -1,4 +1,4 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php namespace Anomaly\Streams\Platform\Ui\Table\Command;
 
 use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 use Anomaly\Streams\Platform\Support\Presenter;

From cee3000eaba936a89e66bdc033e00e4a7f4d5ffe Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 1 Jul 2020 15:45:23 -0500
Subject: [PATCH 066/256] Update SetSuccessMessage.php

---
 src/Ui/Form/Command/SetSuccessMessage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ui/Form/Command/SetSuccessMessage.php b/src/Ui/Form/Command/SetSuccessMessage.php
index 7703b5979..de206ee5b 100644
--- a/src/Ui/Form/Command/SetSuccessMessage.php
+++ b/src/Ui/Form/Command/SetSuccessMessage.php
@@ -61,7 +61,7 @@ public function handle(Request $request, MessageBag $messages)
         ];
 
         // If the name doesn't exist we need to be clever.
-        if (str_contains($parameters['name'], '::') && !trans()->has($parameters['name']) && $stream) {
+        if ($parameters['name'] && str_contains($parameters['name'], '::') && !trans()->has($parameters['name']) && $stream) {
             $parameters['name'] = ucfirst(str_singular(str_replace('_', ' ', $stream->getSlug())));
         } elseif ($parameters['name']) {
             $parameters['name'] = str_singular(trans($parameters['name']));

From 102112839ccfb274b2bb679282e8378cef4e9cd8 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 1 Jul 2020 15:46:39 -0500
Subject: [PATCH 067/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 4430dc0a0..b3a3f7698 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,6 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 
+### [1.6.189] - 2020-07-01
+#### Fixed
+- More `str_contains` conflicts with PHP8/polyfil cleared out. `SetSuccessMessage` specifically.
+
+
 ### [1.6.188] - 2020-06-17
 #### Fixed
 - More `str_contains` conflicts with PHP8/polyfil cleared out.

From be013e88f8797247449cbc9d0c3634683df71dd2 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Thu, 2 Jul 2020 22:31:22 +1000
Subject: [PATCH 068/256] Fix autoloading issues

---
 docs/en/01.prologue/02.change-log.md      | 38 ++++++++++++-----------
 src/Config/Command/CacheConfig.php        |  2 +-
 src/StreamsPlugin.php                     |  2 +-
 src/Ui/Table/Command/GetTableCriteria.php |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index b3a3f7698..bccf48ad9 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,8 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.6.190] - 2020-07-02
+- Fix autoloading issues.
 
 ### [1.6.189] - 2020-07-01
 #### Fixed
@@ -41,7 +43,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.187] - 2020-06-09
 #### Fixed
-- Fixed issues where `str_contains` was using arrays. Conflict with PHP8/polyfil. 
+- Fixed issues where `str_contains` was using arrays. Conflict with PHP8/polyfil.
 
 
 ### [1.6.186] - 2020-03-22
@@ -54,7 +56,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.185] - 2020-01-08
 #### Changed
-- Corrected the `.env` data in order to correctly set `APP_LOCALE`. 
+- Corrected the `.env` data in order to correctly set `APP_LOCALE`.
 
 
 ### [1.6.184] - 2020-01-02
@@ -64,7 +66,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.183] - 2019-12-09
 #### Changed
-- Added the rest of the `excluded` paths from `CacheKernel` to the `HttpCache` middleware. 
+- Added the rest of the `excluded` paths from `CacheKernel` to the `HttpCache` middleware.
 
 
 ### [1.6.182] - 2019-11-18
@@ -87,7 +89,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.179] - 2019-10-28
 #### Added
-- Added IDs to default field type attributes. 
+- Added IDs to default field type attributes.
 
 
 ### [1.6.178] - 2019-10-22
@@ -97,23 +99,23 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.177] - 2019-09-12
 #### Fixed
-- Added `Anomaly\Streams\Platform\Ui\Table\Component\Action\ActionRegistry` to singletons. 
+- Added `Anomaly\Streams\Platform\Ui\Table\Component\Action\ActionRegistry` to singletons.
 
 
 ### [1.6.176] - 2019-09-11
 #### Fixed
-- Fixed issue with button guesser leaving route objects in buttons and thus breaking views.  
+- Fixed issue with button guesser leaving route objects in buttons and thus breaking views.
 
 
 ### [1.6.175] - 2019-09-10
 #### Fixed
-- Fixed issue with validation extender not passing along unique field types per extending validation rule.  
+- Fixed issue with validation extender not passing along unique field types per extending validation rule.
 
 
 ### [1.6.174] - 2019-09-06
 #### Fixed
 - Fix ambiguous sort_order column bug
-- Improved German translation. 
+- Improved German translation.
 
 
 ### [1.6.173] - 2019-08-18
@@ -139,15 +141,15 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.170] - 2019-07-31
 #### Fixed
-- Fixed issue when installing via GUI where models would not fully autoload for proceeding seeders. 
+- Fixed issue when installing via GUI where models would not fully autoload for proceeding seeders.
 
 
 ### [1.6.169] - 2019-07-30
 #### Fixed
-- Fixed issue where `\Anomaly\Streams\Platform\Support\Value` was returning views when should be string.  
+- Fixed issue where `\Anomaly\Streams\Platform\Support\Value` was returning views when should be string.
 - Fixed issue where `\Anomaly\Streams\Platform\Traits\Hookable` was not allowing method defined hook handlers.
-- Fixed issue where `overrides` were not working for Twig `include` use cases. 
-  
+- Fixed issue where `overrides` were not working for Twig `include` use cases.
+
 #### Added
 - Added `shared` hint to asset path hints. Similar to the view hint.
 - Added `$addon` to the `registered` addon callback available arguments.
@@ -155,7 +157,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.168] - 2019-07-30
 #### Fixed
-- Fixed issue where `streams.schedules` config key was wrong and configured schedules not working. 
+- Fixed issue where `streams.schedules` config key was wrong and configured schedules not working.
 
 #### Added
 - Documentation on mail.
@@ -208,22 +210,22 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.160] - 2019-07-09
 #### Fixed
-- Fixed `\Anomaly\Streams\Platform\Entry\Command\PurgeHttpCache` where `HttpCache` was under some circumstances, not instantiable. 
+- Fixed `\Anomaly\Streams\Platform\Entry\Command\PurgeHttpCache` where `HttpCache` was under some circumstances, not instantiable.
 
 
 ### [1.6.159] - 2019-07-05
 #### Added
-- Added `join` support for quickly joining tables for relational field types providing a `getRelation` method. 
+- Added `join` support for quickly joining tables for relational field types providing a `getRelation` method.
 
 
 ### [1.6.158] - 2019-06-20
 #### Added
-- Added `streams::system.versioning_enabled` config and `VERSIONING_ENABLED` `.env` variable for disabling versioning system. 
+- Added `streams::system.versioning_enabled` config and `VERSIONING_ENABLED` `.env` variable for disabling versioning system.
 
 
 ### [1.6.157] - 2019-06-20
 #### Fixed
-- Fixed issue in `\Anomaly\Streams\Platform\Ui\Form\Command\SetFormEntry` where it was not accounting for possible decoration having occurred. 
+- Fixed issue in `\Anomaly\Streams\Platform\Ui\Form\Command\SetFormEntry` where it was not accounting for possible decoration having occurred.
 
 
 ### [1.6.156] - 2019-06-20
@@ -234,7 +236,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.6.155] - 2019-06-18
 #### Fixed
-- Fixed issue in `\Anomaly\Streams\Platform\Model\EloquentFormRepository` where translatable information was on the base level of the update data causing translatable content to not always be saved correctly. 
+- Fixed issue in `\Anomaly\Streams\Platform\Model\EloquentFormRepository` where translatable information was on the base level of the update data causing translatable content to not always be saved correctly.
 
 
 ### [1.6.154] - 2019-06-14
diff --git a/src/Config/Command/CacheConfig.php b/src/Config/Command/CacheConfig.php
index b4780ba10..a5f44656b 100644
--- a/src/Config/Command/CacheConfig.php
+++ b/src/Config/Command/CacheConfig.php
@@ -1,4 +1,4 @@
-<?php namespace Anomaly\Streams\Platform\Cache\Command;
+<?php namespace Anomaly\Streams\Platform\Config\Command;
 
 use Anomaly\Streams\Platform\Console\Kernel;
 
diff --git a/src/StreamsPlugin.php b/src/StreamsPlugin.php
index ac5f152a9..b63a08978 100644
--- a/src/StreamsPlugin.php
+++ b/src/StreamsPlugin.php
@@ -25,7 +25,7 @@
 use Anomaly\Streams\Platform\Ui\Command\GetMemoryUsage;
 use Anomaly\Streams\Platform\Ui\Command\GetTranslatedString;
 use Anomaly\Streams\Platform\Ui\Form\Command\GetFormCriteria;
-use Anomaly\Streams\Platform\Ui\Form\Command\GetTableCriteria;
+use Anomaly\Streams\Platform\Ui\Table\Command\GetTableCriteria;
 use Anomaly\Streams\Platform\Ui\Icon\Command\GetIcon;
 use Anomaly\Streams\Platform\View\Command\GetConstants;
 use Anomaly\Streams\Platform\View\Command\GetLayoutName;
diff --git a/src/Ui/Table/Command/GetTableCriteria.php b/src/Ui/Table/Command/GetTableCriteria.php
index b3b8b4dbc..770bdbbcd 100644
--- a/src/Ui/Table/Command/GetTableCriteria.php
+++ b/src/Ui/Table/Command/GetTableCriteria.php
@@ -1,4 +1,4 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php namespace Anomaly\Streams\Platform\Ui\Table\Command;
 
 use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 use Anomaly\Streams\Platform\Support\Presenter;

From ed5c791aee31200b824ce88e5f9b9ecd53f4ba79 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 3 Jul 2020 01:06:20 -0500
Subject: [PATCH 069/256] Lowercase

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2b1c282fc..72a191e93 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "cartalyst/assetic": "1.4.*",
         "linkorb/jsmin-php": "1.0.0",
         "leafo/scssphp": "0.7.*",
-        "natxet/CssMin": "3.0.*",
+        "natxet/cssmin": "3.0.*",
         "oyejorge/less.php": "1.7.*",
         "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",

From 54728b501dac4475b29baaf429a88d80e2ab4653 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 3 Jul 2020 01:07:55 -0500
Subject: [PATCH 070/256] Lowercase

---
 docs/en/01.prologue/02.change-log.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index bccf48ad9..388c5fb7d 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,9 +28,14 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.6.191] - 2020-07-02
+- Fix _OLD_ composer case issue.
+
+
 ### [1.6.190] - 2020-07-02
 - Fix autoloading issues.
 
+
 ### [1.6.189] - 2020-07-01
 #### Fixed
 - More `str_contains` conflicts with PHP8/polyfil cleared out. `SetSuccessMessage` specifically.

From 650f5085e2ec6e278da84c24591ad1db457bc783 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 3 Jul 2020 01:10:16 -0500
Subject: [PATCH 071/256] Lowercase

---
 docs/en/01.prologue/02.change-log.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index c54f6d719..52a02e51f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,10 +28,16 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.32] - 2020-07-03
+#### Changed
+- Fixed _old_ autoloading case issue.
+
+
 ### [1.7.31] - 2020-07-01
 #### Changed
 - Fixed autoloading on several platform classes.
 
+
 ### [1.7.30] - 2020-06-15
 #### Changed
 - Updated Twig slightly for better support with PHP 7.4.

From e34e5f7303638c4eb2e98f8630e9db62daf0d797 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 3 Jul 2020 01:31:32 -0500
Subject: [PATCH 072/256] K

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dbbdfdf77..b0ad402dc 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "cartalyst/assetic": "1.4.*",
         "linkorb/jsmin-php": "1.0.0",
         "leafo/scssphp": "0.7.*",
-        "natxet/CssMin": "3.0.*",
+        "natxet/cssmin": "3.0.*",
         "oyejorge/less.php": "1.7.*",
         "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",

From a5d167a89798d6c62fdc520d8850aa51a8e31537 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Sat, 4 Jul 2020 15:40:37 +1000
Subject: [PATCH 073/256] add a deprecated PSR-4 loading class for
 settings-module compat

---
 docs/en/01.prologue/02.change-log.md |  3 +++
 src/Cache/Command/CacheConfig.php    | 35 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 src/Cache/Command/CacheConfig.php

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 388c5fb7d..da6b52571 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,9 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.6.192] - 2020-07-04
+- Add a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
+
 ### [1.6.191] - 2020-07-02
 - Fix _OLD_ composer case issue.
 
diff --git a/src/Cache/Command/CacheConfig.php b/src/Cache/Command/CacheConfig.php
new file mode 100644
index 000000000..2b379d97e
--- /dev/null
+++ b/src/Cache/Command/CacheConfig.php
@@ -0,0 +1,35 @@
+<?php namespace Anomaly\Streams\Platform\Cache\Command;
+
+use Anomaly\Streams\Platform\Console\Kernel;
+
+/**
+ * Class CacheConfig
+ *
+ * @link   http://pyrocms.com/
+ * @author PyroCMS, Inc. <support@pyrocms.com>
+ * @author Ryan Thompson <ryan@pyrocms.com>
+ * @deprecated 1.7.30 Has been replaced with a PSR-4 compliant class.
+ */
+class CacheConfig
+{
+
+    /**
+     * Handle the command.
+     *
+     * @param Kernel $console
+     */
+    public function handle(Kernel $console)
+    {
+
+        /**
+         * Queue the routes to re-cache if
+         * a cache file exists in bootstrap.
+         */
+        if (file_exists($cache = base_path('bootstrap/cache/config.php'))) {
+
+            unlink($cache);
+
+            $console->call('config:cache');
+        }
+    }
+}

From 42ea74ffd84b6b40a834e73654d861604194c586 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Sat, 4 Jul 2020 15:42:53 +1000
Subject: [PATCH 074/256] tense

---
 docs/en/01.prologue/02.change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index da6b52571..2c47caf0b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,7 +29,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 ### [1.6.192] - 2020-07-04
-- Add a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
+- Added a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
 
 ### [1.6.191] - 2020-07-02
 - Fix _OLD_ composer case issue.

From b4f0d9b21fda04b09cb94817902e12601f721306 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Sat, 4 Jul 2020 15:48:33 +1000
Subject: [PATCH 075/256] add a deprecated PSR-4 loading class for
 settings-module compat

---
 docs/en/01.prologue/02.change-log.md |  9 ++++---
 src/Cache/Command/CacheConfig.php    | 36 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/Cache/Command/CacheConfig.php

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 52a02e51f..856eb9cff 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,9 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.33] - 2020-07-04
+- Added a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
+
 ### [1.7.32] - 2020-07-03
 #### Changed
 - Fixed _old_ autoloading case issue.
@@ -94,7 +97,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.7.21] - 2020-01-08
 #### Changed
-- Corrected the `.env` data in order to correctly set `APP_LOCALE`. 
+- Corrected the `.env` data in order to correctly set `APP_LOCALE`.
 
 
 ### [1.7.20] - 2020-01-02
@@ -148,7 +151,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Added very simple support for routing views from array.
 
 #### Fixed
-- Fixed edge case situation in parser where route parameters need a bit of cleaning. 
+- Fixed edge case situation in parser where route parameters need a bit of cleaning.
 
 
 ### [1.7.11] - 2019-10-10
@@ -198,7 +201,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Added coverage configuration to `phpunit.stub`.
 
 #### Changed
-- Bumped to `"axios": "^0.19",` in `package.theme.stub`. 
+- Bumped to `"axios": "^0.19",` in `package.theme.stub`.
 
 #### Fixed
 - Fixed `cleanup` functionality in `\Anomaly\Streams\Platform\Field\FieldRepository`.
diff --git a/src/Cache/Command/CacheConfig.php b/src/Cache/Command/CacheConfig.php
new file mode 100644
index 000000000..23afe4012
--- /dev/null
+++ b/src/Cache/Command/CacheConfig.php
@@ -0,0 +1,36 @@
+<?php namespace Anomaly\Streams\Platform\Cache\Command;
+
+use Anomaly\Streams\Platform\Console\Kernel;
+
+/**
+ * Class CacheConfig
+ *
+ * @link   http://pyrocms.com/
+ * @author PyroCMS, Inc. <support@pyrocms.com>
+ * @author Ryan Thompson <ryan@pyrocms.com>
+ * @deprecated v1.7.30 Has been replaced with a PSR-4 compliant class.
+ * @see Anomaly\Streams\Platform\Config\Command\CacheConfig
+ */
+class CacheConfig
+{
+
+    /**
+     * Handle the command.
+     *
+     * @param Kernel $console
+     */
+    public function handle(Kernel $console)
+    {
+
+        /**
+         * Queue the routes to re-cache if
+         * a cache file exists in bootstrap.
+         */
+        if (file_exists($cache = base_path('bootstrap/cache/config.php'))) {
+
+            unlink($cache);
+
+            $console->call('config:cache');
+        }
+    }
+}

From dc70d8abbd5fe0f7cc4c94cf2c06eb392bef32dd Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Sat, 4 Jul 2020 15:49:25 +1000
Subject: [PATCH 076/256] phpdoc changes

---
 src/Cache/Command/CacheConfig.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Cache/Command/CacheConfig.php b/src/Cache/Command/CacheConfig.php
index 2b379d97e..23afe4012 100644
--- a/src/Cache/Command/CacheConfig.php
+++ b/src/Cache/Command/CacheConfig.php
@@ -8,7 +8,8 @@
  * @link   http://pyrocms.com/
  * @author PyroCMS, Inc. <support@pyrocms.com>
  * @author Ryan Thompson <ryan@pyrocms.com>
- * @deprecated 1.7.30 Has been replaced with a PSR-4 compliant class.
+ * @deprecated v1.7.30 Has been replaced with a PSR-4 compliant class.
+ * @see Anomaly\Streams\Platform\Config\Command\CacheConfig
  */
 class CacheConfig
 {

From a5e1d697fc73b000419970d89ad4ab384eccad43 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Sat, 4 Jul 2020 16:51:50 +1000
Subject: [PATCH 077/256] update docblock

---
 src/Cache/Command/CacheConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cache/Command/CacheConfig.php b/src/Cache/Command/CacheConfig.php
index 23afe4012..381bce26b 100644
--- a/src/Cache/Command/CacheConfig.php
+++ b/src/Cache/Command/CacheConfig.php
@@ -8,7 +8,7 @@
  * @link   http://pyrocms.com/
  * @author PyroCMS, Inc. <support@pyrocms.com>
  * @author Ryan Thompson <ryan@pyrocms.com>
- * @deprecated v1.7.30 Has been replaced with a PSR-4 compliant class.
+ * @deprecated v1.6.189 Has been replaced with a PSR-4 compliant class.
  * @see Anomaly\Streams\Platform\Config\Command\CacheConfig
  */
 class CacheConfig

From 981d6660315ac999f7ba847d6f74821df797a41a Mon Sep 17 00:00:00 2001
From: Simon Morris <simon@evoluted.net>
Date: Mon, 6 Jul 2020 14:37:03 +0100
Subject: [PATCH 078/256] Go straight to the field type for translated
 relationship attributes

---
 src/Entry/EntryModel.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Entry/EntryModel.php b/src/Entry/EntryModel.php
index 85bcee29a..49c934b73 100644
--- a/src/Entry/EntryModel.php
+++ b/src/Entry/EntryModel.php
@@ -428,8 +428,12 @@ public function setAttribute($key, $value)
     public function getAttribute($key)
     {
 
-        // Check if it's a relationship first.
-        if (in_array($key, array_merge($this->relationships, ['created_by', 'updated_by']))) {
+        // Check if it's a relationship first. Ignore translated relationships as these
+        // end up being handled by the field type anyway.
+        if (
+            in_array($key, array_merge($this->relationships, ['created_by', 'updated_by']))
+            && !in_array($key, $this->translatedAttributes)
+        ) {
             return parent::getAttribute(camel_case($key));
         }
 

From baff58d0dfd6d8c284ce2f2c59c7dc99e50201a1 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Tue, 7 Jul 2020 19:09:28 +1000
Subject: [PATCH 079/256] Use custom lexer to avoid minified CSS breaking twig
 comments in parse

---
 docs/en/01.prologue/02.change-log.md          |  3 +++
 docs/en/12.front-end-development/03.assets.md |  2 +-
 src/Asset/Asset.php                           | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 856eb9cff..ba3d57faa 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,9 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.34] - 2020-07-07
+- Modified the `parse` filter in `Asset` to allow for minified CSS to be parsed (such as from Laravel Mix).
+
 ### [1.7.33] - 2020-07-04
 - Added a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
 
diff --git a/docs/en/12.front-end-development/03.assets.md b/docs/en/12.front-end-development/03.assets.md
index 86d92c396..008dcd3ec 100644
--- a/docs/en/12.front-end-development/03.assets.md
+++ b/docs/en/12.front-end-development/03.assets.md
@@ -91,7 +91,7 @@ $asset->add("collection.css", "theme::example.scss", ["min", "live"]);
 - `less`: parses LESS into CSS
 - `styl`: parses STYL into CSS
 - `scss`: parses SCSS into CSS
-- `parse`: parses content with Twig
+- `parse`: parses content with Twig. Uses an alternate comment syntax `{* *}` to prevent clashes with CSS selectors.
 - `coffee`: compiles CoffeeScript into Javascript
 - `embed`: embeds image data in your stylesheets
 - `live`: refreshes content when LIVE_ASSETS is enabled
diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index 642d16068..a65ea0ff9 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -574,6 +574,15 @@ protected function publish($path, $collection, $additionalFilters)
          * Parse the content. Always parse CSS.
          */
         if (in_array('parse', $filters) || $hint == 'css') {
+            /** @var Bridge $twig */
+            $twig = resolve('twig');
+
+            $twig->setLexer(
+                new \Twig_Lexer($twig, [
+                    'tag_comment' => ['{*', '*}']
+                ])
+            );
+
             try {
                 $contents = $this->template
                     ->render($contents)
@@ -586,6 +595,12 @@ protected function publish($path, $collection, $additionalFilters)
 
                 \Log::error($e->getMessage());
             }
+
+            $twig->setLexer(
+                new \Twig_Lexer($twig, [
+                    'tag_comment' => ['{#', '#}']
+                ])
+            );
         }
 
         /**

From 41e046dba5161368687baae4520f9bd93d50ba1a Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Wed, 8 Jul 2020 01:09:46 +1000
Subject: [PATCH 080/256] replace character

---
 src/Asset/Asset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index a65ea0ff9..e40bedc66 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -579,7 +579,7 @@ protected function publish($path, $collection, $additionalFilters)
 
             $twig->setLexer(
                 new \Twig_Lexer($twig, [
-                    'tag_comment' => ['{*', '*}']
+                    'tag_comment' => ['{^', '^}']
                 ])
             );
 

From bd9558a070639fa2b7fa0059bd89637b99e8ca87 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 28 Jul 2020 01:03:08 -0500
Subject: [PATCH 081/256] Update laravel

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 73c1628d2..ffe1f0cb8 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "5.8.*",
+        "laravel/framework": "^6.0",
         "laravel/scout": "7.1.*",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",

From cf86e89f5e4aca043882a1106152ae7ff75b15d7 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 29 Jul 2020 23:53:04 -0500
Subject: [PATCH 082/256] restart

---
 composer.json | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index ffe1f0cb8..b0ad402dc 100644
--- a/composer.json
+++ b/composer.json
@@ -8,24 +8,32 @@
         }
     ],
     "require": {
-        "laravel/framework": "^6.0",
+        "laravel/framework": "5.8.*",
         "laravel/scout": "7.1.*",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",
         "laravelcollective/html": "5.8.*",
-        "twig/twig": "~2.6.0",
+        "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "3.2.*",
+        "coffeescript/coffeescript": "1.3.*",
         "erusev/parsedown-extra": "0.7.1",
+        "cartalyst/assetic": "1.4.*",
         "linkorb/jsmin-php": "1.0.0",
-        "tubalmartin/cssmin": "4.0.*",
+        "leafo/scssphp": "0.7.*",
+        "natxet/cssmin": "3.0.*",
+        "oyejorge/less.php": "1.7.*",
+        "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
+        "teamtnt/laravel-scout-tntsearch-driver": "7.1.*",
         "symfony/yaml": "3.4.*",
         "jenssegers/agent": "2.6.*",
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",
         "ezyang/htmlpurifier": "~4.0",
         "barryvdh/laravel-httpcache": "^0.3.0",
+        "tubalmartin/cssmin": "~4.0",
+        "mrclay/jsmin-php": "~2.4",
         "fzaninotto/faker": "~1.4"
     },
     "autoload": {

From 8eb7cdcc4c82592a851ddb892e79c679b1c26c01 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 31 Jul 2020 12:22:15 -0500
Subject: [PATCH 083/256] Use the repopulating value when repopulating.

---
 src/Ui/Form/Command/FlashFieldValues.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ui/Form/Command/FlashFieldValues.php b/src/Ui/Form/Command/FlashFieldValues.php
index f78b70f0e..02ccb8ea0 100644
--- a/src/Ui/Form/Command/FlashFieldValues.php
+++ b/src/Ui/Form/Command/FlashFieldValues.php
@@ -44,7 +44,7 @@ public function handle(Store $session)
 
         /* @var FieldType $field */
         foreach ($this->builder->getFormFields() as $field) {
-            $session->flash($field->getFieldName(), $field->getPostValue());
+            $session->flash($field->getFieldName(), $field->getRepopulateValue());
         }
     }
 }

From e3fbe2cedd95bb41d27d9493c4fae386b104bd49 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 31 Jul 2020 12:24:15 -0500
Subject: [PATCH 084/256] Docs

---
 docs/en/01.prologue/02.change-log.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 2c47caf0b..8b93ecbea 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,14 +28,21 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.6.193] - 2020-07-31
+#### Fixed
+- Fixed issue where form failure repopulation was not using correct method.
+
 ### [1.6.192] - 2020-07-04
+#### Added
 - Added a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
 
 ### [1.6.191] - 2020-07-02
+#### Fixed
 - Fix _OLD_ composer case issue.
 
 
 ### [1.6.190] - 2020-07-02
+#### Fixed
 - Fix autoloading issues.
 
 

From fe51c2fcc01e899c15e59c3ee851585ac388e0db Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 31 Jul 2020 12:29:00 -0500
Subject: [PATCH 085/256] Fix issue with repopulating upload FT

---
 docs/en/01.prologue/02.change-log.md     | 6 ++++++
 src/Ui/Form/Command/FlashFieldValues.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index ba3d57faa..72fc42e73 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,10 +28,16 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.35] - 2020-07-31
+#### Fixed
+- Fixed issue with repopulating upload field type after failed validation.
+
 ### [1.7.34] - 2020-07-07
+#### Changed
 - Modified the `parse` filter in `Asset` to allow for minified CSS to be parsed (such as from Laravel Mix).
 
 ### [1.7.33] - 2020-07-04
+#### Added
 - Added a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
 
 ### [1.7.32] - 2020-07-03
diff --git a/src/Ui/Form/Command/FlashFieldValues.php b/src/Ui/Form/Command/FlashFieldValues.php
index f78b70f0e..02ccb8ea0 100644
--- a/src/Ui/Form/Command/FlashFieldValues.php
+++ b/src/Ui/Form/Command/FlashFieldValues.php
@@ -44,7 +44,7 @@ public function handle(Store $session)
 
         /* @var FieldType $field */
         foreach ($this->builder->getFormFields() as $field) {
-            $session->flash($field->getFieldName(), $field->getPostValue());
+            $session->flash($field->getFieldName(), $field->getRepopulateValue());
         }
     }
 }

From ec717ec79b235bd8c27d210d2817d9102b49bca9 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Mon, 10 Aug 2020 18:09:44 +1000
Subject: [PATCH 086/256] repopulate variable for comparison

---
 src/Ui/Table/Command/GetTableEntries.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Ui/Table/Command/GetTableEntries.php b/src/Ui/Table/Command/GetTableEntries.php
index cc4fc4541..5a1b29000 100644
--- a/src/Ui/Table/Command/GetTableEntries.php
+++ b/src/Ui/Table/Command/GetTableEntries.php
@@ -43,10 +43,11 @@ public function handle(Container $container)
         /*
          * If the builder has an entries handler
          * then call it through the container and
-         * let it load the entries itself.
+         * let it load the entries itself, then repopulate the variable for comparison.
          */
         if (is_string($entries) || $entries instanceof \Closure) {
             $container->call($entries, ['builder' => $this->builder], 'handle');
+            $entries = $this->builder->getEntries();
         }
 
         /**

From 806139c4d9cad1bd93ee4e4759a59713b5ca5b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Mon, 10 Aug 2020 17:49:12 +0700
Subject: [PATCH 087/256] Fixed php7.4 notice on parsedown-extra

---
 src/Support/Markdown.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Support/Markdown.php b/src/Support/Markdown.php
index 0af12cb38..964e0b15b 100644
--- a/src/Support/Markdown.php
+++ b/src/Support/Markdown.php
@@ -53,7 +53,11 @@ protected function blockQuote($line)
      */
     protected function inlineLink($excerpt)
     {
-        $link = parent::inlineLink($excerpt);
+        try {
+            $link = parent::inlineLink($excerpt);
+        } catch (\ErrorException $e) {
+            return;
+        }
 
         if (!isset($link['element']['text'][0])) {
             return $link;

From 6cc8ebcfef74206d43fbe06caa0cb8927f74201e Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 10 Aug 2020 09:57:59 -0500
Subject: [PATCH 088/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 72fc42e73..498b3248c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.36] - 2020-08-10
+#### Fixed
+- Fixed issue where `onQuerying` was not recieving latest entries collection.
+
 ### [1.7.35] - 2020-07-31
 #### Fixed
 - Fixed issue with repopulating upload field type after failed validation.

From c1c3f987dd01db89102dee0b0691af7275280b42 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 10 Aug 2020 10:00:42 -0500
Subject: [PATCH 089/256] Patches

---
 docs/en/01.prologue/02.change-log.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 498b3248c..d87ebf01b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -31,6 +31,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ### [1.7.36] - 2020-08-10
 #### Fixed
 - Fixed issue where `onQuerying` was not recieving latest entries collection.
+- Fixed issue where `parsedown-extra` was causing an error on PHP 7.4.
 
 ### [1.7.35] - 2020-07-31
 #### Fixed

From 49cf5e55accac744337e6fc5598dddc54fe2abc7 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 10 Aug 2020 11:35:00 -0500
Subject: [PATCH 090/256] Update composer.json


From dda595d7148d8504a989169c6f93700b95844f6b Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 10 Aug 2020 12:00:39 -0500
Subject: [PATCH 091/256] Dependencies

---
 .gitignore    |  1 +
 composer.json | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 372f4e095..0d1abf8d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+composer.lock
 /bin
 /vendor
 /coverage
diff --git a/composer.json b/composer.json
index b0ad402dc..6a1b29065 100644
--- a/composer.json
+++ b/composer.json
@@ -8,11 +8,11 @@
         }
     ],
     "require": {
-        "laravel/framework": "5.8.*",
-        "laravel/scout": "7.1.*",
+        "laravel/framework": "^7.0",
+        "laravel/scout": "^7.0",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",
-        "laravelcollective/html": "5.8.*",
+        "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "3.2.*",
         "coffeescript/coffeescript": "1.3.*",
@@ -25,9 +25,9 @@
         "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
-        "teamtnt/laravel-scout-tntsearch-driver": "7.1.*",
-        "symfony/yaml": "3.4.*",
-        "jenssegers/agent": "2.6.*",
+        "teamtnt/laravel-scout-tntsearch-driver": "^7.1",
+        "symfony/yaml": "^3.4",
+        "jenssegers/agent": "^2.6",
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",
         "ezyang/htmlpurifier": "~4.0",

From 2d2011588398cf3170ab6b5757a581702fac52a5 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 10 Aug 2020 12:02:16 -0500
Subject: [PATCH 092/256] 1.7

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 6a1b29065..b0ad402dc 100644
--- a/composer.json
+++ b/composer.json
@@ -8,11 +8,11 @@
         }
     ],
     "require": {
-        "laravel/framework": "^7.0",
-        "laravel/scout": "^7.0",
+        "laravel/framework": "5.8.*",
+        "laravel/scout": "7.1.*",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",
-        "laravelcollective/html": "^6.1",
+        "laravelcollective/html": "5.8.*",
         "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "3.2.*",
         "coffeescript/coffeescript": "1.3.*",
@@ -25,9 +25,9 @@
         "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
-        "teamtnt/laravel-scout-tntsearch-driver": "^7.1",
-        "symfony/yaml": "^3.4",
-        "jenssegers/agent": "^2.6",
+        "teamtnt/laravel-scout-tntsearch-driver": "7.1.*",
+        "symfony/yaml": "3.4.*",
+        "jenssegers/agent": "2.6.*",
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",
         "ezyang/htmlpurifier": "~4.0",

From 29138f7a278020b0f02f225dd6c14ef06e1e6d9d Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 10 Aug 2020 12:04:14 -0500
Subject: [PATCH 093/256] Dependencies

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index b0ad402dc..1c2dd42a7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,13 +8,13 @@
         }
     ],
     "require": {
-        "laravel/framework": "5.8.*",
-        "laravel/scout": "7.1.*",
+        "laravel/framework": "^7.0",
+        "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",
-        "laravelcollective/html": "5.8.*",
+        "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
-        "barryvdh/laravel-debugbar": "3.2.*",
+        "barryvdh/laravel-debugbar": "^3.3",
         "coffeescript/coffeescript": "1.3.*",
         "erusev/parsedown-extra": "0.7.1",
         "cartalyst/assetic": "1.4.*",

From 3c66103745606fdabbcb8579255475e6af1796fd Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 10 Aug 2020 12:16:32 -0500
Subject: [PATCH 094/256] TNT

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1c2dd42a7..22cad4e3c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
         "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
-        "teamtnt/laravel-scout-tntsearch-driver": "7.1.*",
+        "teamtnt/laravel-scout-tntsearch-driver": "^9.0",
         "symfony/yaml": "3.4.*",
         "jenssegers/agent": "2.6.*",
         "asm89/twig-cache-extension": "1.3.*",

From a18b13f44c5f4d63b2adc187cba50c8d09ec739c Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 12 Aug 2020 13:06:42 +0300
Subject: [PATCH 095/256] =?UTF-8?q?getTranslationsTableName()=20removed=20?=
 =?UTF-8?q?to=20prevent=20data=20repeatation.=20The=20default=20addon=20la?=
 =?UTF-8?q?nguage=20has=20been=20added=20for=20languages=20=E2=80=8B?=
 =?UTF-8?q?=E2=80=8Bthat=20are=20not=20active=20in=20the=20system.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Model/EloquentQueryBuilder.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 88f2d6059..9e5f508e2 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -361,7 +361,10 @@ function ($column) use ($model) {
                 )
         );
 
-        $this->query->groupBy([$model->getTableName() . '.id', $model->getTranslationsTableName() . '.id']);
+        /**
+         * removed to prevent data repeatation( getTranslationsTableName() )
+         */
+        $this->query->groupBy([$model->getTableName() . '.id']);
 
         /**
          * Grab either what matches or null because
@@ -369,8 +372,9 @@ function ($column) use ($model) {
          */
         $this->query->where(
             function (\Illuminate\Database\Query\Builder $query) use ($model, $locale) {
-                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));
-                $query->orWhereNull($model->getTranslationsTableName() . '.locale');
+                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));//active language
+                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));//or default setting language
+                $query->orWhere($model->getTranslationsTableName() . '.locale','en');//or default module language
             }
         );
 

From 7620d45ce91ddfb7d85eba705becda85d67ef42a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 12 Aug 2020 10:04:11 -0500
Subject: [PATCH 096/256] remove httpcache

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 22cad4e3c..e8753e3a5 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,6 @@
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",
         "ezyang/htmlpurifier": "~4.0",
-        "barryvdh/laravel-httpcache": "^0.3.0",
         "tubalmartin/cssmin": "~4.0",
         "mrclay/jsmin-php": "~2.4",
         "fzaninotto/faker": "~1.4"

From 75ff868a345eb1f01cd78c5eb127d5ac1480ff40 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 12 Aug 2020 10:05:54 -0500
Subject: [PATCH 097/256] Remove dirty ole dependencies

---
 composer.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/composer.json b/composer.json
index e8753e3a5..9440d1d95 100644
--- a/composer.json
+++ b/composer.json
@@ -15,14 +15,8 @@
         "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "^3.3",
-        "coffeescript/coffeescript": "1.3.*",
         "erusev/parsedown-extra": "0.7.1",
-        "cartalyst/assetic": "1.4.*",
         "linkorb/jsmin-php": "1.0.0",
-        "leafo/scssphp": "0.7.*",
-        "natxet/cssmin": "3.0.*",
-        "oyejorge/less.php": "1.7.*",
-        "ptachoire/cssembed": "1.0.*",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
         "teamtnt/laravel-scout-tntsearch-driver": "^9.0",
@@ -32,7 +26,6 @@
         "misd/linkify": "1.1.*",
         "ezyang/htmlpurifier": "~4.0",
         "tubalmartin/cssmin": "~4.0",
-        "mrclay/jsmin-php": "~2.4",
         "fzaninotto/faker": "~1.4"
     },
     "autoload": {

From 9ed8efaa96d6f956049acc6bb155326a769d8dc3 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 12 Aug 2020 10:06:53 -0500
Subject: [PATCH 098/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 7290fa813..f622dc3ff 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -37,6 +37,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Removed `oyejorge/less.php` dependency.
 - Removed `ptachoire/cssembed` dependency.
 - Removed `coffeescript/coffeescript` dependency.
+- Removed `barryvdh/laravel-httpcache` dependency.
 - Removed `teamtnt/laravel-scout-tntsearch-driver` dependency.
 
 #### Added
@@ -47,5 +48,5 @@ Features that are deprecated will generally be removed in the next `minor` updat
 #### Fixed
 - Fixed issue with validation extender not passing along unique field types per extending validation rule.
 - Fixed issue where responses without cookie support (media stream) would result in fatal errors.
-- Fixed issue with installer where .env was not reloading properly since moving to Laravel 5.8.
+- Fixed issue with installer where `.env` was not reloading properly since moving to Laravel 5.8.
 - Fixed issue where responses without cookie support (media stream) would result in fatal errors.

From 7d782fd4dbe508cd6d3fd11f530ec6c630c0e794 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 12 Aug 2020 10:07:30 -0500
Subject: [PATCH 099/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f622dc3ff..76a95169b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+//### [1.8.0] - 2020-08-15
 ### Unreleased
 #### Removed
 - Removed `leafo/scssphp` dependency.

From d98e8bd49bbaa238b5982128201255fca7b0a227 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 12 Aug 2020 10:20:50 -0500
Subject: [PATCH 100/256] Rempove that too - it can be brought in otherwise

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9440d1d95..ab4d85ead 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
         "linkorb/jsmin-php": "1.0.0",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
-        "teamtnt/laravel-scout-tntsearch-driver": "^9.0",
         "symfony/yaml": "3.4.*",
         "jenssegers/agent": "2.6.*",
         "asm89/twig-cache-extension": "1.3.*",

From abedd3f96181d612d596a4553a27c0d0166e8530 Mon Sep 17 00:00:00 2001
From: Finn LeSueur <finn.lesueur@gmail.com>
Date: Thu, 20 Aug 2020 19:00:19 +1200
Subject: [PATCH 101/256] Fixes typo in how to get a form for manual rendering

Error "Method Anomaly\Streams\Platform\Ui\Form\FormCriteria::__toString() must not throw an exception" is thrown if `.get()` is omitted
---
 docs/en/12.front-end-development/07.forms.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/12.front-end-development/07.forms.md b/docs/en/12.front-end-development/07.forms.md
index df12b6a15..69b1e669c 100644
--- a/docs/en/12.front-end-development/07.forms.md
+++ b/docs/en/12.front-end-development/07.forms.md
@@ -23,7 +23,7 @@ The `render` method will trigger display but it is optional as `__toString` will
 You may want to take more control and set the form to a variable and use it.
 
 ```twig
-{% set form = form('books', 'reviews') %}
+{% set form = form('books', 'reviews').get() %}
 
 {{ form.open|raw }}
 

From 28f0f5aeb2fab38345d17d755cee8977cc5256bf Mon Sep 17 00:00:00 2001
From: ramcda <ryan@itinnovative.com>
Date: Thu, 20 Aug 2020 20:10:43 -0700
Subject: [PATCH 102/256] func names changed in laravel 6+

---
 src/Database/Migration/MigrationServiceProvider.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Database/Migration/MigrationServiceProvider.php b/src/Database/Migration/MigrationServiceProvider.php
index 8c51d6deb..0d5ddeccd 100644
--- a/src/Database/Migration/MigrationServiceProvider.php
+++ b/src/Database/Migration/MigrationServiceProvider.php
@@ -56,7 +56,7 @@ function ($app) {
      *
      * @return void
      */
-    protected function registerMakeCommand()
+    protected function registerMigrateMakeCommand()
     {
         $this->registerCreator();
 
@@ -95,7 +95,7 @@ function ($app) {
      *
      * @return void
      */
-    protected function registerResetCommand()
+    protected function registerMigrateResetCommand()
     {
         $this->app->singleton(
             'command.migrate.reset',
@@ -110,7 +110,7 @@ function ($app) {
      *
      * @return void
      */
-    protected function registerRefreshCommand()
+    protected function registerMigrateRefreshCommand()
     {
         $this->app->singleton(
             'command.migrate.refresh',
@@ -125,7 +125,7 @@ function () {
      *
      * @return void
      */
-    protected function registerRollbackCommand()
+    protected function registerMigrateRollbackCommand()
     {
         $this->app->singleton(
             'command.migrate.rollback',

From 74af82dd40578b0d5f57cb53944e6572938f3cdd Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 26 Aug 2020 23:34:47 -0500
Subject: [PATCH 103/256] Let's shoot for 6 here.

---
 composer.json                           |  2 +-
 docs/en/01.prologue/03.upgrade-guide.md | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index ab4d85ead..ec01c3743 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^7.0",
+        "laravel/framework": "^6.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",
diff --git a/docs/en/01.prologue/03.upgrade-guide.md b/docs/en/01.prologue/03.upgrade-guide.md
index 4e2db8057..80c09ca52 100644
--- a/docs/en/01.prologue/03.upgrade-guide.md
+++ b/docs/en/01.prologue/03.upgrade-guide.md
@@ -8,29 +8,18 @@ title: Upgrade Guide
 
 ## Upgrading from 1.6 to 1.7
 
-**Estimated Upgrade Time: 1 - 2 Minutes**
+**Estimated Upgrade Time: 3 - 5 Minutes**
 
 > We attempt to document every possible breaking change. Since some of these breaking changes are in obscure parts of the framework only a portion of these changes may actually affect your application.{.notice}
 
-### Update Search Configuration
+### Replace TNT Dependency
 
-Update your configuration according to the following source files:
+The Search Module is now the default engine for searching using basic a basic multi-stream index in database.
 
-- [https://github.com/pyrocms/pyrocms/blob/3.7/config/logging.php](https://github.com/pyrocms/pyrocms/blob/3.7/config/logging.php)
-- [https://github.com/pyrocms/pyrocms/blob/3.7/config/debugbar.php](https://github.com/pyrocms/pyrocms/blob/3.7/config/debugbar.php)
-- [https://github.com/pyrocms/pyrocms/blob/3.7/config/httpcache.php](https://github.com/pyrocms/pyrocms/blob/3.7/config/httpcache.php)
-
-### Disable Package Discovery for Laravel
-
-Disable package discovery by appending your `composer.json` file: https://github.com/pyrocms/pyrocms/blob/3.7/composer.json#L127-L131
-
-### Run Migrations
-
-Migrate the core as well as all installed addons:
+To pull TNT back in for search configurations using it simply require it in your project:
 
 ```bash
-php artisan migrate --path=vendor/anomaly/streams-platform/migrations/application
-php artisan migrate --all-addons
+composer require teamtnt/laravel-scout-tntsearch-driver
 ```
 
 ### Clean Up

From b06749968ef89e4372fa72fd8b09747bb85a74e6 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 01:22:53 -0500
Subject: [PATCH 104/256] Helpers

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index ec01c3743..9844c2953 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
     ],
     "require": {
         "laravel/framework": "^6.0",
+        "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",
         "intervention/image": "2.5.*",

From 5c7e9490247feb6a5d659f536c9cccd7e8399a31 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 01:28:39 -0500
Subject: [PATCH 105/256] HttpCache

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 9844c2953..29ebdc3a6 100644
--- a/composer.json
+++ b/composer.json
@@ -22,6 +22,7 @@
         "nicmart/string-template": "0.1.*",
         "symfony/yaml": "3.4.*",
         "jenssegers/agent": "2.6.*",
+        "barryvdh/laravel-httpcache": "^0.3",
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",
         "ezyang/htmlpurifier": "~4.0",

From c6c69f1c725b1fc1a8fca41fcad006fa65894025 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 01:41:34 -0500
Subject: [PATCH 106/256] Str::contains

---
 src/Addon/AddonProvider.php                   | 31 ++++++++++---------
 src/Addon/FieldType/FieldTypeSchema.php       | 17 +++++-----
 .../Command/WriteEnvironmentFile.php          |  3 +-
 src/Support/Parser.php                        |  9 +++---
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index e5dded386..c210e7376 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -2,20 +2,21 @@
 
 namespace Anomaly\Streams\Platform\Addon;
 
-use Anomaly\Streams\Platform\Addon\Extension\Extension;
-use Anomaly\Streams\Platform\Addon\Module\Module;
-use Anomaly\Streams\Platform\Addon\Theme\Theme;
-use Anomaly\Streams\Platform\Http\Middleware\MiddlewareCollection;
-use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
-use Anomaly\Streams\Platform\View\ViewMobileOverrides;
-use Anomaly\Streams\Platform\View\ViewOverrides;
-use Illuminate\Console\Events\ArtisanStarting;
+use Illuminate\Support\Str;
+use Illuminate\Routing\Router;
+use Illuminate\Foundation\AliasLoader;
+use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Console\Events\ArtisanStarting;
+use Anomaly\Streams\Platform\Addon\Theme\Theme;
+use Anomaly\Streams\Platform\View\ViewOverrides;
 use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Database\Eloquent\Factory;
-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Routing\Router;
+use Anomaly\Streams\Platform\Addon\Module\Module;
+use Anomaly\Streams\Platform\View\ViewMobileOverrides;
+use Anomaly\Streams\Platform\Addon\Extension\Extension;
+use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
+use Anomaly\Streams\Platform\Http\Middleware\MiddlewareCollection;
 
 /**
  * Class AddonProvider
@@ -323,7 +324,7 @@ protected function registerRoutes(AddonServiceProvider $provider, Addon $addon)
              * Check if the route is a view. In
              * which case we can simplify things.
              */
-            if (is_string($route) && str_contains($route, ['.', '::'])) {
+            if (is_string($route) && Str::contains($route, ['.', '::'])) {
 
                 \Route::view($uri, $route);
 
@@ -351,7 +352,7 @@ protected function registerRoutes(AddonServiceProvider $provider, Addon $addon)
 
             array_set($route, 'streams::addon', $addon->getNamespace());
 
-            if (is_string($route['uses']) && !str_contains($route['uses'], '@')) {
+            if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                 $this->router->resource($uri, $route['uses']);
             } else {
 
@@ -411,7 +412,7 @@ function (Router $router) use ($routes, $addon) {
 
                     array_set($route, 'streams::addon', $addon->getNamespace());
 
-                    if (is_string($route['uses']) && !str_contains($route['uses'], '@')) {
+                    if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                         $router->resource($uri, $route['uses']);
                     } else {
 
@@ -483,7 +484,7 @@ public function registerFieldsRoutes(Addon $addon, $controller, $segment = null)
 
             array_set($route, 'streams::addon', $addon->getNamespace());
 
-            if (is_string($route['uses']) && !str_contains($route['uses'], '@')) {
+            if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                 $this->router->resource($uri, $route['uses']);
             } else {
 
diff --git a/src/Addon/FieldType/FieldTypeSchema.php b/src/Addon/FieldType/FieldTypeSchema.php
index 2b652a0ab..98ff420b9 100644
--- a/src/Addon/FieldType/FieldTypeSchema.php
+++ b/src/Addon/FieldType/FieldTypeSchema.php
@@ -1,12 +1,13 @@
 <?php namespace Anomaly\Streams\Platform\Addon\FieldType;
 
-use Anomaly\Streams\Platform\Assignment\Contract\AssignmentInterface;
-use Illuminate\Contracts\Cache\Repository;
-use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\Str;
+use Illuminate\Support\Fluent;
 use Illuminate\Database\Connection;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Schema\Builder;
-use Illuminate\Support\Fluent;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Assignment\Contract\AssignmentInterface;
 
 /**
  * Class FieldTypeSchema
@@ -105,7 +106,7 @@ public function addColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true);
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
             $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
         }
     }
@@ -164,7 +165,7 @@ public function updateColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true)->change();
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
             $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
         }
     }
@@ -243,7 +244,7 @@ public function changeColumn(Blueprint $table, AssignmentInterface $assignment)
 
         $column->nullable(!$assignment->isTranslatable() ? !$assignment->isRequired() : true)->change();
 
-        if (!str_contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
+        if (!Str::contains($this->fieldType->getColumnType(), ['text', 'blob'])) {
             $column->default(array_get($this->fieldType->getConfig(), 'default_value'));
         }
     }
diff --git a/src/Application/Command/WriteEnvironmentFile.php b/src/Application/Command/WriteEnvironmentFile.php
index 47849dbdc..3b8de3bfc 100644
--- a/src/Application/Command/WriteEnvironmentFile.php
+++ b/src/Application/Command/WriteEnvironmentFile.php
@@ -1,5 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Application\Command;
 
+use Illuminate\Support\Str;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
@@ -40,7 +41,7 @@ public function handle()
 
         foreach ($this->data as $key => $value) {
             
-            if (str_contains($value, [' ', '$', '\n'])) {
+            if (Str::contains($value, [' ', '$', '\n'])) {
                 $value = '"' . trim($value, '"') . '"';
             }
 
diff --git a/src/Support/Parser.php b/src/Support/Parser.php
index 5ee5155ac..55cd25839 100644
--- a/src/Support/Parser.php
+++ b/src/Support/Parser.php
@@ -2,10 +2,11 @@
 
 namespace Anomaly\Streams\Platform\Support;
 
-use Anomaly\Streams\Platform\Routing\UrlGenerator;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Http\Request;
 use StringTemplate\Engine;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Routing\UrlGenerator;
 
 /**
  * Class Parser
@@ -77,7 +78,7 @@ public function parse($target, array $data = [])
          * if the target is a string and is in a parsable
          * format then parse the target with the payload.
          */
-        if (is_string($target) && str_contains($target, ['{', '}'])) {
+        if (is_string($target) && Str::contains($target, ['{', '}'])) {
             $target = $this->parser->render($target, $data);
         }
 

From 8be786d8c71e180204b06b2543341184504b305d Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 01:46:22 -0500
Subject: [PATCH 107/256] Fix string issue with new method

---
 src/Ui/Form/Command/SetSuccessMessage.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Ui/Form/Command/SetSuccessMessage.php b/src/Ui/Form/Command/SetSuccessMessage.php
index 7703b5979..3a5dd037e 100644
--- a/src/Ui/Form/Command/SetSuccessMessage.php
+++ b/src/Ui/Form/Command/SetSuccessMessage.php
@@ -1,8 +1,11 @@
-<?php namespace Anomaly\Streams\Platform\Ui\Form\Command;
+<?php
 
+namespace Anomaly\Streams\Platform\Ui\Form\Command;
+
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Anomaly\Streams\Platform\Message\MessageBag;
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
-use Illuminate\Http\Request;
 
 /**
  * Class SetSuccessMessage
@@ -61,7 +64,7 @@ public function handle(Request $request, MessageBag $messages)
         ];
 
         // If the name doesn't exist we need to be clever.
-        if (str_contains($parameters['name'], '::') && !trans()->has($parameters['name']) && $stream) {
+        if (Str::contains((string)$parameters['name'], '::') && !trans()->has($parameters['name']) && $stream) {
             $parameters['name'] = ucfirst(str_singular(str_replace('_', ' ', $stream->getSlug())));
         } elseif ($parameters['name']) {
             $parameters['name'] = str_singular(trans($parameters['name']));

From 98d696fb0b4fc41aecb8cefa008e04bf354b56c9 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 02:04:39 -0500
Subject: [PATCH 108/256] Dump

---
 src/Config/Command/CacheConfig.php | 2 +-
 src/Support/Value.php              | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Config/Command/CacheConfig.php b/src/Config/Command/CacheConfig.php
index b4780ba10..a5f44656b 100644
--- a/src/Config/Command/CacheConfig.php
+++ b/src/Config/Command/CacheConfig.php
@@ -1,4 +1,4 @@
-<?php namespace Anomaly\Streams\Platform\Cache\Command;
+<?php namespace Anomaly\Streams\Platform\Config\Command;
 
 use Anomaly\Streams\Platform\Console\Kernel;
 
diff --git a/src/Support/Value.php b/src/Support/Value.php
index 89458ebb2..3e0159b63 100644
--- a/src/Support/Value.php
+++ b/src/Support/Value.php
@@ -1,8 +1,9 @@
 <?php namespace Anomaly\Streams\Platform\Support;
 
-use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
-use Anomaly\Streams\Platform\Model\EloquentModel;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;
+use Anomaly\Streams\Platform\Model\EloquentModel;
+use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 
 /**
  * Class Value
@@ -192,7 +193,7 @@ public function make($parameters, $entry, $term = 'entry', $payload = [])
          * If the value looks like a render-able
          * string then render it.
          */
-        if (is_string($value) && str_contains($value, ['{{', '{%'])) {
+        if (is_string($value) && Str::contains($value, ['{{', '{%'])) {
             $value = (string)$this->template->render($value, [$term => $entry]);
         }
 

From ba05c48e96995273ca8137a1b95ce01e3cdfb55a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 22:21:08 -0500
Subject: [PATCH 109/256] Update Laravel again.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 29ebdc3a6..89bbb34a3 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^6.0",
+        "laravel/framework": "^7.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",

From 6c227060bd66e23b4ee8882ec41d8eee95644adc Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 22:43:22 -0500
Subject: [PATCH 110/256] Update

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 89bbb34a3..4fcf15274 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "linkorb/jsmin-php": "1.0.0",
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
-        "symfony/yaml": "3.4.*",
+        "symfony/yaml": "^4",
         "jenssegers/agent": "2.6.*",
         "barryvdh/laravel-httpcache": "^0.3",
         "asm89/twig-cache-extension": "1.3.*",

From f94936fc53bfab0c8934c3b7c59a03c8ceb0bd60 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 23:21:24 -0500
Subject: [PATCH 111/256] Update

---
 docs/en/01.prologue/02.change-log.md          |  4 ++++
 src/Addon/AddonCollection.php                 | 24 -------------------
 .../Command/ConfigureTranslator.php           |  5 ++++
 src/Exception/ExceptionHandler.php            | 21 ++++++++--------
 4 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 76a95169b..143461a91 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -30,6 +30,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 //### [1.8.0] - 2020-08-15
 ### Unreleased
+#### Changed
+- Changed `laravel/framework` dependency to `^7.0`.
+- Updated supporting dependencies according to Laravel 7.
+
 #### Removed
 - Removed `leafo/scssphp` dependency.
 - Removed `natxet/CssMin` dependency.
diff --git a/src/Addon/AddonCollection.php b/src/Addon/AddonCollection.php
index 77168c40b..18a388bc0 100644
--- a/src/Addon/AddonCollection.php
+++ b/src/Addon/AddonCollection.php
@@ -1,7 +1,5 @@
 <?php namespace Anomaly\Streams\Platform\Addon;
 
-use Anomaly\Streams\Platform\Addon\Extension\Extension;
-use Anomaly\Streams\Platform\Addon\Module\Module;
 use Illuminate\Support\Collection;
 
 /**
@@ -243,28 +241,6 @@ public function withAnyConfig(array $keys)
         return self::make($addons);
     }
 
-    /**
-     * Sort through each item with a callback.
-     *
-     * @param  callable|null $callback
-     * @return static
-     */
-    public function sort(callable $callback = null)
-    {
-        return parent::sort(
-            $callback ?: function ($a, $b) {
-
-                /* @var Addon $a */
-                /* @var Addon $b */
-                if ($a->getSlug() == $b->getSlug()) {
-                    return 0;
-                }
-
-                return ($a->getSlug() < $b->getSlug()) ? -1 : 1;
-            }
-        );
-    }
-
     /**
      * Return only installable addons.
      *
diff --git a/src/Application/Command/ConfigureTranslator.php b/src/Application/Command/ConfigureTranslator.php
index 1b86f0d23..b10742b0d 100644
--- a/src/Application/Command/ConfigureTranslator.php
+++ b/src/Application/Command/ConfigureTranslator.php
@@ -73,5 +73,10 @@ function ($application) {
 
         // Set our locale namespace.
         $application->make('translator')->addNamespace('streams', realpath(__DIR__ . '/../../../resources/lang'));
+
+        // Polyfill ->trans()
+        $application->make('translator')->macro('trans', function($key, array $replace = [], $locale = null, $fallback = true) {
+            return app('translator')->get($key, $replace, $locale, $fallback);
+        });
     }
 }
diff --git a/src/Exception/ExceptionHandler.php b/src/Exception/ExceptionHandler.php
index af1dbd5c8..dfc63f9e2 100644
--- a/src/Exception/ExceptionHandler.php
+++ b/src/Exception/ExceptionHandler.php
@@ -1,13 +1,14 @@
 <?php namespace Anomaly\Streams\Platform\Exception;
 
 use Exception;
-use Illuminate\Auth\AuthenticationException;
-use Illuminate\Foundation\Exceptions\Handler;
+use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Foundation\Exceptions\Handler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Throwable;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 /**
  * Class ExceptionHandler
@@ -48,7 +49,7 @@ class ExceptionHandler extends Handler
      * @param Exception $e
      * @return Exception
      */
-    protected function prepareException(Exception $e)
+    protected function prepareException(Throwable $e)
     {
         $this->original = $e;
 
@@ -62,7 +63,7 @@ protected function prepareException(Exception $e)
      * @param  Exception $e
      * @return Response|\Symfony\Component\HttpFoundation\Response
      */
-    public function render($request, Exception $e)
+    public function render($request, Throwable $e)
     {
         /**
          * Have to catch this for some reason.
@@ -123,10 +124,10 @@ protected function renderHttpException(HttpExceptionInterface $e)
      *
      * But first make sure it's stashed.
      *
-     * @param Exception $e
+     * @param Throwable $e
      * @return mixed
      */
-    public function report(Exception $e)
+    public function report(Throwable $e)
     {
         $this->original = $e;
 
@@ -143,8 +144,8 @@ protected function context()
         try {
             return array_filter(
                 [
-                    'user'       => \Auth::id(),
-                    'email'      => \Auth::user() ? \Auth::user()->email : null,
+                    'user'       => Auth::id(),
+                    'email'      => Auth::user() ? Auth::user()->email : null,
                     'url'        => request() ? request()->fullUrl() : null,
                     'identifier' => $this->container->make(ExceptionIdentifier::class)->identify($this->original),
                 ]

From b271cd7b19672e5961a92fe917ae79afacaec634 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 23:53:53 -0500
Subject: [PATCH 112/256] What precompilers..

---
 .../Command/ReloadEnvironmentFile.php         | 16 +++++++--
 src/Asset/Asset.php                           |  4 +--
 .../Migration/MigrationServiceProvider.php    |  2 +-
 tests/Unit/Asset/AssetTest.php                | 35 ++-----------------
 4 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/src/Application/Command/ReloadEnvironmentFile.php b/src/Application/Command/ReloadEnvironmentFile.php
index fab5c541b..ecfe9cf89 100644
--- a/src/Application/Command/ReloadEnvironmentFile.php
+++ b/src/Application/Command/ReloadEnvironmentFile.php
@@ -1,4 +1,9 @@
-<?php namespace Anomaly\Streams\Platform\Application\Command;
+<?php
+
+namespace Anomaly\Streams\Platform\Application\Command;
+
+use Dotenv\Dotenv;
+use Illuminate\Support\Env;
 
 /**
  * Class ReadEnvironmentFile
@@ -32,7 +37,12 @@ public function handle()
          * and overload from the changes that may
          * have taken place.
          */
-        $dotenv = \Dotenv\Dotenv::create(base_path());
-        $dotenv->overload();
+        $dotenv = Dotenv::create(
+            Env::getRepository(),
+            app()->environmentPath(),
+            app()->environmentFile()
+        );
+
+        $dotenv->load();
     }
 }
diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index 26edf2fac..617281b72 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -546,11 +546,11 @@ protected function publish($path, $collection, $additionalFilters)
         if (str_contains($collection, public_path())) {
             return;
         }
-
+        
         $hint = $this->paths->hint($collection);
 
         $filters = $this->collectionFilters($collection, $additionalFilters); // Returns combined filter flags
-
+        
         /**
          * Get the concatenated content
          * of the asset collection.
diff --git a/src/Database/Migration/MigrationServiceProvider.php b/src/Database/Migration/MigrationServiceProvider.php
index 0d5ddeccd..c60e3b56e 100644
--- a/src/Database/Migration/MigrationServiceProvider.php
+++ b/src/Database/Migration/MigrationServiceProvider.php
@@ -145,7 +145,7 @@ protected function registerCreator()
         $this->app->singleton(
             'migration.creator',
             function ($app) {
-                return new MigrationCreator($app['files']);
+                return new MigrationCreator($app['files'], $app->basePath('stubs'));
             }
         );
     }
diff --git a/tests/Unit/Asset/AssetTest.php b/tests/Unit/Asset/AssetTest.php
index 2e906527d..f5ee4f151 100644
--- a/tests/Unit/Asset/AssetTest.php
+++ b/tests/Unit/Asset/AssetTest.php
@@ -8,7 +8,7 @@ public function testCanDownload()
         /* @var \Anomaly\Streams\Platform\Asset\Asset $asset */
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
-        $target = 'https://gist.githubusercontent.com/RyanThompson/f75b540ecbd3bc9b5ee8614ccd4dc080/raw/01fc971eda86bd89cad8c91c9042261aeb0b5d18/test.scss';
+        $target = 'https://gist.githubusercontent.com/RyanThompson/f75b540ecbd3bc9b5ee8614ccd4dc080/raw/a224e8c477bf5c3c081cdeb02b3e0bbd430bd12b/test.css';
 
         $path = $asset->download($target);
 
@@ -17,38 +17,9 @@ public function testCanDownload()
             file_get_contents($asset->realPath($path))
         );
 
-        $content = $asset->inline($path, ["min"]);
-
-        $this->assertEquals($content, '.test{color:#fff}.test .invert{color:#000}');
-    }
-
-    public function testPreCompilers()
-    {
-        /* @var \Anomaly\Streams\Platform\Asset\Asset $asset */
-        $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
-
-        // @todo fix coffee or drop it
-//        $this->assertEquals(
-//            "\nalert('Hello');",
-//            $asset->inline('anomaly.module.test::scripts/test.coffee')
-//        );
-
-        $this->assertEquals(
-            '.test{color:#fff}.test .invert{color:#000}',
-            $asset->inline('anomaly.module.test::styles/test.scss', ['min'])
-        );
-
-        $this->assertEquals(
-            '.test{color:#ffffff}.test .invert{color:#000000}',
-            $asset->inline('anomaly.module.test::styles/test.less', ['min'])
-        );
-
-        // @todo fix stylus or drop it
-//        $this->assertEquals(
-//            '.test{color:#ffffff}.test .invert{color:#000000}',
-//            $asset->inline('anomaly.module.test::styles/test.styl', ['min'])
-//        );
+        $content = $asset->inline($path, ["min", "scss"]);
 
+        $this->assertEquals('.test{color:#fff}', $content);
     }
 
     public function testInline()

From 1ed4ca6dfd1caa46486815a5b7ae7d2f5dca1758 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 27 Aug 2020 23:55:14 -0500
Subject: [PATCH 113/256] Update tests

---
 tests/Unit/Asset/AssetTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Unit/Asset/AssetTest.php b/tests/Unit/Asset/AssetTest.php
index f5ee4f151..d14464f18 100644
--- a/tests/Unit/Asset/AssetTest.php
+++ b/tests/Unit/Asset/AssetTest.php
@@ -33,7 +33,7 @@ public function testInline()
         );
 
         $this->assertEquals(
-            ".test{color:#ffffff}",
+            ".test{color:#fff}",
             $asset->inline('anomaly.module.test::styles/test.css', ['min'])
         );
     }
@@ -175,8 +175,8 @@ public function testInlines()
 
         $this->assertEquals(
             [
-                '.test{color:#ffffff}',
-                '.test{color:#000000}',
+                '.test{color:#fff}',
+                '.test{color:#000}',
             ],
             $asset->inlines('test.css', ['noversion', 'min'], ['foo' => 'bar'])
         );

From 1acaef5317faf7af7c47b5b541397213d8f4c2ac Mon Sep 17 00:00:00 2001
From: Robin Radic <rradic@hotmail.com>
Date: Tue, 1 Sep 2020 21:24:43 +0200
Subject: [PATCH 114/256] Fixed bug that prevent installing. Changed the string
 argument to array

---
 src/Addon/AddonLoader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Addon/AddonLoader.php b/src/Addon/AddonLoader.php
index 291fbbba7..19c91ea83 100644
--- a/src/Addon/AddonLoader.php
+++ b/src/Addon/AddonLoader.php
@@ -121,7 +121,7 @@ public function classLoader()
      */
     public function dump()
     {
-        $process = new Process('composer dump-autoload');
+        $process = new Process(['composer dump-autoload']);
 
         $process->run();
         $process->wait();

From c6c4c366506074e7dcdfeb3973e5f264a2941ded Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 1 Sep 2020 23:29:05 -0500
Subject: [PATCH 115/256] Docs

---
 docs/en/01.prologue/02.change-log.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 143461a91..7d3c57040 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,11 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-//### [1.8.0] - 2020-08-15
-### Unreleased
+### [1.8.0] - 2020-09-01
 #### Changed
 - Changed `laravel/framework` dependency to `^7.0`.
-- Updated supporting dependencies according to Laravel 7.
+- Updated supporting dependencies for Laravel 7.
 
 #### Removed
 - Removed `leafo/scssphp` dependency.
@@ -55,3 +54,4 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Fixed issue where responses without cookie support (media stream) would result in fatal errors.
 - Fixed issue with installer where `.env` was not reloading properly since moving to Laravel 5.8.
 - Fixed issue where responses without cookie support (media stream) would result in fatal errors.
+- Fixed issue where installation was not properly dumping the autoloader for generated models.

From da9ce41f9adf088219aec760bcb8bb829a738894 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 2 Sep 2020 23:17:46 -0500
Subject: [PATCH 116/256] Allow 8 too

---
 composer.json                        | 2 +-
 docs/en/01.prologue/02.change-log.md | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4fcf15274..a4026e3e7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^7.0",
+        "laravel/framework": "^7.0|^8.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",
diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 7d3c57040..001e74d6b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.1] - 2020-09-02
+#### Changed
+- Changed `laravel/framework` dependency to `^7.0|^8.0`.
+
 ### [1.8.0] - 2020-09-01
 #### Changed
 - Changed `laravel/framework` dependency to `^7.0`.

From e1d9f371f7da1fae9b2b5143e20c79bda8d2f25c Mon Sep 17 00:00:00 2001
From: Volodymyr Stelmakh <volod.stelmakh@gmail.com>
Date: Sun, 6 Sep 2020 21:00:25 +0200
Subject: [PATCH 117/256] replace linkify by url highlight

---
 composer.json                  |  2 +-
 src/Support/Str.php            |  9 ++++--
 tests/Unit/Support/StrTest.php | 50 ++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index b0ad402dc..b34413925 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "symfony/yaml": "3.4.*",
         "jenssegers/agent": "2.6.*",
         "asm89/twig-cache-extension": "1.3.*",
-        "misd/linkify": "1.1.*",
+        "vstelmakh/url-highlight": "^2.2",
         "ezyang/htmlpurifier": "~4.0",
         "barryvdh/laravel-httpcache": "^0.3.0",
         "tubalmartin/cssmin": "~4.0",
diff --git a/src/Support/Str.php b/src/Support/Str.php
index f73f2faba..02751975a 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -1,6 +1,8 @@
 <?php namespace Anomaly\Streams\Platform\Support;
 
-use Misd\Linkify\Linkify;
+use VStelmakh\UrlHighlight\Encoder\HtmlSpecialcharsEncoder;
+use VStelmakh\UrlHighlight\Highlighter\HtmlHighlighter;
+use VStelmakh\UrlHighlight\UrlHighlight;
 
 /**
  * Class Str
@@ -67,7 +69,10 @@ public function truncate($value, $limit = 100, $end = '...')
      */
     public function linkify($text, array $options = [])
     {
-        return (new Linkify($options))->process($text);
+        $encoder = new HtmlSpecialcharsEncoder();
+        $highlighter = new HtmlHighlighter('http', $options['attr']);
+        $urlHighlight = new UrlHighlight(null, $highlighter, $encoder);
+        return $urlHighlight->highlightUrls($text);
     }
 
     /**
diff --git a/tests/Unit/Support/StrTest.php b/tests/Unit/Support/StrTest.php
index 3c9dbc686..2a14e7b22 100644
--- a/tests/Unit/Support/StrTest.php
+++ b/tests/Unit/Support/StrTest.php
@@ -12,4 +12,54 @@ public function testCanTruncateString()
     {
         $this->assertEquals('Ryan...', (new \Anomaly\Streams\Platform\Support\Str())->truncate('Ryan Thompson', 7));
     }
+
+    /**
+     * @dataProvider linkifyDataProvider
+     */
+    public function testLinkify(string $text, array $attributes, string $expected): void
+    {
+        self::assertSame(
+            $expected,
+            (new \Anomaly\Streams\Platform\Support\Str())->linkify($text, ['attr' => $attributes])
+        );
+    }
+
+    /**
+     * @return array[]
+     */
+    public function linkifyDataProvider(): array
+    {
+        return [
+            'one url' => [
+                'Some http://example.com text',
+                [],
+                'Some <a href="http://example.com">http://example.com</a> text',
+            ],
+            'two urls' => [
+                'Visit http://example.com, and see some example.com content.',
+                [],
+                'Visit <a href="http://example.com">http://example.com</a>, and see some <a href="http://example.com">example.com</a> content.',
+            ],
+            'html special chars encoded' => [
+                'Some &lt;b&gt;http://example.com&lt;/b&gt; text',
+                [],
+                'Some &lt;b&gt;<a href="http://example.com">http://example.com</a>&lt;/b&gt; text',
+            ],
+            'already highlighted' => [
+                'Some <a href="http://example.com">http://example.com</a> text',
+                [],
+                'Some <a href="http://example.com">http://example.com</a> text',
+            ],
+            'email' => [
+                'Some user@example.com text',
+                [],
+                'Some <a href="mailto:user@example.com">user@example.com</a> text',
+            ],
+            'attributes' => [
+                'Some http://example.com text',
+                ['target' => '_blank'],
+                'Some <a href="http://example.com" target="_blank">http://example.com</a> text',
+            ],
+        ];
+    }
 }

From 677f4a02e39516fd6adb22c09a758765cd5e1a15 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 9 Sep 2020 00:41:32 -0500
Subject: [PATCH 118/256] Swap

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a4026e3e7..2462a64fd 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^7.0|^8.0",
+        "laravel/framework": "^8.0|^7.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",

From f91b659c92e031cecdbe723542d4eda53e0ae9a5 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 9 Sep 2020 00:41:48 -0500
Subject: [PATCH 119/256] Just update

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2462a64fd..8d1ab0891 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^8.0|^7.0",
+        "laravel/framework": "^8.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",

From 10df96e2f5e73b93d31ff2854cbb431d12047140 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 9 Sep 2020 00:52:46 -0500
Subject: [PATCH 120/256] Keep er here.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8d1ab0891..a4026e3e7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^7.0|^8.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",

From f3314d9d5f670ae2a1f10548460386d22d21fbde Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 9 Sep 2020 02:41:55 -0500
Subject: [PATCH 121/256] Add support for manually setting filter values to
 leverage during query

---
 docs/en/01.prologue/02.change-log.md          |  4 ++++
 .../Filter/Contract/FilterInterface.php       |  8 +++++++
 src/Ui/Table/Component/Filter/Filter.php      | 21 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 8b93ecbea..b95f59bd1 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.6.194] - 2020-09-09
+#### Added
+- Added ability to set filter value and active state for manual filter manipulation.
+
 ### [1.6.193] - 2020-07-31
 #### Fixed
 - Fixed issue where form failure repopulation was not using correct method.
diff --git a/src/Ui/Table/Component/Filter/Contract/FilterInterface.php b/src/Ui/Table/Component/Filter/Contract/FilterInterface.php
index 68f7a595c..30e50e7aa 100644
--- a/src/Ui/Table/Component/Filter/Contract/FilterInterface.php
+++ b/src/Ui/Table/Component/Filter/Contract/FilterInterface.php
@@ -49,6 +49,14 @@ public function getInputName();
      */
     public function getValue();
 
+    /**
+     * Set the filter value.
+     *
+     * @param $value
+     * @return $this
+     */
+    public function setValue($value);
+
     /**
      * Set the exact flag.
      *
diff --git a/src/Ui/Table/Component/Filter/Filter.php b/src/Ui/Table/Component/Filter/Filter.php
index b40ef2ee3..e744cbb90 100644
--- a/src/Ui/Table/Component/Filter/Filter.php
+++ b/src/Ui/Table/Component/Filter/Filter.php
@@ -64,6 +64,13 @@ class Filter implements FilterInterface
      */
     protected $column = null;
 
+    /**
+     * The filter value.
+     *
+     * @var mixed
+     */
+    protected $value = null;
+
     /**
      * The filter placeholder.
      *
@@ -141,7 +148,19 @@ public function getInput()
      */
     public function getValue()
     {
-        return app('request')->get($this->getInputName());
+        return app('request')->get($this->getInputName(), $this->value);
+    }
+
+    /**
+     * Get the filter value.
+     *
+     * @return $this
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+
+        return $this;
     }
 
     /**

From 84e132a1ddfb3dd67138720d7fe423925598ca74 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 9 Sep 2020 04:16:44 -0500
Subject: [PATCH 122/256] Helpers..

---
 src/Addon/AddonProvider.php |  2 ++
 src/StreamsPlugin.php       | 12 ++++++------
 src/Support/Value.php       |  2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index 0a0707a8c..85259e8fa 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Str;
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\AliasLoader;
+use Illuminate\Support\Traits\Macroable;
 use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -13,6 +14,7 @@
 use Anomaly\Streams\Platform\View\ViewOverrides;
 use Illuminate\Contracts\Foundation\Application;
 use Anomaly\Streams\Platform\Addon\Module\Module;
+use Anomaly\Streams\Platform\Traits\FiresCallbacks;
 use Anomaly\Streams\Platform\View\ViewMobileOverrides;
 use Anomaly\Streams\Platform\Addon\Extension\Extension;
 use Anomaly\Streams\Platform\View\Event\RegisteringTwigPlugins;
diff --git a/src/StreamsPlugin.php b/src/StreamsPlugin.php
index b63a08978..14d8f2e96 100644
--- a/src/StreamsPlugin.php
+++ b/src/StreamsPlugin.php
@@ -111,8 +111,8 @@ function () {
 
                     if (count($arguments) >= 2) {
                         $arguments = [
-                            'namespace' => array_get(func_get_args(), 0),
-                            'stream'    => array_get(func_get_args(), 1),
+                            'namespace' => Arr::get(func_get_args(), 0),
+                            'stream'    => Arr::get(func_get_args(), 1),
                         ];
                     }
 
@@ -133,9 +133,9 @@ function () {
 
                     if (count($arguments) >= 2) {
                         $arguments = [
-                            'namespace' => array_get(func_get_args(), 0),
-                            'stream'    => array_get(func_get_args(), 1),
-                            'entry'     => array_get(func_get_args(), 2),
+                            'namespace' => Arr::get(func_get_args(), 0),
+                            'stream'    => Arr::get(func_get_args(), 1),
+                            'entry'     => Arr::get(func_get_args(), 2),
                         ];
                     }
 
@@ -399,7 +399,7 @@ function ($email, array $parameters = []) {
             new \Twig_SimpleFunction(
                 'cookie',
                 function ($key, $default = null) {
-                    return array_get($_COOKIE, $key, $default);
+                    return Arr::get($_COOKIE, $key, $default);
                 }
             ),
             new \Twig_SimpleFunction(
diff --git a/src/Support/Value.php b/src/Support/Value.php
index da79c7639..bf3d50acb 100644
--- a/src/Support/Value.php
+++ b/src/Support/Value.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Anomaly\Streams\Platform\Support;
+
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Support\Arrayable;

From e2d7fceffddf73003afdaeba11250ea14dd22b1f Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 10 Sep 2020 17:00:34 -0500
Subject: [PATCH 123/256] Replace with correct method

---
 resources/views/form/ajax/layout.twig       | 2 +-
 resources/views/form/partials/layout.twig   | 2 +-
 resources/views/grid/grid.twig              | 2 +-
 resources/views/table/ajax.twig             | 6 +++---
 resources/views/table/ajax/filters.twig     | 2 +-
 resources/views/table/ajax/header.twig      | 2 +-
 resources/views/table/ajax/views.twig       | 2 +-
 resources/views/table/partials/body.twig    | 2 +-
 resources/views/table/partials/filters.twig | 2 +-
 resources/views/table/partials/header.twig  | 2 +-
 resources/views/table/partials/views.twig   | 2 +-
 resources/views/table/standard.twig         | 4 ++--
 resources/views/table/standard/filters.twig | 2 +-
 resources/views/table/standard/views.twig   | 2 +-
 resources/views/table/table.twig            | 4 ++--
 resources/views/tree/tree.twig              | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/resources/views/form/ajax/layout.twig b/resources/views/form/ajax/layout.twig
index 1322679f7..6c2b50284 100644
--- a/resources/views/form/ajax/layout.twig
+++ b/resources/views/form/ajax/layout.twig
@@ -5,7 +5,7 @@
         </div>
     </div>
 {% else %}
-    {% if not form.sections.empty() %}
+    {% if not form.sections.isEmpty() %}
         {% for section in form.sections %}
             {% if section.view %}
                 {% include section.view %}
diff --git a/resources/views/form/partials/layout.twig b/resources/views/form/partials/layout.twig
index c2dd64bc8..76e7deeb3 100644
--- a/resources/views/form/partials/layout.twig
+++ b/resources/views/form/partials/layout.twig
@@ -8,7 +8,7 @@
 
 {% else %}
 
-    {% if not form.sections.empty() %}
+    {% if not form.sections.isEmpty() %}
 
         {% for section in form.sections %}
             {% if section.view %}
diff --git a/resources/views/grid/grid.twig b/resources/views/grid/grid.twig
index f34009dd5..3d3f957ff 100644
--- a/resources/views/grid/grid.twig
+++ b/resources/views/grid/grid.twig
@@ -4,7 +4,7 @@
 
     <div class="container-fluid">
 
-        {% if not grid.items.empty() %}
+        {% if not grid.items.isEmpty() %}
             <ul class="grid grid--sortable sortable row">
                 {% for item in grid.items %}
                     <li data-id="{{ item.id }}">
diff --git a/resources/views/table/ajax.twig b/resources/views/table/ajax.twig
index 608af21b8..a43e50d49 100644
--- a/resources/views/table/ajax.twig
+++ b/resources/views/table/ajax.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -13,7 +13,7 @@
 {{ view("streams::table/ajax/views", {'table': table}) }}
 {{ view("streams::table/ajax/filters", {'table': table}) }}
 
-{% if table.rows.empty() %}
+{% if table.rows.isEmpty() %}
     {% block no_results %}
         <div class="no-results">
             <p>
@@ -23,7 +23,7 @@
     {% endblock %}
 {% endif %}
 
-{% if not table.rows.empty() %}
+{% if not table.rows.isEmpty() %}
 
     {{ form_open({'url': url_full(), 'class': 'ajax'}) }}
 
diff --git a/resources/views/table/ajax/filters.twig b/resources/views/table/ajax/filters.twig
index b68c73cf2..967b002e8 100644
--- a/resources/views/table/ajax/filters.twig
+++ b/resources/views/table/ajax/filters.twig
@@ -1,4 +1,4 @@
-{% if not table.filters.empty() %}
+{% if not table.filters.isEmpty() %}
     <div class="table-filters">
 
         {{ form_open({'method': 'get', 'id': 'filters', 'url': url_full(), 'class': 'ajax form-inline'}) }}
diff --git a/resources/views/table/ajax/header.twig b/resources/views/table/ajax/header.twig
index 7e4c90e74..5e0af80c6 100644
--- a/resources/views/table/ajax/header.twig
+++ b/resources/views/table/ajax/header.twig
@@ -5,7 +5,7 @@
         <th style="width: 30px;">&nbsp;</th>
     {% endif %}
 
-    {% if not table.actions.empty() %}
+    {% if not table.actions.isEmpty() %}
         <th style="width: 30px;">
             <input data-toggle="all" type="checkbox">
         </th>
diff --git a/resources/views/table/ajax/views.twig b/resources/views/table/ajax/views.twig
index 0c582f919..43250ffc0 100644
--- a/resources/views/table/ajax/views.twig
+++ b/resources/views/table/ajax/views.twig
@@ -1,4 +1,4 @@
-{% if not table.views.empty() %}
+{% if not table.views.isEmpty() %}
     <nav class="navbar navbar-light">
         <div class="nav navbar-nav">
             {% for view in table.views %}
diff --git a/resources/views/table/partials/body.twig b/resources/views/table/partials/body.twig
index 5954abae8..fdb6f85f0 100644
--- a/resources/views/table/partials/body.twig
+++ b/resources/views/table/partials/body.twig
@@ -9,7 +9,7 @@
             </td>
         {% endif %}
 
-        {% if not table.actions.empty() %}
+        {% if not table.actions.isEmpty() %}
             <td>
                 <input type="checkbox" data-toggle="action" name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/>
             </td>
diff --git a/resources/views/table/partials/filters.twig b/resources/views/table/partials/filters.twig
index 1c4b67f21..28a676770 100644
--- a/resources/views/table/partials/filters.twig
+++ b/resources/views/table/partials/filters.twig
@@ -1,4 +1,4 @@
-{% if not table.filters.empty() %}
+{% if not table.filters.isEmpty() %}
     <div class="card card-container">
         {{ form_open({'method': 'get', 'id': 'filters', 'url': url_full(), 'class': 'form-inline'}) }}
         <input type="hidden" name="{{ table.options.prefix }}limit" value="{{ table.options.limit }}">
diff --git a/resources/views/table/partials/header.twig b/resources/views/table/partials/header.twig
index 218000a3e..af36dd1c0 100644
--- a/resources/views/table/partials/header.twig
+++ b/resources/views/table/partials/header.twig
@@ -5,7 +5,7 @@
         <th style="width: 30px;">&nbsp;</th>
     {% endif %}
 
-    {% if not table.actions.empty() %}
+    {% if not table.actions.isEmpty() %}
         <th style="width: 30px;">
             <input data-toggle="all" type="checkbox">
         </th>
diff --git a/resources/views/table/partials/views.twig b/resources/views/table/partials/views.twig
index 7f8d3f476..1a9f2ea37 100644
--- a/resources/views/table/partials/views.twig
+++ b/resources/views/table/partials/views.twig
@@ -1,4 +1,4 @@
-{% if not table.views.empty() %}
+{% if not table.views.isEmpty() %}
     <div class="card">
 
         <nav class="navbar navbar-light">
diff --git a/resources/views/table/standard.twig b/resources/views/table/standard.twig
index b1ba54e81..8fb3e18d6 100644
--- a/resources/views/table/standard.twig
+++ b/resources/views/table/standard.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -13,7 +13,7 @@
 
 {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
-{% if not table.rows.empty() %}
+{% if not table.rows.isEmpty() %}
     {{ form_open({ 'url': url_full() }) }}
     <div class="table-stack">
         <table
diff --git a/resources/views/table/standard/filters.twig b/resources/views/table/standard/filters.twig
index 18125ae62..91095489a 100644
--- a/resources/views/table/standard/filters.twig
+++ b/resources/views/table/standard/filters.twig
@@ -1,4 +1,4 @@
-{% if not table.filters.empty() %}
+{% if not table.filters.isEmpty() %}
     {{ form_open({'method': 'get', 'id': 'filters', 'url': url_full(), 'class': 'form-inline'}) }}
     <input type="hidden" name="{{ table.options.prefix }}limit" value="{{ table.options.limit }}">
     <input type="hidden" name="{{ table.options.prefix }}view" value="{{ table.views.active().getSlug() }}">
diff --git a/resources/views/table/standard/views.twig b/resources/views/table/standard/views.twig
index d173dff53..e86ef88bc 100644
--- a/resources/views/table/standard/views.twig
+++ b/resources/views/table/standard/views.twig
@@ -1,4 +1,4 @@
-{% if not table.views.empty() %}
+{% if not table.views.isEmpty() %}
     <nav class="navbar navbar-light">
         <div class="nav navbar-nav">
             {% for view in table.views %}
diff --git a/resources/views/table/table.twig b/resources/views/table/table.twig
index b949c6ac8..40a7e8a3c 100644
--- a/resources/views/table/table.twig
+++ b/resources/views/table/table.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -15,7 +15,7 @@
 
     {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
-    {% if not table.rows.empty() %}
+    {% if not table.rows.isEmpty() %}
         {% block card %}
             <div class="card">
 
diff --git a/resources/views/tree/tree.twig b/resources/views/tree/tree.twig
index 43d31c08c..574022eab 100644
--- a/resources/views/tree/tree.twig
+++ b/resources/views/tree/tree.twig
@@ -7,7 +7,7 @@
 
     <div class="container-fluid">
 
-        {% if not tree.items.empty() %}
+        {% if not tree.items.isEmpty() %}
             <ul class="tree tree--sortable sortable">
                 {{ macro.tree(tree.items.root(), tree) }}
             </ul>

From 1fc70a294cd40bef1ca2801dea75510b28c2b4e3 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 10 Sep 2020 21:21:43 -0500
Subject: [PATCH 124/256] add support for un-setting values for filtering

---
 src/Ui/Table/Component/Filter/Filter.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Ui/Table/Component/Filter/Filter.php b/src/Ui/Table/Component/Filter/Filter.php
index e744cbb90..8073e4b02 100644
--- a/src/Ui/Table/Component/Filter/Filter.php
+++ b/src/Ui/Table/Component/Filter/Filter.php
@@ -69,7 +69,7 @@ class Filter implements FilterInterface
      *
      * @var mixed
      */
-    protected $value = null;
+    protected $value = '__BLANK';
 
     /**
      * The filter placeholder.
@@ -148,7 +148,11 @@ public function getInput()
      */
     public function getValue()
     {
-        return app('request')->get($this->getInputName(), $this->value);
+        if ($this->value != '__BLANK') {
+            return $this->value;
+        }
+
+        return app('request')->get($this->getInputName());
     }
 
     /**

From 94a4ba5bd8e285e1fa1d7e5e48f01ade4dc0fb47 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 11 Sep 2020 02:00:38 -0500
Subject: [PATCH 125/256] Adjust Constraint

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a4026e3e7..8672104c0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
         "symfony/yaml": "^4",
-        "jenssegers/agent": "2.6.*",
+        "jenssegers/agent": "^2.6.0",
         "barryvdh/laravel-httpcache": "^0.3",
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",

From d50d0c9be2eb2a40f1a35860e6ba5a8bf9a32fc0 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 11 Sep 2020 02:01:29 -0500
Subject: [PATCH 126/256] Revert

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8672104c0..a4026e3e7 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "robclancy/presenter": "1.3.*",
         "nicmart/string-template": "0.1.*",
         "symfony/yaml": "^4",
-        "jenssegers/agent": "^2.6.0",
+        "jenssegers/agent": "2.6.*",
         "barryvdh/laravel-httpcache": "^0.3",
         "asm89/twig-cache-extension": "1.3.*",
         "misd/linkify": "1.1.*",

From 618a3062994668c2dd3437d3ab36f7717cd8e9b5 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 11 Sep 2020 02:06:23 -0500
Subject: [PATCH 127/256] Syntax

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index a4026e3e7..490214b2e 100644
--- a/composer.json
+++ b/composer.json
@@ -12,19 +12,19 @@
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
         "doctrine/dbal": "^2.6",
-        "intervention/image": "2.5.*",
+        "intervention/image": "^2.5.0",
         "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "^3.3",
         "erusev/parsedown-extra": "0.7.1",
         "linkorb/jsmin-php": "1.0.0",
-        "robclancy/presenter": "1.3.*",
-        "nicmart/string-template": "0.1.*",
+        "robclancy/presenter": "^1.3.0",
+        "nicmart/string-template": "^0.1.0",
         "symfony/yaml": "^4",
-        "jenssegers/agent": "2.6.*",
+        "jenssegers/agent": "^2.6.0",
         "barryvdh/laravel-httpcache": "^0.3",
-        "asm89/twig-cache-extension": "1.3.*",
-        "misd/linkify": "1.1.*",
+        "asm89/twig-cache-extension": "^1.3.0",
+        "misd/linkify": "^1.1.0",
         "ezyang/htmlpurifier": "~4.0",
         "tubalmartin/cssmin": "~4.0",
         "fzaninotto/faker": "~1.4"

From eb3a30beab1bba45e26e6b19598ca51423344c5b Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Fri, 11 Sep 2020 02:37:29 -0500
Subject: [PATCH 128/256] Valid composer

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 490214b2e..64b98c365 100644
--- a/composer.json
+++ b/composer.json
@@ -8,16 +8,16 @@
         }
     ],
     "require": {
-        "laravel/framework": "^7.0|^8.0",
+        "laravel/framework": "^8.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
-        "doctrine/dbal": "^2.6",
+        "doctrine/dbal": "^2.6", 
         "intervention/image": "^2.5.0",
         "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
         "barryvdh/laravel-debugbar": "^3.3",
-        "erusev/parsedown-extra": "0.7.1",
-        "linkorb/jsmin-php": "1.0.0",
+        "erusev/parsedown-extra": "^0.7.1",
+        "linkorb/jsmin-php": "^1.0.0",
         "robclancy/presenter": "^1.3.0",
         "nicmart/string-template": "^0.1.0",
         "symfony/yaml": "^4",

From 1aa1a9981fb822de91ae1834ebd062655b1920b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Mon, 14 Sep 2020 15:44:49 +0700
Subject: [PATCH 129/256] Fixed null versionable_id + double versions on create

---
 src/Model/EloquentFormRepository.php | 5 +----
 src/Ui/Form/Command/PostForm.php     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Model/EloquentFormRepository.php b/src/Model/EloquentFormRepository.php
index ff0e77c29..68ac98088 100644
--- a/src/Model/EloquentFormRepository.php
+++ b/src/Model/EloquentFormRepository.php
@@ -91,13 +91,11 @@ public function save(FormBuilder $builder)
         if ($entry->getId()) {
             $entry->update($data);
         } else {
-            $entry = $entry->create($data);
+            $entry->fill($data)->save();
         }
 
         $entry->reguard();
 
-        $builder->setFormEntry($entry);
-
         $this->processSelfHandlingFields($builder);
 
         /**
@@ -107,7 +105,6 @@ public function save(FormBuilder $builder)
         if ($builder->versioningEnabled() && in_array(Versionable::class, $classes) && isset($enabled) && $enabled == true) {
             $entry->enableVersioning();
         }
-
     }
 
     /**
diff --git a/src/Ui/Form/Command/PostForm.php b/src/Ui/Form/Command/PostForm.php
index 5456c3517..b086f9f96 100644
--- a/src/Ui/Form/Command/PostForm.php
+++ b/src/Ui/Form/Command/PostForm.php
@@ -54,8 +54,8 @@ public function handle()
 
         $this->dispatchNow(new LoadFormValues($this->builder));
         $this->dispatchNow(new RemoveSkippedFields($this->builder));
-        $this->dispatchNow(new HandleVersioning($this->builder));
         $this->dispatchNow(new HandleForm($this->builder));
+        $this->dispatchNow(new HandleVersioning($this->builder));
         $this->dispatchNow(new SetSuccessMessage($this->builder));
         $this->dispatchNow(new SetActionResponse($this->builder));
 

From fdafb1578311c614872f5b307496d80596230a99 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 14 Sep 2020 11:56:51 -0500
Subject: [PATCH 130/256] Fix issue with version table builder and current
 versions.

---
 src/Version/Table/VersionTableBuilder.php | 36 ++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/Version/Table/VersionTableBuilder.php b/src/Version/Table/VersionTableBuilder.php
index d9c1ccd54..7333b5483 100644
--- a/src/Version/Table/VersionTableBuilder.php
+++ b/src/Version/Table/VersionTableBuilder.php
@@ -1,10 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Version\Table;
+<?php
 
+namespace Anomaly\Streams\Platform\Version\Table;
+
+use Illuminate\Database\Eloquent\Builder;
 use Anomaly\Streams\Platform\Model\EloquentModel;
-use Anomaly\Streams\Platform\Model\Traits\Versionable;
 use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
+use Anomaly\Streams\Platform\Model\Traits\Versionable;
+use Anomaly\Streams\Platform\Version\VersionModel;
 
 /**
  * Class VersionTableBuilder
@@ -30,6 +32,13 @@ class VersionTableBuilder extends TableBuilder
      */
     protected $type = null;
 
+    /**
+     * The current version.
+     *
+     * @var mixed
+     */
+    protected $current = null;
+
     /**
      * The table filters.
      *
@@ -139,4 +148,23 @@ public function setType($type)
         return $this;
     }
 
+    /**
+     * Set the current version.
+     *
+     * @param VersionModel $current
+     */
+    public function setCurrent(VersionModel $current)
+    {
+        $this->current = $current;
+
+        return $this;
+    }
+
+    /**
+     * Get the current version.
+     */
+    public function getCurrent()
+    {
+        return $this->current;
+    }
 }

From c5d03552536a0d15b01ad8405b54ba9732f50050 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 14 Sep 2020 12:00:29 -0500
Subject: [PATCH 131/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 880a4c45d..c45e743a1 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,13 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.38] - 2020-09-14
+#### Fixed
+- Fixed issues surrounding versioning.
+
+#### Changed
+- Swapped out `misd/linkify` for `vstelmakh/url-highlight`.
+
 ### [1.7.37] - 2020-09-09
 #### Added
 - Added ability to set filter value and active state for manual filter manipulation.

From 1f8f5c68d2720e74aed64a2d4a9204e21c406d2a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 14 Sep 2020 12:03:01 -0500
Subject: [PATCH 132/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index a1570c1d8..2d8df1554 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,13 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.4] - 2020-09-14
+#### Fixed
+- Fixed issues surrounding versioning.
+
+#### Changed
+- Swapped out `misd/linkify` for `vstelmakh/url-highlight`.
+
 
 ### [1.8.2] - 2020-09-09
 #### Added
@@ -38,6 +45,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 #### Changed
 - Changed `laravel/framework` dependency to `^7.0|^8.0`.
 
+
 ### [1.8.0] - 2020-09-01
 #### Changed
 - Changed `laravel/framework` dependency to `^7.0`.

From 8f8c05f89e2bc00b0acd9a3687d7dd1532f2736c Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 17 Sep 2020 11:18:04 -0500
Subject: [PATCH 133/256] This may not be set.

---
 src/Support/Str.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Support/Str.php b/src/Support/Str.php
index 02751975a..0387b4c98 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -1,5 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Support;
 
+use Illuminate\Support\Arr;
 use VStelmakh\UrlHighlight\Encoder\HtmlSpecialcharsEncoder;
 use VStelmakh\UrlHighlight\Highlighter\HtmlHighlighter;
 use VStelmakh\UrlHighlight\UrlHighlight;
@@ -70,7 +71,7 @@ public function truncate($value, $limit = 100, $end = '...')
     public function linkify($text, array $options = [])
     {
         $encoder = new HtmlSpecialcharsEncoder();
-        $highlighter = new HtmlHighlighter('http', $options['attr']);
+        $highlighter = new HtmlHighlighter('http', Arr::get($options, 'attr'));
         $urlHighlight = new UrlHighlight(null, $highlighter, $encoder);
         return $urlHighlight->highlightUrls($text);
     }

From 964e90744788ccbac41622c95199a258f8752e20 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 17 Sep 2020 11:19:44 -0500
Subject: [PATCH 134/256] Attr may not be set.

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index c45e743a1..df5dceb83 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.39] - 2020-09-17
+#### Fixed
+- Fixed issue where linkifying attr may not be set.
+
 ### [1.7.38] - 2020-09-14
 #### Fixed
 - Fixed issues surrounding versioning.

From 5a364e2f76c8d11309a11f99e9404667f55f8f48 Mon Sep 17 00:00:00 2001
From: schmidex <JonasSch@web.de>
Date: Thu, 17 Sep 2020 23:31:50 +0200
Subject: [PATCH 135/256] Update Str.php

---
 src/Support/Str.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Support/Str.php b/src/Support/Str.php
index 0387b4c98..1051b7ece 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -71,7 +71,7 @@ public function truncate($value, $limit = 100, $end = '...')
     public function linkify($text, array $options = [])
     {
         $encoder = new HtmlSpecialcharsEncoder();
-        $highlighter = new HtmlHighlighter('http', Arr::get($options, 'attr'));
+        $highlighter = new HtmlHighlighter('http', Arr::get($options, 'attr', []));
         $urlHighlight = new UrlHighlight(null, $highlighter, $encoder);
         return $urlHighlight->highlightUrls($text);
     }

From 5b244ca2b17da36698155210d92b98726750b14e Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 17 Sep 2020 17:26:55 -0500
Subject: [PATCH 136/256] Update Str.php

---
 src/Support/Str.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Support/Str.php b/src/Support/Str.php
index 0387b4c98..1051b7ece 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -71,7 +71,7 @@ public function truncate($value, $limit = 100, $end = '...')
     public function linkify($text, array $options = [])
     {
         $encoder = new HtmlSpecialcharsEncoder();
-        $highlighter = new HtmlHighlighter('http', Arr::get($options, 'attr'));
+        $highlighter = new HtmlHighlighter('http', Arr::get($options, 'attr', []));
         $urlHighlight = new UrlHighlight(null, $highlighter, $encoder);
         return $urlHighlight->highlightUrls($text);
     }

From 9e3e35c5a3ecbd078a6baf214510979c8ce2cc68 Mon Sep 17 00:00:00 2001
From: Robin Radic <rradic@hotmail.com>
Date: Fri, 18 Sep 2020 02:14:38 +0200
Subject: [PATCH 137/256] added required secondary paramter for the
 MigrateCommand base class constructor to prevent exception `Too few
 arguments`

---
 src/Database/Migration/MigrationServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Database/Migration/MigrationServiceProvider.php b/src/Database/Migration/MigrationServiceProvider.php
index c60e3b56e..3f062f9fc 100644
--- a/src/Database/Migration/MigrationServiceProvider.php
+++ b/src/Database/Migration/MigrationServiceProvider.php
@@ -85,7 +85,7 @@ protected function registerMigrateCommand()
         $this->app->singleton(
             'command.migrate',
             function ($app) {
-                return new MigrateCommand($app['migrator']);
+                return new MigrateCommand($app['migrator'], $app['events']);
             }
         );
     }

From 2e0433640f25c0043956c5e1e9161f033c3ec6d0 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 17 Sep 2020 21:51:05 -0500
Subject: [PATCH 138/256] Fixing issues in Migrator & Repository

---
 docs/en/01.prologue/02.change-log.md          |  4 +++
 src/Addon/AddonProvider.php                   | 25 -------------------
 .../Migration/MigrationRepository.php         |  2 +-
 .../Migration/MigrationServiceProvider.php    |  4 +--
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 7d36534d8..bc682469b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.6] - 2020-09-17
+#### Fixed
+- Fixed issues with the migrator/migration repository.
+
 ### [1.8.5] - 2020-09-17
 #### Fixed
 - Fixed issue where linkifying attr may not be set.
diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index 85259e8fa..63ac5a7bf 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -6,7 +6,6 @@
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Traits\Macroable;
-use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Console\Events\ArtisanStarting;
@@ -53,13 +52,6 @@ class AddonProvider
      */
     protected $router;
 
-    /**
-     * The factory manager.
-     *
-     * @var Factory
-     */
-    protected $factory;
-
     /**
      * The scheduler instance.
      *
@@ -166,8 +158,6 @@ public function register(Addon $addon)
         $this->registerGroupMiddleware($provider);
         $this->registerRouteMiddleware($provider);
 
-        $this->registerFactories($addon);
-
         if (method_exists($provider, 'register')) {
             $this->application->call([$provider, 'register'], ['provider' => $this]);
         }
@@ -234,21 +224,6 @@ function (ArtisanStarting $event) use ($commands) {
         }
     }
 
-    /**
-     * Register the addon commands.
-     *
-     * @param Addon $addon
-     */
-    protected function registerFactories(Addon $addon)
-    {
-        if (
-            (env('APP_ENV') == 'testing' || $this->application->runningInConsole())
-            && is_dir($factories = $addon->getPath('factories'))
-        ) {
-            app(Factory::class)->load($factories);
-        }
-    }
-
     /**
      * Bind class aliases.
      *
diff --git a/src/Database/Migration/MigrationRepository.php b/src/Database/Migration/MigrationRepository.php
index 2d4a7ec2e..cf012e1f2 100644
--- a/src/Database/Migration/MigrationRepository.php
+++ b/src/Database/Migration/MigrationRepository.php
@@ -26,7 +26,7 @@ class MigrationRepository extends DatabaseMigrationRepository
      */
     public function getRan($namespace = null)
     {
-        if ($addon = $this->migrator->getAddon()) {
+        if ($this->migrator && $addon = $this->migrator->getAddon()) {
             return $this->table()
                 ->orderBy('batch', 'asc')
                 ->orderBy('migration', 'asc')
diff --git a/src/Database/Migration/MigrationServiceProvider.php b/src/Database/Migration/MigrationServiceProvider.php
index 3f062f9fc..d8d70bb0d 100644
--- a/src/Database/Migration/MigrationServiceProvider.php
+++ b/src/Database/Migration/MigrationServiceProvider.php
@@ -1,10 +1,10 @@
 <?php namespace Anomaly\Streams\Platform\Database\Migration;
 
+use Anomaly\Streams\Platform\Database\Migration\Console\ResetCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\MigrateCommand;
-use Anomaly\Streams\Platform\Database\Migration\Console\MigrateMakeCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\RefreshCommand;
-use Anomaly\Streams\Platform\Database\Migration\Console\ResetCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\RollbackCommand;
+use Anomaly\Streams\Platform\Database\Migration\Console\MigrateMakeCommand;
 
 /**
  * Class MigrationServiceProvider

From df49ad75f0153716e77dee71ddd1b45c26a32f5f Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 17 Sep 2020 21:56:01 -0500
Subject: [PATCH 139/256] Migrating

---
 src/Addon/FieldType/FieldTypeSchema.php           | 3 +++
 src/Database/Migration/Console/MigrateCommand.php | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/Addon/FieldType/FieldTypeSchema.php b/src/Addon/FieldType/FieldTypeSchema.php
index f62c98a42..5a5d82936 100644
--- a/src/Addon/FieldType/FieldTypeSchema.php
+++ b/src/Addon/FieldType/FieldTypeSchema.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace Anomaly\Streams\Platform\Addon\FieldType;
+
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Fluent;
 use Illuminate\Database\Connection;
diff --git a/src/Database/Migration/Console/MigrateCommand.php b/src/Database/Migration/Console/MigrateCommand.php
index e31ec7a4e..3fca80a86 100644
--- a/src/Database/Migration/Console/MigrateCommand.php
+++ b/src/Database/Migration/Console/MigrateCommand.php
@@ -35,6 +35,7 @@ class MigrateCommand extends \Illuminate\Database\Console\Migrations\MigrateComm
                 {--force : Force the operation to run when in production.}
                 {--path= : The path of migrations files to be executed.}
                 {--realpath : Indicate any provided migration file paths are pre-resolved absolute paths}
+                {--schema-path= : The path to a schema dump file}
                 {--pretend : Dump the SQL queries that would be run.}
                 {--seed : Indicates if the seed task should be re-run.}
                 {--step : Force the migrations to be run so they can be rolled back individually.}

From eb455de7d6a0ebaf194d7c7dbb4c0473dd3d95c6 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 17 Sep 2020 22:03:06 -0500
Subject: [PATCH 140/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index bc682469b..1b7e8021f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -31,6 +31,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ### [1.8.6] - 2020-09-17
 #### Fixed
 - Fixed issues with the migrator/migration repository.
+- Fixed issues with the FieldTypeSchema.
 
 ### [1.8.5] - 2020-09-17
 #### Fixed

From 5bb8c61e4100a810e0aa4eb636d478e0dcfa8fcb Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 23 Sep 2020 01:57:44 -0500
Subject: [PATCH 141/256] Fix empty

---
 docs/en/01.prologue/02.change-log.md      | 4 ++++
 resources/views/form/ajax/layout.twig     | 2 +-
 resources/views/form/partials/layout.twig | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 1b7e8021f..b6e3a70eb 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.7] - 2020-09-23
+#### Fixed
+- Fixed `empty()` calls through presenters `empty` attribute.
+
 ### [1.8.6] - 2020-09-17
 #### Fixed
 - Fixed issues with the migrator/migration repository.
diff --git a/resources/views/form/ajax/layout.twig b/resources/views/form/ajax/layout.twig
index 6c2b50284..36d7ad186 100644
--- a/resources/views/form/ajax/layout.twig
+++ b/resources/views/form/ajax/layout.twig
@@ -1,4 +1,4 @@
-{% if form.fields.empty %}
+{% if form.fields.isEmpty() %}
     <div class="panel">
         <div class="panel-body">
             {{ trans("streams::message.no_fields_available") }}
diff --git a/resources/views/form/partials/layout.twig b/resources/views/form/partials/layout.twig
index 76e7deeb3..3eb76a693 100644
--- a/resources/views/form/partials/layout.twig
+++ b/resources/views/form/partials/layout.twig
@@ -1,4 +1,4 @@
-{% if form.fields.empty %}
+{% if form.fields.isEmpty() %}
 
     <div class="card">
         <div class="card-block card-body">

From 02cabf7732008c8d4ef3af3b5fee754a169e300e Mon Sep 17 00:00:00 2001
From: alxriemann <alxriemann@gmail.com>
Date: Sat, 26 Sep 2020 18:56:47 +0100
Subject: [PATCH 142/256] Update 06.observers.md

---
 docs/en/06.entries/06.observers.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/en/06.entries/06.observers.md b/docs/en/06.entries/06.observers.md
index eb1ef8fd2..f7d747d55 100644
--- a/docs/en/06.entries/06.observers.md
+++ b/docs/en/06.entries/06.observers.md
@@ -83,11 +83,11 @@ public function creating(EntryInterface $entry)
 This event is fired just after the `entry` is created.
  
 ```php
-public function creating(EntryInterface $entry)
+public function created(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::creating($entry);
+    parent::created($entry);
 }
 ```
 
@@ -109,11 +109,11 @@ public function updating(EntryInterface $entry)
 This event is fired just after the `entry` is updated.
  
 ```php
-public function updating(EntryInterface $entry)
+public function updated(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::updating($entry);
+    parent::updated($entry);
 }
 ```
 
@@ -148,11 +148,11 @@ public function saving(EntryInterface $entry)
 This event is fired just after the `entry` is saved.
  
 ```php
-public function saving(EntryInterface $entry)
+public function saved(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::saving($entry);
+    parent::saved($entry);
 }
 ```
 
@@ -174,11 +174,11 @@ public function deleting(EntryInterface $entry)
 This event is fired just after the `entry` is deleted.
  
 ```php
-public function deleting(EntryInterface $entry)
+public function deleted(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::deleting($entry);
+    parent::deleted($entry);
 }
 ```
 
@@ -213,10 +213,10 @@ public function restoring(EntryInterface $entry)
 This event is fired just after the `entry` is restored.
  
 ```php
-public function restoring(EntryInterface $entry)
+public function restored(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::restoring($entry);
+    parent::restored($entry);
 }
 ```

From 40fb4bf2c4e0a040a4c04c42fff9549459328d69 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 28 Sep 2020 22:15:44 -0500
Subject: [PATCH 143/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index b6e3a70eb..66dbd422f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.8] - 2020-09-28
+#### Fixed
+- Fixed `purify` plugin function.
+
 ### [1.8.7] - 2020-09-23
 #### Fixed
 - Fixed `empty()` calls through presenters `empty` attribute.

From 835a1237c3d9763af40a8e4be5e19290f732ca74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 2 Oct 2020 17:34:58 +0700
Subject: [PATCH 144/256] MigrateCommand needs dispacher

---
 src/Artisan/ArtisanServiceProvider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Artisan/ArtisanServiceProvider.php b/src/Artisan/ArtisanServiceProvider.php
index aa4266527..61308166c 100644
--- a/src/Artisan/ArtisanServiceProvider.php
+++ b/src/Artisan/ArtisanServiceProvider.php
@@ -6,6 +6,7 @@
 use Anomaly\Streams\Platform\Database\Migration\Console\ResetCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\RollbackCommand;
 use Anomaly\Streams\Platform\Database\Seeder\Console\SeedCommand;
+use Illuminate\Contracts\Events\Dispatcher;
 
 /**
  * Class StreamsConsoleProvider
@@ -103,7 +104,7 @@ protected function registerMigrateCommand()
         $this->app->singleton(
             'command.migrate',
             function ($app) {
-                return new MigrateCommand($app['migrator']);
+                return new MigrateCommand($app['migrator'], $app[Dispatcher::class]);
             }
         );
     }

From 1949554332cc19b2553e790d046eb99a99ff9106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Fri, 2 Oct 2020 17:35:23 +0700
Subject: [PATCH 145/256] It's already in register now, so it register events
 twice~

---
 src/StreamsEventProvider.php | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/StreamsEventProvider.php b/src/StreamsEventProvider.php
index 61c4e2764..b664150e5 100644
--- a/src/StreamsEventProvider.php
+++ b/src/StreamsEventProvider.php
@@ -64,27 +64,4 @@ class StreamsEventProvider extends EventServiceProvider
             DeleteVersionableHistory::class,
         ],
     ];
-
-    /**
-     * Register the application's event listeners.
-     */
-    public function boot()
-    {
-        foreach ($this->listen as $event => $listeners) {
-            foreach ($listeners as $key => $listener) {
-                if (is_integer($listener)) {
-                    $listener = $key;
-                    $priority = $listener;
-                } else {
-                    $priority = 0;
-                }
-
-                app('events')->listen($event, $listener, $priority);
-            }
-        }
-
-        foreach ($this->subscribe as $subscriber) {
-            app('events')->subscribe($subscriber);
-        }
-    }
 }

From 5ad0dc4a7ea7cd319777024e0f6c6f0786203a43 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Sat, 3 Oct 2020 08:25:17 -0500
Subject: [PATCH 146/256] Build the control panel if it's not already built

---
 docs/en/01.prologue/02.change-log.md              | 4 ++++
 src/Ui/ControlPanel/Listener/LoadControlPanel.php | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index b95f59bd1..c7c544d8f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.6.195] - 2020-10-03
+#### Fixed
+- Fixed issue where the control panel may build more than once.
+
 ### [1.6.194] - 2020-09-09
 #### Added
 - Added ability to set filter value and active state for manual filter manipulation.
diff --git a/src/Ui/ControlPanel/Listener/LoadControlPanel.php b/src/Ui/ControlPanel/Listener/LoadControlPanel.php
index d8d7f0e30..3c82ddbd7 100644
--- a/src/Ui/ControlPanel/Listener/LoadControlPanel.php
+++ b/src/Ui/ControlPanel/Listener/LoadControlPanel.php
@@ -79,6 +79,8 @@ public function handle()
             return;
         }
 
-        $this->template->put('cp', $this->controlPanel->build());
+        if (!$this->template->has('cp')) {
+            $this->template->put('cp', $this->controlPanel->build());
+        }
     }
 }

From 413f3012a932b0a3ea78144a65ef5df097d8e344 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Sat, 3 Oct 2020 21:52:30 -0500
Subject: [PATCH 147/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 66dbd422f..f82a3d92c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.9] - 2020-10-03
+#### Fixed
+- Fixed issue where Control Panel may build more than once.
+
 ### [1.8.8] - 2020-09-28
 #### Fixed
 - Fixed `purify` plugin function.

From e5053ea72ba34ac60b4fcfab0cb373c7efb5a0ef Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 12 Oct 2020 16:21:57 -0500
Subject: [PATCH 148/256] Added ability to control table form URLs.

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 resources/views/table/table.twig     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 2f2908008..40235b4a8 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.41] - 2020-10-12
+#### Added
+- Added the ability to define the `url` option for table forms.
+
 ### [1.7.40] - 2020-10-03
 #### Fixed
 - Fixed issue where the control panel may build more than once.
diff --git a/resources/views/table/table.twig b/resources/views/table/table.twig
index b949c6ac8..a2b15ae7d 100644
--- a/resources/views/table/table.twig
+++ b/resources/views/table/table.twig
@@ -19,7 +19,7 @@
         {% block card %}
             <div class="card">
 
-                {{ form_open({ 'url': url_full() }) }}
+                {{ form_open({ 'url': table.options.url ?: url_full() }) }}
                 <div class="table-stack">
                     <table
                             class="

From ba3944811564fe2c71c6393ec0e2b36201856305 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 12 Oct 2020 16:33:05 -0500
Subject: [PATCH 149/256] Update the standard table as well.

---
 resources/views/table/partials/body.twig   | 2 +-
 resources/views/table/partials/header.twig | 2 +-
 resources/views/table/standard.twig        | 2 +-
 resources/views/table/table.twig           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/table/partials/body.twig b/resources/views/table/partials/body.twig
index 5954abae8..94c730220 100644
--- a/resources/views/table/partials/body.twig
+++ b/resources/views/table/partials/body.twig
@@ -9,7 +9,7 @@
             </td>
         {% endif %}
 
-        {% if not table.actions.empty() %}
+        {% if not table.actions.empty() and table.options.disable_checkboxes != true %}
             <td>
                 <input type="checkbox" data-toggle="action" name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/>
             </td>
diff --git a/resources/views/table/partials/header.twig b/resources/views/table/partials/header.twig
index 218000a3e..a2d209ff8 100644
--- a/resources/views/table/partials/header.twig
+++ b/resources/views/table/partials/header.twig
@@ -5,7 +5,7 @@
         <th style="width: 30px;">&nbsp;</th>
     {% endif %}
 
-    {% if not table.actions.empty() %}
+    {% if not table.actions.empty() and table.options.disable_checkboxes != true %}
         <th style="width: 30px;">
             <input data-toggle="all" type="checkbox">
         </th>
diff --git a/resources/views/table/standard.twig b/resources/views/table/standard.twig
index b1ba54e81..2648d007d 100644
--- a/resources/views/table/standard.twig
+++ b/resources/views/table/standard.twig
@@ -14,7 +14,7 @@
 {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
 {% if not table.rows.empty() %}
-    {{ form_open({ 'url': url_full() }) }}
+    {{ form_open({ 'url': table.optoins.url ?: url_full() }) }}
     <div class="table-stack">
         <table
                 class="
diff --git a/resources/views/table/table.twig b/resources/views/table/table.twig
index a2b15ae7d..e56141034 100644
--- a/resources/views/table/table.twig
+++ b/resources/views/table/table.twig
@@ -18,7 +18,7 @@
     {% if not table.rows.empty() %}
         {% block card %}
             <div class="card">
-
+{{dd(table.options)}}
                 {{ form_open({ 'url': table.options.url ?: url_full() }) }}
                 <div class="table-stack">
                     <table

From 28291ce44522a940c96aeece679c66bc985e87da Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 12 Oct 2020 16:36:03 -0500
Subject: [PATCH 150/256] Correction

---
 resources/views/table/standard.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/table/standard.twig b/resources/views/table/standard.twig
index 2648d007d..262cf0e7a 100644
--- a/resources/views/table/standard.twig
+++ b/resources/views/table/standard.twig
@@ -14,7 +14,7 @@
 {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
 {% if not table.rows.empty() %}
-    {{ form_open({ 'url': table.optoins.url ?: url_full() }) }}
+    {{ form_open({ 'url': table.options.url ?: url_full() }) }}
     <div class="table-stack">
         <table
                 class="

From a8bb145c855123dee375417ccbe0344eec3c8387 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 13 Oct 2020 16:55:02 -0500
Subject: [PATCH 151/256] Oops

---
 resources/views/table/partials/header.twig | 36 ----------------------
 resources/views/table/table.twig           |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/resources/views/table/partials/header.twig b/resources/views/table/partials/header.twig
index a2d209ff8..e69de29bb 100644
--- a/resources/views/table/partials/header.twig
+++ b/resources/views/table/partials/header.twig
@@ -1,36 +0,0 @@
-<thead class="{{ table.options.header_class }}">
-<tr>
-
-    {% if table.options.sortable %}
-        <th style="width: 30px;">&nbsp;</th>
-    {% endif %}
-
-    {% if not table.actions.empty() and table.options.disable_checkboxes != true %}
-        <th style="width: 30px;">
-            <input data-toggle="all" type="checkbox">
-        </th>
-    {% endif %}
-
-    {% for header in table.headers %}
-        <th>
-            {% if header.sortable %}
-
-                {{ html_link(url_current() ~ '?' ~ header.getQueryString(), trans(header.heading), {'class': 'ajax'}) }}
-
-                {% if header.direction == 'asc' %}
-                    {{ icon('sort-ascending', 'text-muted') }}
-                {% elseif header.direction == 'desc' %}
-                    {{ icon('sort-descending', 'text-muted') }}
-                {% else %}
-                    {{ icon('sortable', 'text-muted') }}
-                {% endif %}
-
-            {% else %}
-                {{ trans(header.heading)|raw }}
-            {% endif %}
-        </th>
-    {% endfor %}
-
-    <th class="buttons">&nbsp;</th>
-</tr>
-</thead>
diff --git a/resources/views/table/table.twig b/resources/views/table/table.twig
index e56141034..a2b15ae7d 100644
--- a/resources/views/table/table.twig
+++ b/resources/views/table/table.twig
@@ -18,7 +18,7 @@
     {% if not table.rows.empty() %}
         {% block card %}
             <div class="card">
-{{dd(table.options)}}
+
                 {{ form_open({ 'url': table.options.url ?: url_full() }) }}
                 <div class="table-stack">
                     <table

From 8b2bc765b74358fadb2b2ee25ebf6f1b5942b4f4 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 14 Oct 2020 16:03:23 -0500
Subject: [PATCH 152/256] Skip these tests because we should not touch the
 file.

---
 tests/Unit/Application/Command/ReloadEnvironmentFileTest.php | 4 ++++
 tests/Unit/Application/Command/WriteEnvironmentFileTest.php  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php b/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php
index 5bafec684..15a35cf01 100644
--- a/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php
+++ b/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php
@@ -7,6 +7,10 @@ class ReloadEnvironmentFileTest extends TestCase
 
     public function testCanReadEnvironmentFile()
     {
+        $this->markTestSkipped('We should not be touching the file.');
+
+        return;
+        
         $this->dispatchNow(
             new \Anomaly\Streams\Platform\Application\Command\WriteEnvironmentFile(
                 array_merge(
diff --git a/tests/Unit/Application/Command/WriteEnvironmentFileTest.php b/tests/Unit/Application/Command/WriteEnvironmentFileTest.php
index 0e5f45163..252a738c8 100644
--- a/tests/Unit/Application/Command/WriteEnvironmentFileTest.php
+++ b/tests/Unit/Application/Command/WriteEnvironmentFileTest.php
@@ -7,6 +7,10 @@ class WriteEnvironmentFileTest extends TestCase
 
     public function testCanWriteEnvironmentFile()
     {
+        $this->markTestSkipped('We should not be touching the file.');
+
+        return;
+        
         $this->dispatchNow(
             new \Anomaly\Streams\Platform\Application\Command\WriteEnvironmentFile(
                 array_merge(

From f503a3a4d8b0c3afb8063a72816e256754b203df Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 14 Oct 2020 16:05:27 -0500
Subject: [PATCH 153/256] Docs

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 40235b4a8..bdc455be8 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.7.41] - 2020-10-12
+#### Remove
+- Removed tests where environment file is touched.
+
 ### [1.7.41] - 2020-10-12
 #### Added
 - Added the ability to define the `url` option for table forms.

From 9e837ff92fdf4bc358dd62644cb24d876de9cad0 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 14 Oct 2020 16:14:28 -0500
Subject: [PATCH 154/256] Docs

---
 docs/en/01.prologue/02.change-log.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index bdc455be8..013eeea62 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,9 +28,9 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.7.41] - 2020-10-12
+### [1.7.42] - 2020-10-12
 #### Remove
-- Removed tests where environment file is touched.
+- Skip PHPUnit tests where environment file is touched.
 
 ### [1.7.41] - 2020-10-12
 #### Added

From 84b9e1b26ff27ea1a2c4f3c4a24100cad8c31303 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 14 Oct 2020 17:15:54 -0500
Subject: [PATCH 155/256] Fix issue with route parameters required.

---
 src/Field/Form/FieldFormButtons.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Field/Form/FieldFormButtons.php b/src/Field/Form/FieldFormButtons.php
index 5e64ecdac..44d427af7 100644
--- a/src/Field/Form/FieldFormButtons.php
+++ b/src/Field/Form/FieldFormButtons.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Field\Form;
+<?php
+
+namespace Anomaly\Streams\Platform\Field\Form;
 
 use Anomaly\Streams\Platform\Addon\Module\ModuleCollection;
 use Anomaly\Streams\Platform\Routing\UrlGenerator;
@@ -28,6 +30,10 @@ public function handle(FieldFormBuilder $builder, ModuleCollection $modules, Rou
         $field  = $builder->getFormEntry();
         $type   = $field->getType();
 
+        $enabled = $builder->getFormMode() == 'edit'
+            && $module
+            && $url->hasRoute($module->getNamespace('fields.change'));
+
         $builder->setButtons(
             [
                 'cancel',
@@ -36,13 +42,11 @@ public function handle(FieldFormBuilder $builder, ModuleCollection $modules, Rou
                     'data-target' => '#modal',
                     'disabled'    => $builder->getFormMode() == 'edit'
                         && !$type->getColumnType(),
-                    'enabled'     => $builder->getFormMode() == 'edit'
-                        && $module
-                        && $url->hasRoute($module->getNamespace('fields.change')),
-                    'href'        => $url->route(
+                    'enabled'     => $enabled,
+                    'href'        => $enabled ? $url->route(
                         $module->getNamespace('fields.change'),
                         ['id' => $route->parameter('id')]
-                    ),
+                    ) : '#',
                 ],
             ]
         );

From f4a3c229c9660b27c2705ac1e8e7ef364c9e729f Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Wed, 14 Oct 2020 17:19:44 -0500
Subject: [PATCH 156/256] Fix issue with route parameters required.

---
 docs/en/01.prologue/02.change-log.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index fafb65973..f98f5aaab 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.11] - 2020-10-14
+#### Fixed
+- Fix issue with route parameters required.
+
+
 ### [1.8.10] - 2020-10-14
 #### Added
 - Added `url` to table options for form action URL control.
@@ -35,10 +40,12 @@ Features that are deprecated will generally be removed in the next `minor` updat
 #### Remove
 - Skip PHPUnit tests where environment file is touched.
 
+
 ### [1.8.9] - 2020-10-03
 #### Fixed
 - Fixed issue where Control Panel may build more than once.
 
+
 ### [1.8.8] - 2020-09-28
 #### Fixed
 - Fixed `purify` plugin function.

From f19d2dc9cfd41124792f740aaa3e13f4d858e264 Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Wed, 21 Oct 2020 15:53:33 +0300
Subject: [PATCH 157/256] fixed count params for turkish translations

---
 resources/lang/tr/message.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/tr/message.php b/resources/lang/tr/message.php
index f6a2a2b5c..197c623d9 100644
--- a/resources/lang/tr/message.php
+++ b/resources/lang/tr/message.php
@@ -10,8 +10,8 @@
     'access_denied'             => 'Erişim reddedildi.',
     'no_fields_available'       => 'Alan yok',
     'delete_restrict'           => 'Silinemiyor: ad sınırlı olduğundan adı. Önce ilgili ": ilişki" yi silin.',
-    'delete_success'            => ': count satır (lar) başarıyla silindi.',
-    'reorder_success'           => ': count satır (lar) başarıyla yeniden sıralandı.',
+    'delete_success'            => ':count satır başarıyla silindi.',
+    'reorder_success'           => ':count satır başarıyla yeniden sıralandı.',
     'csrf_token_mismatch'       => 'Güvenlik simgenizin süresi doldu. Lütfen formu tekrar gönderin.',
     'form_expired'              => 'Formun süresi doldu. Lütfen tekrar deneyin.',
     'create_success'            => ':name başarıyla oluşturuldu.',

From ebeb52432a0b41bcedc3be7aaefbdd34bd9b2f03 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Sun, 25 Oct 2020 23:01:54 -0500
Subject: [PATCH 158/256] 2.0 assistance

---
 docs/en/01.prologue/02.change-log.md |  5 +++++
 src/Http/Kernel.php                  | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f98f5aaab..6cf2ba1c7 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### Unreleased
+#### Added
+- Added `addMiddlewareGroup($group, $middleware = []);` to the HTTP kernel.
+
+
 ### [1.8.11] - 2020-10-14
 #### Fixed
 - Fix issue with route parameters required.
diff --git a/src/Http/Kernel.php b/src/Http/Kernel.php
index 7b351fad7..fd9237943 100644
--- a/src/Http/Kernel.php
+++ b/src/Http/Kernel.php
@@ -97,6 +97,19 @@ public function __construct(Application $app, Router $router)
         parent::__construct($app, $router);
     }
 
+    /**
+     * Add a middleware group and sync.
+     *
+     * @param $group
+     * @param array $middleware
+     */
+    public function addMiddlewareGroup($group, $middleware = []) {
+        
+        $this->middlewareGroups[$group] = $middleware;
+
+        $this->syncMiddlewareToRouter();
+    }
+
     /**
      * Send the request through the router.
      *

From ea5292c3f0b2e2ae08e36070b3bc02fe573f215b Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Mon, 26 Oct 2020 17:10:27 +1100
Subject: [PATCH 159/256] Use testing env for application reference instead of
 hardcode

---
 tests/Unit/Asset/AssetTest.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/Unit/Asset/AssetTest.php b/tests/Unit/Asset/AssetTest.php
index d14464f18..6d55dfcae 100644
--- a/tests/Unit/Asset/AssetTest.php
+++ b/tests/Unit/Asset/AssetTest.php
@@ -44,7 +44,7 @@ public function testUrl()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            url('app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js'),
+            url('app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js'),
             $asset->url('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -55,7 +55,7 @@ public function testPath()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
+            '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
             $asset->path('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -66,7 +66,7 @@ public function testAsset()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
+            '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
             $asset->asset('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -77,7 +77,7 @@ public function testScript()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '<script foo="bar" src="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
+            '<script foo="bar" src="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
             $asset->script('anomaly.module.test::scripts/test.js', ['noversion'], ['foo' => 'bar'])
         );
     }
@@ -88,7 +88,7 @@ public function testStyle()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
+            '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
             $asset->style('anomaly.module.test::styles/test.css', ['noversion'], ['foo' => 'bar'])
         );
     }
@@ -103,8 +103,8 @@ public function testScripts()
 
         $this->assertEquals(
             [
-                '<script foo="bar" src="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
-                '<script foo="bar" src="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test2.js"></script>',
+                '<script foo="bar" src="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
+                '<script foo="bar" src="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test2.js"></script>',
             ],
             $asset->scripts('test.js', ['noversion'], ['foo' => 'bar'])
         );
@@ -120,8 +120,8 @@ public function testStyles()
 
         $this->assertEquals(
             [
-                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
-                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css">',
+                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
+                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css">',
             ],
             $asset->styles('test.css', ['noversion'], ['foo' => 'bar'])
         );
@@ -137,8 +137,8 @@ public function testPaths()
 
         $this->assertEquals(
             [
-                '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css',
-                '/app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css',
+                '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css',
+                '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css',
             ],
             $asset->paths('test.css', ['noversion'], ['foo' => 'bar'])
         );
@@ -155,10 +155,10 @@ public function testUrls()
         $this->assertEquals(
             [
                 url(
-                    'app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'
+                    'app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'
                 ),
                 url(
-                    'app/default/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css'
+                    'app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css'
                 ),
             ],
             $asset->urls('test.css', ['noversion'])

From 437ea4258fbefa8e25643e990760321d9626088a Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Thu, 29 Oct 2020 13:55:13 +1100
Subject: [PATCH 160/256] reinit view composer on each test run

---
 src/View/ViewComposer.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/View/ViewComposer.php b/src/View/ViewComposer.php
index 326a902e6..27f5d5a46 100644
--- a/src/View/ViewComposer.php
+++ b/src/View/ViewComposer.php
@@ -144,7 +144,8 @@ function (&$value) {
 
         if (!$this->theme || !env('INSTALLED')) {
 
-            if (!self::$loaded && self::$loaded = true) {
+            // ensure we re-view compose on every testing run.
+            if ((!self::$loaded && self::$loaded = true) || env('APP_ENV') === 'testing') {
                 /* @deprecated since 1.6; this is no longer needed for every view. */
                 event(new ViewComposed($view));
             }
@@ -154,7 +155,8 @@ function (&$value) {
 
         $this->setPath($view);
 
-        if (!self::$loaded && self::$loaded = true) {
+        // ensure we re-view compose on every testing run.
+        if ((!self::$loaded && self::$loaded = true) || env('APP_ENV') === 'testing') {
             /* @deprecated since 1.6; this is no longer needed for every view. */
             event(new ViewComposed($view));
         }

From 57ace202fd60806f21ce727d0367ab95942dea04 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Thu, 29 Oct 2020 16:47:21 +1100
Subject: [PATCH 161/256] Update changelog

---
 docs/en/01.prologue/02.change-log.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 6cf2ba1c7..b009a962b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,10 +28,13 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### Unreleased
+### [1.8.12] - 2020-10-29
 #### Added
 - Added `addMiddlewareGroup($group, $middleware = []);` to the HTTP kernel.
 
+#### Fixed
+- Fix issue with asset paths being hardcoded in testing.
+- Fix issue with ViewComposer not refreshing between tests.
 
 ### [1.8.11] - 2020-10-14
 #### Fixed

From 050d017d6c3e252a84862eccf8b7cc5545679b31 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Fri, 30 Oct 2020 15:16:17 +1100
Subject: [PATCH 162/256] Check for an existing addon parameter before setting
 it

---
 docs/en/01.prologue/02.change-log.md |  4 ++++
 src/Addon/AddonProvider.php          | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index b009a962b..d010bbf09 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.13] - 2020-10-30
+#### Fixed
+- Fix issue where addon parameter was overridden even if it was set on route.
+
 ### [1.8.12] - 2020-10-29
 #### Added
 - Added `addMiddlewareGroup($group, $middleware = []);` to the HTTP kernel.
diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index 63ac5a7bf..b2a9c1151 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -333,7 +333,10 @@ protected function registerRoutes(AddonServiceProvider $provider, Addon $addon)
             $middleware  = array_pull($route, 'middleware', []);
             $constraints = array_pull($route, 'constraints', []);
 
-            array_set($route, 'streams::addon', $addon->getNamespace());
+
+            if (!isset($route['streams::addon'])) {
+                array_set($route, 'streams::addon', $addon->getNamespace());
+            }
 
             if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                 $this->router->resource($uri, $route['uses']);
@@ -393,7 +396,10 @@ function (Router $router) use ($routes, $addon) {
                     $middleware  = array_pull($route, 'middleware', []);
                     $constraints = array_pull($route, 'constraints', []);
 
-                    array_set($route, 'streams::addon', $addon->getNamespace());
+
+                    if (!isset($route['streams::addon'])) {
+                        array_set($route, 'streams::addon', $addon->getNamespace());
+                    }
 
                     if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                         $router->resource($uri, $route['uses']);

From d5347b332e393b058ae54a4e37993a07cd722fc6 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Tue, 10 Nov 2020 22:16:59 -0600
Subject: [PATCH 163/256] Admin flag

---
 src/Addon/AddonManager.php     | 11 ++++++-----
 src/StreamsServiceProvider.php | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 3130bdaac..8020eb905 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -1,9 +1,10 @@
 <?php namespace Anomaly\Streams\Platform\Addon;
 
-use Anomaly\Streams\Platform\Addon\Event\AddonsHaveRegistered;
-use Anomaly\Streams\Platform\Addon\Extension\ExtensionModel;
-use Anomaly\Streams\Platform\Addon\Module\ModuleModel;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Addon\Module\ModuleModel;
+use Anomaly\Streams\Platform\Addon\Extension\ExtensionModel;
+use Anomaly\Streams\Platform\Addon\Event\AddonsHaveRegistered;
 
 /**
  * Class AddonManager
@@ -202,7 +203,7 @@ function () use ($installed) {
      */
     protected function getEnabledAddonNamespaces()
     {
-        if (!env('INSTALLED')) {
+        if (!env('INSTALLED') || (env('INSTALLED') === 'admin' && Request::segment(1) !== 'admin')) {
             return [];
         }
 
@@ -247,7 +248,7 @@ function () {
      */
     protected function getInstalledAddonNamespaces()
     {
-        if (!env('INSTALLED')) {
+        if (!env('INSTALLED') || (env('INSTALLED') === 'admin' && Request::segment(1) !== 'admin')) {
             return [];
         }
 
diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index a370dc764..381c84d4d 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -47,6 +47,7 @@
 use Anomaly\Streams\Platform\Application\Command\ConfigureFileCacheStore;
 use Anomaly\Streams\Platform\Application\Command\LoadEnvironmentOverrides;
 use Anomaly\Streams\Platform\Application\Command\LoadStreamsConfiguration;
+use Illuminate\Support\Facades\Request;
 
 /**
  * Class StreamsServiceProvider
@@ -194,6 +195,14 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public function boot(Dispatcher $events)
     {
+        /**
+         * If the admin is needed only
+         * then we don't even register.
+         */
+        if (env('INSTALLED') === 'admin' && Request::segment(1) !== 'admin') {
+            return;
+        }
+        
         $events->dispatch(new Booting());
 
         // Next take care of core utilities.
@@ -317,6 +326,14 @@ function (RegisteringTwigPlugins $event) {
     public function register()
     {
 
+        /**
+         * If the admin is needed only
+         * then we don't even register.
+         */
+        if (env('INSTALLED') === 'admin' && Request::segment(1) !== 'admin') {
+            return;
+        }
+
         /**
          * When config is cached by Laravel we
          * end up oddly not loading .env data.

From 1947399273d36d5e80c28f843de27f52b36ef384 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Sun, 15 Nov 2020 23:37:35 -0600
Subject: [PATCH 164/256] Admin

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index d010bbf09..3e43a3f0e 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [Unreleased]
+#### Added
+- Added support for `INSTALLED=admin` flag for "beheading" PyroCMS.
+
 ### [1.8.13] - 2020-10-30
 #### Fixed
 - Fix issue where addon parameter was overridden even if it was set on route.

From 627ac18e5a0400870fe91442c0a0106fdfcf5b1c Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 16 Nov 2020 00:05:48 -0600
Subject: [PATCH 165/256] Omit if admin only

---
 src/Addon/AddonManager.php     |  4 ++--
 src/StreamsServiceProvider.php | 24 +++++++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 3130bdaac..05227fbdf 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -202,7 +202,7 @@ function () use ($installed) {
      */
     protected function getEnabledAddonNamespaces()
     {
-        if (!env('INSTALLED')) {
+        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
             return [];
         }
 
@@ -247,7 +247,7 @@ function () {
      */
     protected function getInstalledAddonNamespaces()
     {
-        if (!env('INSTALLED')) {
+        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
             return [];
         }
 
diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index a370dc764..746fafb04 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -194,12 +194,21 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public function boot(Dispatcher $events)
     {
+        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
+
+            $this->dispatchNow(new SetCoreConnection());
+            $this->dispatchNow(new AutoloadEntryModels());
+            $this->dispatchNow(new InitializeApplication());
+
+            return;
+        }
+
         $events->dispatch(new Booting());
 
         // Next take care of core utilities.
         $this->dispatchNow(new SetCoreConnection());
         $this->dispatchNow(new ConfigureUriValidator());
-        $this->dispatchNow(new InitializeApplication()); // 24
+        $this->dispatchNow(new InitializeApplication());
 
         // Load application specific .env file.
         $this->dispatchNow(new LoadEnvironmentOverrides());
@@ -317,6 +326,19 @@ function (RegisteringTwigPlugins $event) {
     public function register()
     {
 
+        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
+
+            /**
+             * Fallback to database users.
+             */
+            config([
+                'auth.providers.users.driver' => 'database',
+                'auth.providers.users.table' => 'users_users',
+            ]);
+
+            return;
+        }
+
         /**
          * When config is cached by Laravel we
          * end up oddly not loading .env data.

From 808f6e0ba15901fcfccd232e902dbbfe5c33410b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Wed, 18 Nov 2020 23:03:36 +0700
Subject: [PATCH 166/256] Fixed isInstalled on non .env environment (docker,
 etc)

---
 src/Application/Application.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Application/Application.php b/src/Application/Application.php
index e28b512cb..d64058dc7 100644
--- a/src/Application/Application.php
+++ b/src/Application/Application.php
@@ -202,7 +202,7 @@ public function isEnabled()
     public function isInstalled()
     {
         if (is_null($this->installed)) {
-            $this->installed = file_exists(base_path('.env'));
+            $this->installed = env('INSTALLED');
         }
 
         return $this->installed;

From 39dc8ba9b486cda8f589e12e82683e64c8e0a023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Wed, 18 Nov 2020 23:07:20 +0700
Subject: [PATCH 167/256] Application setup should be done even on
 non-installed app (e.g artisan build if storage was deleted)

---
 src/Application/Command/InitializeApplication.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Application/Command/InitializeApplication.php b/src/Application/Command/InitializeApplication.php
index b0a327801..bd55efeea 100644
--- a/src/Application/Command/InitializeApplication.php
+++ b/src/Application/Command/InitializeApplication.php
@@ -65,27 +65,24 @@ function () use ($laravel) {
          * then locate the application and
          * initialize.
          */
-        if ($application->isInstalled()) {
+        if (env('DB_CONNECTION', env('DB_DRIVER'))) {
 
-            if (env('DB_CONNECTION', env('DB_DRIVER'))) {
+            try {
 
-                try {
+                $application->setup();
 
+                if ($application->isInstalled()) {
                     if (PHP_SAPI != 'cli') {
                         $application->locate();
                     }
 
-                    $application->setup();
-
                     if (!$application->isEnabled()) {
                         abort(503);
                     }
-                } catch (\Exception $e) {
-                    // Do nothing.
                 }
+            } catch (\Exception $e) {
+                // Do nothing.
             }
-
-            return;
         }
     }
 }

From 37084bd45fecf15f58d16bd4d0e7f5eeaabda721 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Wed, 18 Nov 2020 16:44:29 -0600
Subject: [PATCH 168/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 3e43a3f0e..2aadec56b 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,9 +28,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [Unreleased]
+### [1.8.14] - 2020-11-18
 #### Added
 - Added support for `INSTALLED=admin` flag for "beheading" PyroCMS.
+#### Changed
+- Changed logic for detecting if looking up an application is safe.
 
 ### [1.8.13] - 2020-10-30
 #### Fixed

From a41db5a6e24091d3ce6695d705df1c795b2e877a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 19 Nov 2020 00:21:39 -0600
Subject: [PATCH 169/256] Correct issue in installer

---
 src/Addon/AddonManager.php                        |  8 +++++---
 src/Application/Command/InitializeApplication.php |  2 +-
 src/StreamsServiceProvider.php                    | 13 ++-----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 276097e7a..8739d93e5 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Addon;
+<?php
+
+namespace Anomaly\Streams\Platform\Addon;
 
 use Illuminate\Support\Facades\Request;
 use Illuminate\Contracts\Container\Container;
@@ -203,7 +205,7 @@ function () use ($installed) {
      */
     protected function getEnabledAddonNamespaces()
     {
-        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
+        if (!env('INSTALLED') || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
             return [];
         }
 
@@ -248,7 +250,7 @@ function () {
      */
     protected function getInstalledAddonNamespaces()
     {
-        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
+        if (!env('INSTALLED') || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
             return [];
         }
 
diff --git a/src/Application/Command/InitializeApplication.php b/src/Application/Command/InitializeApplication.php
index bd55efeea..922559dce 100644
--- a/src/Application/Command/InitializeApplication.php
+++ b/src/Application/Command/InitializeApplication.php
@@ -70,7 +70,7 @@ function () use ($laravel) {
             try {
 
                 $application->setup();
-
+                
                 if ($application->isInstalled()) {
                     if (PHP_SAPI != 'cli') {
                         $application->locate();
diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index 3de1c6703..69f14fddb 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -195,7 +195,7 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public function boot(Dispatcher $events)
     {
-        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
+        if (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin') {
 
             $this->dispatchNow(new SetCoreConnection());
             $this->dispatchNow(new AutoloadEntryModels());
@@ -326,8 +326,7 @@ function (RegisteringTwigPlugins $event) {
      */
     public function register()
     {
-
-        if (!env('INSTALLED') || (!IS_ADMIN && env('INSTALLED') === 'admin')) {
+        if (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin') {
 
             /**
              * Fallback to database users.
@@ -340,14 +339,6 @@ public function register()
             return;
         }
 
-        /**
-         * If the admin is needed only
-         * then we don't even register.
-         */
-        if (env('INSTALLED') === 'admin' && Request::segment(1) !== 'admin') {
-            return;
-        }
-
         /**
          * When config is cached by Laravel we
          * end up oddly not loading .env data.

From a5b038ee94b90cee15d824e60f836b597cfcb895 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Tue, 24 Nov 2020 13:12:25 +1100
Subject: [PATCH 170/256] Fix issue with theme config targeting non-existent
 default theme

---
 docs/en/01.prologue/02.change-log.md     |  4 ++++
 docs/en/03.reference/11.configuration.md | 12 ++++++------
 resources/config/themes.php              |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 2aadec56b..c589fb449 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.15] - 2020-11-24
+### Fixed
+- Fixed issue with theme config targeting non-existent default theme.
+
 ### [1.8.14] - 2020-11-18
 #### Added
 - Added support for `INSTALLED=admin` flag for "beheading" PyroCMS.
diff --git a/docs/en/03.reference/11.configuration.md b/docs/en/03.reference/11.configuration.md
index 99ccb191e..c253cb35f 100644
--- a/docs/en/03.reference/11.configuration.md
+++ b/docs/en/03.reference/11.configuration.md
@@ -819,15 +819,15 @@ LOCKING_ENABLED=true
 Specify the default `admin` theme.
 
 ```php
-'admin' => env('ADMIN_THEME', 'anomaly.theme.anomaly'),
+'admin' => env('ADMIN_THEME', 'pyrocms.theme.accelerant'),
 ```
 
 ```php
-config(['streams::themes.admin' => 'anomaly.theme.anomaly');
+config(['streams::themes.admin' => 'pyrocms.theme.accelerant');
 ```
 
 ```bash
-ADMIN_THEME=anomaly.theme.anomaly
+ADMIN_THEME=pyrocms.theme.accelerant
 ```
 
 ### Standard
@@ -835,13 +835,13 @@ ADMIN_THEME=anomaly.theme.anomaly
 Specify the default `standard` (public facing) theme.
 
 ```php
-'standard' => env('STANDARD_THEME', 'anomaly.theme.starter'),
+'standard' => env('STANDARD_THEME', 'pyrocms.theme.starter'),
 ```
 
 ```php
-config(['streams::themes.standard' => 'anomaly.theme.starter');
+config(['streams::themes.standard' => 'pyrocms.theme.starter');
 ```
 
 ```bash
-STANDARD_THEME=anomaly.theme.starter
+STANDARD_THEME=pyrocms.theme.starter
 ```
diff --git a/resources/config/themes.php b/resources/config/themes.php
index 430b73ff8..7de1cb15c 100644
--- a/resources/config/themes.php
+++ b/resources/config/themes.php
@@ -11,6 +11,6 @@
     |
     */
 
-    'admin'    => env('ADMIN_THEME', 'anomaly.theme.anomaly'),
-    'standard' => env('STANDARD_THEME', 'anomaly.theme.starter')
+    'admin'    => env('ADMIN_THEME', 'pyrocms.theme.accelerant'),
+    'standard' => env('STANDARD_THEME', 'pyrocms.theme.starter')
 ];

From 471046d7beff4ca2266dffce22d917797a8dcf18 Mon Sep 17 00:00:00 2001
From: schmidex <JonasSch@web.de>
Date: Sun, 29 Nov 2020 11:24:47 +0100
Subject: [PATCH 171/256] fix: Required parameter/optional parameter

Required parameter $view follows optional parameter $extension
---
 src/View/Twig/Loader.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/View/Twig/Loader.php b/src/View/Twig/Loader.php
index 4f397cd28..b4f7872cb 100644
--- a/src/View/Twig/Loader.php
+++ b/src/View/Twig/Loader.php
@@ -132,13 +132,13 @@ class Loader extends OriginalLoader
     public function __construct(
         Filesystem $files,
         ViewFinderInterface $finder,
-        $extension = 'twig',
         Factory $view,
         Mobile_Detect $agent,
         AddonCollection $addons,
         ViewOverrides $overrides,
         Request $request,
-        ViewMobileOverrides $mobiles
+        ViewMobileOverrides $mobiles,
+        $extension = 'twig'
     ) {
         $this->view      = $view;
         $this->agent     = $agent;

From ab6cfabb583e86a1a53283b69900cb2691be6f30 Mon Sep 17 00:00:00 2001
From: Craig Berry <hi@craigberry.co>
Date: Tue, 1 Dec 2020 17:50:41 +1100
Subject: [PATCH 172/256] Fix twig lexer

Reintroduced lexer switch, fixing issue with id selectors being interpreted as twig comments.
---
 docs/en/01.prologue/02.change-log.md |  4 ++++
 src/Asset/Asset.php                  | 14 ++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index c589fb449..579b9ee23 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.16] - 2020-12-01
+### Fixed
+- Reintroduced lexer switch, fixing issue with id selectors being interpreted as twig comments.
+
 ### [1.8.15] - 2020-11-24
 ### Fixed
 - Fixed issue with theme config targeting non-existent default theme.
diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index cb4741bac..f26199ad2 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -565,6 +565,14 @@ protected function publish($path, $collection, $additionalFilters)
          * Parse the content. Always parse CSS.
          */
         if (in_array('parse', $filters) || $hint == 'css') {
+            $twig = resolve('twig');
+
+            $twig->setLexer(
+                new \Twig_Lexer($twig, [
+                    'tag_comment' => ['{^', '^}']
+                ])
+            );
+            
             try {
                 $contents = (string) render($contents);
             } catch (\Exception $e) {
@@ -575,6 +583,12 @@ protected function publish($path, $collection, $additionalFilters)
 
                 \Log::error($e->getMessage());
             }
+
+            $twig->setLexer(
+                new \Twig_Lexer($twig, [
+                    'tag_comment' => ['{#', '#}']
+                ])
+            );
         }
 
         if (in_array('min', $filters) && $hint == 'css') {

From a88d8197054171aab4f744efe7687f8392f1b673 Mon Sep 17 00:00:00 2001
From: Fatih Alp <mail@fatihalp.com>
Date: Thu, 10 Dec 2020 15:59:27 +0300
Subject: [PATCH 173/256] Turkish trans fixes

---
 resources/lang/tr/entry.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/lang/tr/entry.php b/resources/lang/tr/entry.php
index 043f7b9cb..82741e5d5 100644
--- a/resources/lang/tr/entry.php
+++ b/resources/lang/tr/entry.php
@@ -3,8 +3,8 @@
 return [
     'id'         => 'ID',
     'name'       => 'Giriş',
-    'created_at' => 'Oluşturuldu',
-    'created_by' => 'Tarafından oluşturuldu',
-    'updated_at' => 'Yüklendi',
-    'updated_by' => 'Tarafından yüklendi',
+    'created_at' => 'Kayıt tarihi',
+    'created_by' => 'Oluşturan kullanıcı',
+    'updated_at' => 'Güncelleme tarihi',
+    'updated_by' => 'Güncelletyen kullanıcı',
 ];

From 2965420adcdc5d20eb95e15d09fbbb2385c62db0 Mon Sep 17 00:00:00 2001
From: Fatih Alp <mail@fatihalp.com>
Date: Thu, 10 Dec 2020 16:00:51 +0300
Subject: [PATCH 174/256] Update message.php

---
 resources/lang/tr/message.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/tr/message.php b/resources/lang/tr/message.php
index f6a2a2b5c..906b6492c 100644
--- a/resources/lang/tr/message.php
+++ b/resources/lang/tr/message.php
@@ -10,8 +10,8 @@
     'access_denied'             => 'Erişim reddedildi.',
     'no_fields_available'       => 'Alan yok',
     'delete_restrict'           => 'Silinemiyor: ad sınırlı olduğundan adı. Önce ilgili ": ilişki" yi silin.',
-    'delete_success'            => ': count satır (lar) başarıyla silindi.',
-    'reorder_success'           => ': count satır (lar) başarıyla yeniden sıralandı.',
+    'delete_success'            => ':count satır (lar) başarıyla silindi.',
+    'reorder_success'           => ':count satır (lar) başarıyla yeniden sıralandı.',
     'csrf_token_mismatch'       => 'Güvenlik simgenizin süresi doldu. Lütfen formu tekrar gönderin.',
     'form_expired'              => 'Formun süresi doldu. Lütfen tekrar deneyin.',
     'create_success'            => ':name başarıyla oluşturuldu.',

From a9e10be0cc15b72e5189761c03d8cec9fc33dd6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Thu, 24 Dec 2020 17:51:33 +0700
Subject: [PATCH 175/256] Fixed issue with Error

---
 src/Exception/ExceptionIdentifier.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Exception/ExceptionIdentifier.php b/src/Exception/ExceptionIdentifier.php
index b5d3bc121..31a532e9e 100644
--- a/src/Exception/ExceptionIdentifier.php
+++ b/src/Exception/ExceptionIdentifier.php
@@ -1,6 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Exception;
 
-use Exception;
+use Throwable;
 
 /**
  * Class ExceptionIdentifier
@@ -26,11 +26,11 @@ class ExceptionIdentifier
     /**
      * Identify the given exception.
      *
-     * @param \Exception $exception
+     * @param Throwable $exception
      *
      * @return string
      */
-    public function identify(Exception $exception)
+    public function identify(Throwable $exception)
     {
         $hash = spl_object_hash($exception);
 

From 7d4b6ed9f9da4edba35b17c53ad88f7b5440ce5f Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 28 Dec 2020 09:09:45 -0600
Subject: [PATCH 176/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 579b9ee23..827c9a139 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.17] - 2020-12-01
+### Fixed
+- Fixed compliance issue with core exception identifier.
+
 ### [1.8.16] - 2020-12-01
 ### Fixed
 - Reintroduced lexer switch, fixing issue with id selectors being interpreted as twig comments.

From 72c50f657d394dc428ced2addecdb41dfebd74aa Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 28 Dec 2020 09:10:02 -0600
Subject: [PATCH 177/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 827c9a139..4564328ac 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,7 +28,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.8.17] - 2020-12-01
+### [1.8.17] - 2020-12-28
 ### Fixed
 - Fixed compliance issue with core exception identifier.
 

From ce76a79e87499b7c794abd94c1063b4f7f048125 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Sat, 2 Jan 2021 10:34:01 -0600
Subject: [PATCH 178/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 108 ++-------------------------
 1 file changed, 5 insertions(+), 103 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 4564328ac..751b8bc0c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.18] - 2021-01-02
+### Fixed
+- Issue with PHP 8
+- Turkish translations
+
 ### [1.8.17] - 2020-12-28
 ### Fixed
 - Fixed compliance issue with core exception identifier.
@@ -131,108 +136,5 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Added the [decorate](/documentation/streams-platform/1.8/reference/helpers#decorate) helper function.
 - Added the [undecorate](/documentation/streams-platform/1.8/reference/helpers#undecorate) helper function.
 
-#### Fixed
-<<<<<<< HEAD
-- Fixed issue with validation extender not passing along unique field types per extending validation rule.
-=======
-- Fixed edge case situation in parser where route parameters need a bit of cleaning.
-
-
-### [1.7.11] - 2019-10-10
-#### Fixed
-- Fixed issue where translated entries were potentially duplicating results due to default ordering.
-
-
-### [1.7.10] - 2019-09-30
-#### Fixed
->>>>>>> 1.7
-- Fixed issue where responses without cookie support (media stream) would result in fatal errors.
-- Fixed issue with installer where `.env` was not reloading properly since moving to Laravel 5.8.
-- Fixed issue where responses without cookie support (media stream) would result in fatal errors.
-<<<<<<< HEAD
-- Fixed issue where installation was not properly dumping the autoloader for generated models.
-=======
-
-
-### [1.7.8] - 2019-09-19
-#### Fixed
-- Fixed issue with installer where .env was not reloading properly since moving to Laravel 5.8
-
-
-### [1.7.7] - 2019-09-11
-#### Fixed
-- Fixed issue with button guesser leaving route objects in buttons and thus breaking form views.
-
-
-### [1.7.6] - 2019-09-10
-#### Changed
-- Cleaned up message output from `build` command.
-
 #### Fixed
 - Fixed issue with validation extender not passing along unique field types per extending validation rule.
-
-
-### [1.7.5] - 2019-09-09
-#### Fixed
-- Fixed issue with `inline` images when using SVG sources.
-- Fix active theme resolution in view loader. View composer was unaffected.
-
-#### Changed
-- Changed `ViewOverrides` collection to force dot notation view names.
-
-
-### [1.7.4] - 2019-09-06
-#### Added
-- Added coverage configuration to `phpunit.stub`.
-
-#### Changed
-- Bumped to `"axios": "^0.19",` in `package.theme.stub`.
-
-#### Fixed
-- Fixed `cleanup` functionality in `\Anomaly\Streams\Platform\Field\FieldRepository`.
-- Fixed `cleanup` functionality in `\Anomaly\Streams\Platform\Stream\StreamRepository`.
-
-
-### [1.7.3] - 2019-08-29
-#### Fixed
-- Fixed issue where `\Anomaly\Streams\Platform\Database\Migration\Console\MigrateMakeCommand` was out of date with Laravel. Threw error on missing `--fullpath` option.
-
-
-### [1.7.2] - 2019-08-18
-#### Fixed
-- Fixed issue where users would be getting logged out after viewing pages cached by HTTPCACHE.
-
-#### Changed
-- Moved cookie middleware in `Kernel` to after session start just like Laravel.
-
-#### Added
-- Added `session_proxy` boolean flag to mark logged in users to pre-boot services like HTTPCACHE.
-
-
-### [1.7.1] - 2019-08-16
-#### Added
-- Added `config:cache` control to `refresh` command.
-- Added `route:cache` control to `refresh` command.
-- The `refresh` command now clears `bootstrap/cache/services.php`.
-- The `refresh` command now clears `bootstrap/cache/packages.php`.
-
-
-### [1.7.0] - 2019-08-06
-#### Changed
-- Updated `laravel/framework` to `5.8.*`.
-- Updated `laravel/scout` to `7.1.*`.
-- Updated `intervention/image` to `2.5.*`.
-- Updated `laravelcollective/html` to `5.8.*`.
-- Updated `teamtnt/laravel-scout-tntsearch-driver` to `7.1.*`.
-- Changed `add` to `include` in `\Anomaly\Streams\Platform\View\ViewIncludes` to comply with Laravel 5.8.
-- Changed all instances of `\Illuminate\Contracts\Events\Dispatcher` to use `event`.
-
-#### Removed
-- Removed `symfony/class-loader` dependency (it's in Laravel).
-- Removed `add` method from `\Anomaly\Streams\Platform\View\ViewOverrides` (use `put`).
-- Removed `add` method from `\Anomaly\Streams\Platform\View\ViewMobileOverrides` (use `put`).
-- Removed unused `\Anomaly\Streams\Platform\Stream\Console\Event\StreamsIsRefreshing`.
-
-#### Added
-- Added `streams:index` to `build` command.
->>>>>>> 1.7

From 32a22be48f7fbff324723d5aaaa5b2c79eaa30c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vandebeuque?= <fred.vdb@newebtime.com>
Date: Tue, 12 Jan 2021 18:38:03 +0700
Subject: [PATCH 179/256] Fixed stupid float behaviour

---
 src/Support/Currency.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Support/Currency.php b/src/Support/Currency.php
index a26b73046..c4e1a1b0d 100644
--- a/src/Support/Currency.php
+++ b/src/Support/Currency.php
@@ -52,7 +52,7 @@ public function format($number, $currency = null, array $options = [])
             $suffix = $this->symbol($currency);
         }
 
-        return $prefix . number_format(floor(($number * 100)) / 100, $decimals, $point, $separator) . $suffix;
+        return $prefix . number_format(floor(($number * 1000)) / 1000, $decimals, $point, $separator) . $suffix;
     }
 
     /**
@@ -83,7 +83,7 @@ public function normalize($number, $currency = null, array $options = [])
             config('streams::currencies.supported.' . $currency . '.point', '.')
         );
 
-        return number_format(floor(($number * 100)) / 100, $decimals, $point, $separator);
+        return number_format(floor(($number * 1000)) / 1000, $decimals, $point, $separator);
     }
 
     /**

From 3e9665c8498b6fb97e13d494b08c14c93a5b6377 Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Sat, 16 Jan 2021 13:10:53 -0800
Subject: [PATCH 180/256] Glue comes before array

glue must come before array in php 7.4
---
 src/View/ViewIncludes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/View/ViewIncludes.php b/src/View/ViewIncludes.php
index 35bd2884a..2c9fde10c 100644
--- a/src/View/ViewIncludes.php
+++ b/src/View/ViewIncludes.php
@@ -46,13 +46,13 @@ public function render($slot)
         }
 
         return implode(
+            "\n",
             array_map(
                 function ($include) {
                     return view($include)->render();
                 },
                 $includes->all()
-            ),
-            "\n"
+            )
         );
     }
 }

From 91bed2dd1bfc71e77e277cf7306a62b6e8beb53f Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 18 Jan 2021 11:07:26 +0300
Subject: [PATCH 181/256] added cron cache kernel

---
 src/Http/CacheKernel.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Http/CacheKernel.php b/src/Http/CacheKernel.php
index 0f7d4a171..db0f38c4c 100644
--- a/src/Http/CacheKernel.php
+++ b/src/Http/CacheKernel.php
@@ -23,6 +23,8 @@ class CacheKernel extends \Barryvdh\HttpCache\CacheKernel
     protected static $excluded = [
         '/admin',
         '/admin/*',
+        '/cron',
+        '/cron/*',
         '/streams/*-field_type/*',
         '/streams/*-extension/*',
         '/streams/*-module/*',

From 9f74fbfff2be6490df5a2e0955f2cd3d3a69fc43 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 18 Jan 2021 09:22:39 -0600
Subject: [PATCH 182/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 751b8bc0c..2fa7a7625 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.19] - 2021-01-18
+### Fixed
+- Issue with floating points in `Currency`.
+
 ### [1.8.18] - 2021-01-02
 ### Fixed
 - Issue with PHP 8

From 92d6bfb8efeeb3770fa56d8995a8da11fc9fe824 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 25 Jan 2021 23:02:21 -0600
Subject: [PATCH 183/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 2fa7a7625..eeec5d53e 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.20] - 2021-01-25
+### Fixed
+- Fixed issue with PHP compatibility in `src/View/ViewIncludes.php`.
+
 ### [1.8.19] - 2021-01-18
 ### Fixed
 - Issue with floating points in `Currency`.

From a3fd8857b32e70a425e41ce66c47f59c60b9e3df Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Fri, 29 Jan 2021 12:44:23 +0300
Subject: [PATCH 184/256] Update setting.php

---
 resources/lang/en/setting.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/en/setting.php b/resources/lang/en/setting.php
index bc18d8669..1cf5ce288 100644
--- a/resources/lang/en/setting.php
+++ b/resources/lang/en/setting.php
@@ -59,6 +59,7 @@
     ],
     'maintenance'           => [
         'label'        => 'Maintenance Mode',
+        'warning'      => 'Only admin users will be able to access the site.',
         'instructions' => 'Use this option to the disable the public-facing part of the system.<br>This is useful when you want to take the site down for maintenance or development.',
     ],
     'debug'                 => [

From 6925aead505b7840c859900eef1434b7a39b2520 Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Tue, 2 Feb 2021 16:30:52 +0300
Subject: [PATCH 185/256] default input field edit is current lang

---
 resources/views/form/partials/translations.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/form/partials/translations.twig b/resources/views/form/partials/translations.twig
index 2ac708d54..04660e658 100644
--- a/resources/views/form/partials/translations.twig
+++ b/resources/views/form/partials/translations.twig
@@ -4,7 +4,7 @@
     </a>
     <div class="dropdown-menu">
         {% for iso in config_get('streams::locales.enabled') %}
-            <a class="dropdown-item {{ iso == config_get('streams::locales.default') ? 'active' }}"
+            <a class="dropdown-item {{ iso == config('app.locale', config_get('streams::locales.enabled')) ? 'active' }}"
                href="#"
                data-toggle="lang" lang="{{ iso }}">
                 {{ trans('streams::locale.' ~ iso ~ '.name') }}

From 82f614138bfadb5033220895ed7ae811b0958063 Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Tue, 2 Feb 2021 16:32:08 +0300
Subject: [PATCH 186/256] make default input field the current lang

---
 src/Ui/Form/Component/Field/FieldTranslator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ui/Form/Component/Field/FieldTranslator.php b/src/Ui/Form/Component/Field/FieldTranslator.php
index e004806c6..96b9000f1 100644
--- a/src/Ui/Form/Component/Field/FieldTranslator.php
+++ b/src/Ui/Form/Component/Field/FieldTranslator.php
@@ -64,7 +64,7 @@ public function translate(FormBuilder $builder)
                     array_set($translation, 'value', $value);
                 }
 
-                if ($defaultLocale !== $locale) {
+                if (config('app.locale', $defaultLocale) !== $locale) {
                     array_set($translation, 'hidden', true);
                     array_set($translation, 'required', false);
                     array_set($translation, 'rules', array_diff(array_get($translation, 'rules', []), ['required']));

From 676a3b5e63f00cd41b9fceda8f3ced6c50eedd91 Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:30:22 +0300
Subject: [PATCH 187/256] Update FormRules.php

---
 src/Ui/Form/FormRules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ui/Form/FormRules.php b/src/Ui/Form/FormRules.php
index 9862a3046..047967bcc 100644
--- a/src/Ui/Form/FormRules.php
+++ b/src/Ui/Form/FormRules.php
@@ -25,7 +25,7 @@ public function compile(FormBuilder $builder)
         $entry  = $builder->getFormEntry();
         $stream = $builder->getFormStream();
 
-        $locale = config('streams::locales.default');
+        $locale = config('app.locale', config('streams::locales.default'));
 
         /* @var FieldType $field */
         foreach ($builder->getEnabledFormFields() as $field) {

From f4f5b14e4d1050e3b1a519e6e7b6a93f947a17ec Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Mon, 15 Feb 2021 15:43:08 -0600
Subject: [PATCH 188/256] Fixing

---
 docs/en/01.prologue/02.change-log.md          |  5 +++
 .../Extension/Command/InstallExtension.php    |  9 ++--
 src/Addon/Module/Command/InstallModule.php    |  3 ++
 src/Addon/Module/ModuleManager.php            |  4 +-
 src/Stream/Event/StreamIsDeleting.php         | 41 +++++++++++++++++++
 src/Stream/StreamObserver.php                 | 11 +++++
 src/StreamsEventProvider.php                  |  3 +-
 .../Listener/DeleteVersionableHistory.php     |  6 +--
 8 files changed, 73 insertions(+), 9 deletions(-)
 create mode 100644 src/Stream/Event/StreamIsDeleting.php

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index eeec5d53e..c93a1329f 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.8.21] - 2021-02-15
+### Fixed
+- Fixed autoloading issue with installer(s) not reloading generated entry models.
+- Fixed issue where streams try to clear versionable history after deletion.
+
 ### [1.8.20] - 2021-01-25
 ### Fixed
 - Fixed issue with PHP compatibility in `src/View/ViewIncludes.php`.
diff --git a/src/Addon/Extension/Command/InstallExtension.php b/src/Addon/Extension/Command/InstallExtension.php
index 000c38e99..0ab28811c 100644
--- a/src/Addon/Extension/Command/InstallExtension.php
+++ b/src/Addon/Extension/Command/InstallExtension.php
@@ -1,10 +1,11 @@
 <?php namespace Anomaly\Streams\Platform\Addon\Extension\Command;
 
+use Anomaly\Streams\Platform\Console\Kernel;
 use Anomaly\Streams\Platform\Addon\AddonManager;
-use Anomaly\Streams\Platform\Addon\Extension\Contract\ExtensionRepositoryInterface;
-use Anomaly\Streams\Platform\Addon\Extension\Event\ExtensionWasInstalled;
 use Anomaly\Streams\Platform\Addon\Extension\Extension;
-use Anomaly\Streams\Platform\Console\Kernel;
+use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
+use Anomaly\Streams\Platform\Addon\Extension\Event\ExtensionWasInstalled;
+use Anomaly\Streams\Platform\Addon\Extension\Contract\ExtensionRepositoryInterface;
 
 /**
  * Class InstallExtension
@@ -66,6 +67,8 @@ public function handle(
 
         $extensions->install($this->extension);
 
+        dispatch_now(new AutoloadEntryModels);
+        
         $manager->register();
 
         if ($this->seed) {
diff --git a/src/Addon/Module/Command/InstallModule.php b/src/Addon/Module/Command/InstallModule.php
index 088712cfa..f0f789d9b 100644
--- a/src/Addon/Module/Command/InstallModule.php
+++ b/src/Addon/Module/Command/InstallModule.php
@@ -5,6 +5,7 @@
 use Anomaly\Streams\Platform\Addon\Module\Event\ModuleWasInstalled;
 use Anomaly\Streams\Platform\Addon\Module\Module;
 use Anomaly\Streams\Platform\Console\Kernel;
+use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
 
 /**
  * Class InstallModule
@@ -64,6 +65,8 @@ public function handle(
 
         $console->call('migrate', $options);
 
+        dispatch_now(new AutoloadEntryModels);
+        
         $modules->install($this->module);
 
         $manager->register();
diff --git a/src/Addon/Module/ModuleManager.php b/src/Addon/Module/ModuleManager.php
index b0a259dc8..febc71cb5 100644
--- a/src/Addon/Module/ModuleManager.php
+++ b/src/Addon/Module/ModuleManager.php
@@ -1,11 +1,11 @@
 <?php namespace Anomaly\Streams\Platform\Addon\Module;
 
-use Anomaly\Streams\Platform\Addon\Module\Command\DisableModule;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Anomaly\Streams\Platform\Addon\Module\Command\EnableModule;
+use Anomaly\Streams\Platform\Addon\Module\Command\DisableModule;
 use Anomaly\Streams\Platform\Addon\Module\Command\InstallModule;
 use Anomaly\Streams\Platform\Addon\Module\Command\MigrateModule;
 use Anomaly\Streams\Platform\Addon\Module\Command\UninstallModule;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
  * Class ModuleManager
diff --git a/src/Stream/Event/StreamIsDeleting.php b/src/Stream/Event/StreamIsDeleting.php
new file mode 100644
index 000000000..5e706739c
--- /dev/null
+++ b/src/Stream/Event/StreamIsDeleting.php
@@ -0,0 +1,41 @@
+<?php namespace Anomaly\Streams\Platform\Stream\Event;
+
+use Anomaly\Streams\Platform\Stream\Contract\StreamInterface;
+
+/**
+ * Class StreamIsDeleting
+ *
+ * @link    http://pyrocms.com/
+ * @author  PyroCMS, Inc. <support@pyrocms.com>
+ * @author  Ryan Thompson <ryan@pyrocms.com>
+ */
+class StreamIsDeleting
+{
+
+    /**
+     * The stream interface.
+     *
+     * @var \Anomaly\Streams\Platform\Stream\Contract\StreamInterface
+     */
+    protected $stream;
+
+    /**
+     * Create a new StreamIsDeleting instance.
+     *
+     * @param StreamInterface $stream
+     */
+    public function __construct(StreamInterface $stream)
+    {
+        $this->stream = $stream;
+    }
+
+    /**
+     * Get the stream interface.
+     *
+     * @return StreamInterface
+     */
+    public function getStream()
+    {
+        return $this->stream;
+    }
+}
diff --git a/src/Stream/StreamObserver.php b/src/Stream/StreamObserver.php
index 965b8ac29..d2bb99ad6 100644
--- a/src/Stream/StreamObserver.php
+++ b/src/Stream/StreamObserver.php
@@ -9,6 +9,7 @@
 use Anomaly\Streams\Platform\Stream\Command\DropStreamsEntryTable;
 use Anomaly\Streams\Platform\Stream\Command\RenameStreamsEntryTable;
 use Anomaly\Streams\Platform\Stream\Contract\StreamInterface;
+use Anomaly\Streams\Platform\Stream\Event\StreamIsDeleting;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasCreated;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasDeleted;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasSaved;
@@ -91,6 +92,16 @@ public function updated(StreamInterface $model)
         $this->events->dispatch(new StreamWasUpdated($model));
     }
 
+    /**
+     * Run before a stream is deleted.
+     *
+     * @param StreamInterface $model
+     */
+    public function deleting(StreamInterface $model)
+    {
+        $this->events->dispatch(new StreamIsDeleting($model));
+    }
+
     /**
      * Run after a stream has been deleted.
      *
diff --git a/src/StreamsEventProvider.php b/src/StreamsEventProvider.php
index b664150e5..c708a7140 100644
--- a/src/StreamsEventProvider.php
+++ b/src/StreamsEventProvider.php
@@ -6,6 +6,7 @@
 use Anomaly\Streams\Platform\Asset\Listener\AddAddonPaths as AddAddonAssetPaths;
 use Anomaly\Streams\Platform\Image\Listener\AddAddonPaths as AddAddonImagePaths;
 use Anomaly\Streams\Platform\Message\Listener\LoadMessageBag;
+use Anomaly\Streams\Platform\Stream\Event\StreamIsDeleting;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasDeleted;
 use Anomaly\Streams\Platform\Ui\Breadcrumb\Listener\GuessBreadcrumbs;
 use Anomaly\Streams\Platform\Ui\Breadcrumb\Listener\LoadBreadcrumbs;
@@ -60,7 +61,7 @@ class StreamsEventProvider extends EventServiceProvider
             ApplyView::class,
             FilterResults::class,
         ],
-        StreamWasDeleted::class      => [
+        StreamIsDeleting::class      => [
             DeleteVersionableHistory::class,
         ],
     ];
diff --git a/src/Version/Listener/DeleteVersionableHistory.php b/src/Version/Listener/DeleteVersionableHistory.php
index 89ee1c24e..5ba25021d 100644
--- a/src/Version/Listener/DeleteVersionableHistory.php
+++ b/src/Version/Listener/DeleteVersionableHistory.php
@@ -1,6 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Version\Listener;
 
-use Anomaly\Streams\Platform\Stream\Event\StreamWasDeleted;
+use Anomaly\Streams\Platform\Stream\Event\StreamIsDeleting;
 use Anomaly\Streams\Platform\Version\Contract\VersionRepositoryInterface;
 
 /**
@@ -33,9 +33,9 @@ public function __construct(VersionRepositoryInterface $versions)
     /**
      * Handle the event.
      *
-     * @param StreamWasDeleted $event
+     * @param StreamIsDeleting $event
      */
-    public function handle(StreamWasDeleted $event)
+    public function handle(StreamIsDeleting $event)
     {
         $stream = $event->getStream();
 

From f5aa29415c3d8c606e35cb173977d7fa0a9cd41f Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Thu, 25 Feb 2021 14:46:05 +0300
Subject: [PATCH 189/256] #3316 Only the default language is required

---
 resources/views/form/partials/wrapper.twig | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/resources/views/form/partials/wrapper.twig b/resources/views/form/partials/wrapper.twig
index ed9076b16..4c2aa035a 100644
--- a/resources/views/form/partials/wrapper.twig
+++ b/resources/views/form/partials/wrapper.twig
@@ -38,3 +38,61 @@
     </div>
 
 </div>
+
+{% if field_type.required %}
+    <script>
+        if (typeof inputsTrans === 'undefined') {
+            var inputsTrans = {
+                {{ field_type.attributes.id }}: {
+                    label: `{{ field_type.object.label }}`,
+                    lang: `{{ field_type.object.locale }}`
+                }
+            }
+        } else {
+            inputsTrans.{{ field_type.attributes.id }} = {
+                label: `{{ field_type.object.label }}`,
+                lang: `{{ field_type.object.locale }}`
+            }
+        }
+
+        var createAllErrors = function() {
+            var form = $( this );
+
+            var showAllErrorMessages = function() {
+                // Find all invalid fields within the form.
+                var invalidFields = form.find( ":invalid" ).each( function( index, node ) {
+
+                    // Find the field's corresponding label
+                    if (node.nodeName !== 'FIELDSET') {
+                        var label = inputsTrans[node.id],
+                            // Opera incorrectly does not fill the validationMessage property.
+                            message = node.validationMessage || 'Invalid value.';
+
+                        alert(label.label + (label.lang ? ' (' + label.lang + ')' : '') + ': ' + message)
+                    }
+                });
+            };
+
+            // Support Safari
+            form.off( "submit").on( "submit", function( event ) {
+                if ( this.checkValidity && !this.checkValidity() ) {
+                    $( this ).find( ":invalid" ).first().focus();
+                    event.preventDefault();
+                }
+            });
+
+            $( "input[type=submit], button:not([type=button])", form )
+                .off( "click").on( "click", showAllErrorMessages);
+
+            // $( "input", form ).off( "keypress").on( "keypress", function( event ) {
+            //     var type = $( this ).attr( "type" );
+            //     if ( /date|email|month|number|search|tel|text|time|url|week/.test ( type )
+            //         && event.keyCode == 13 ) {
+            //         showAllErrorMessages();
+            //     }
+            // });
+        };
+
+        $( "form" ).each( createAllErrors );
+    </script>
+{% endif %}

From 78014868b2dd6fb8813c59f2a08eb448f5f24c58 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 1 Mar 2021 16:12:56 +0300
Subject: [PATCH 190/256] multiple_field_type filter search fixed

---
 src/Addon/FieldType/FieldTypeQuery.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Addon/FieldType/FieldTypeQuery.php b/src/Addon/FieldType/FieldTypeQuery.php
index 55526e0dd..866d72ce6 100644
--- a/src/Addon/FieldType/FieldTypeQuery.php
+++ b/src/Addon/FieldType/FieldTypeQuery.php
@@ -71,10 +71,14 @@ public function filter(Builder $query, FilterInterface $filter)
             $query->{$this->where()}(
                 function (Builder $query) use ($translations, $filter, $column) {
 
-                    $query->where(
-                        "{$translations}.locale",
-                        config('app.locale')
-                    );
+                    /**
+                     *  closed this block because it breaks 'multiple field type'.
+                     */
+
+//                    $query->where(
+//                        "{$translations}.locale",
+//                        config('app.locale')
+//                    );
 
                     if (method_exists($this->fieldType, 'getRelation')) {
                         $query->where(

From 0c271df6c78f6a0d621a078192014567cfe5ac1a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 4 Mar 2021 15:44:10 -0600
Subject: [PATCH 191/256] Native addon support

---
 src/Addon/AddonIntegrator.php |  4 ++++
 src/Addon/AddonManager.php    |  7 ++++++-
 src/Addon/AddonPaths.php      | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/Addon/AddonIntegrator.php b/src/Addon/AddonIntegrator.php
index 7990cd031..2783409c9 100644
--- a/src/Addon/AddonIntegrator.php
+++ b/src/Addon/AddonIntegrator.php
@@ -113,6 +113,10 @@ public function register($path, $namespace, $enabled, $installed)
             ) . studly_case($type);
 
         /* @var Addon|Module|Extension|Twig_ExtensionInterface $addon */
+        if (!class_exists($class)) {
+            return null;
+        }
+
         $addon = app($class)
             ->setPath($path)
             ->setType($type)
diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 8739d93e5..250e6e4bb 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -164,8 +164,13 @@ function () use ($installed) {
                 in_array($namespace, $installed)
             );
 
+            /**
+             * It's not an addon, k.
+             * Debug your addon by noting it not being loaded O_O
+             * Exception was forward...
+             */
             if (!$addon) {
-                throw new \Exception("Addon path not found [{$path}]. Check [resources/streams/config/addons.php]");
+                continue;
             }
 
             foreach ($addon->getAddons() as $class) {
diff --git a/src/Addon/AddonPaths.php b/src/Addon/AddonPaths.php
index 0030b08e0..7b67d8d66 100644
--- a/src/Addon/AddonPaths.php
+++ b/src/Addon/AddonPaths.php
@@ -53,6 +53,7 @@ public function all()
         $core        = $this->core() ?: [];
         $shared      = $this->shared() ?: [];
         $application = $this->application() ?: [];
+        $application = $this->native() ?: [];
 
         // Testing only addons.
         $testing = $this->testing() ?: [];
@@ -115,6 +116,28 @@ function ($path) {
         );
     }
 
+    /**
+     * Return all native addon paths.
+     *
+     * @return bool
+     */
+    public function native()
+    {
+        $path = base_path('vendor');
+
+        if (!is_dir($path)) {
+            return false;
+        }
+        
+        $paths = [];
+
+        foreach (config('streams::addons.types') as $type) {
+            $paths = array_merge($paths, glob("{$path}/*/*-{$type}", GLOB_ONLYDIR));
+        }
+        
+        return $paths;
+    }
+    
     /**
      * Return all core addon paths in a given folder.
      *

From a2b8f4ab02684dea6bb90b4c8280d1a59efdae0e Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 4 Mar 2021 15:47:46 -0600
Subject: [PATCH 192/256] Change log

---
 docs/en/01.prologue/02.change-log.md | 127 ++-------------------------
 1 file changed, 5 insertions(+), 122 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index c93a1329f..1a4cbc840 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,126 +28,9 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.8.21] - 2021-02-15
-### Fixed
-- Fixed autoloading issue with installer(s) not reloading generated entry models.
-- Fixed issue where streams try to clear versionable history after deletion.
+### [1.9.0] - 2021-03-05
+### Added
+- Added support for native addons in vendor directory.
 
-### [1.8.20] - 2021-01-25
-### Fixed
-- Fixed issue with PHP compatibility in `src/View/ViewIncludes.php`.
-
-### [1.8.19] - 2021-01-18
-### Fixed
-- Issue with floating points in `Currency`.
-
-### [1.8.18] - 2021-01-02
-### Fixed
-- Issue with PHP 8
-- Turkish translations
-
-### [1.8.17] - 2020-12-28
-### Fixed
-- Fixed compliance issue with core exception identifier.
-
-### [1.8.16] - 2020-12-01
-### Fixed
-- Reintroduced lexer switch, fixing issue with id selectors being interpreted as twig comments.
-
-### [1.8.15] - 2020-11-24
-### Fixed
-- Fixed issue with theme config targeting non-existent default theme.
-
-### [1.8.14] - 2020-11-18
-#### Added
-- Added support for `INSTALLED=admin` flag for "beheading" PyroCMS.
-#### Changed
-- Changed logic for detecting if looking up an application is safe.
-
-### [1.8.13] - 2020-10-30
-#### Fixed
-- Fix issue where addon parameter was overridden even if it was set on route.
-
-### [1.8.12] - 2020-10-29
-#### Added
-- Added `addMiddlewareGroup($group, $middleware = []);` to the HTTP kernel.
-
-#### Fixed
-- Fix issue with asset paths being hardcoded in testing.
-- Fix issue with ViewComposer not refreshing between tests.
-
-### [1.8.11] - 2020-10-14
-#### Fixed
-- Fix issue with route parameters required.
-
-
-### [1.8.10] - 2020-10-14
-#### Added
-- Added `url` to table options for form action URL control.
-
-#### Remove
-- Skip PHPUnit tests where environment file is touched.
-
-
-### [1.8.9] - 2020-10-03
-#### Fixed
-- Fixed issue where Control Panel may build more than once.
-
-
-### [1.8.8] - 2020-09-28
-#### Fixed
-- Fixed `purify` plugin function.
-
-### [1.8.7] - 2020-09-23
-#### Fixed
-- Fixed `empty()` calls through presenters `empty` attribute.
-
-### [1.8.6] - 2020-09-17
-#### Fixed
-- Fixed issues with the migrator/migration repository.
-- Fixed issues with the FieldTypeSchema.
-
-### [1.8.5] - 2020-09-17
-#### Fixed
-- Fixed issue where linkifying attr may not be set.
-
-### [1.8.4] - 2020-09-14
-#### Fixed
-- Fixed issues surrounding versioning.
-
-#### Changed
-- Swapped out `misd/linkify` for `vstelmakh/url-highlight`.
-
-### [1.8.2] - 2020-09-09
-#### Added
-- Added ability to set filter value and active state for manual filter manipulation.
-
-
-### [1.8.1] - 2020-09-02
-#### Changed
-- Changed `laravel/framework` dependency to `^7.0|^8.0`.
-
-
-### [1.8.0] - 2020-09-01
-#### Changed
-- Changed `laravel/framework` dependency to `^7.0`.
-- Updated supporting dependencies for Laravel 7.
-
-#### Removed
-- Removed `leafo/scssphp` dependency.
-- Removed `natxet/CssMin` dependency.
-- Removed `mrclay/jsmin-php` dependency.
-- Removed `cartalyst/assetic` dependency.
-- Removed `oyejorge/less.php` dependency.
-- Removed `ptachoire/cssembed` dependency.
-- Removed `coffeescript/coffeescript` dependency.
-- Removed `barryvdh/laravel-httpcache` dependency.
-- Removed `teamtnt/laravel-scout-tntsearch-driver` dependency.
-
-#### Added
-- Added the [console](/documentation/streams-platform/1.8/reference/helpers#console) helper function.
-- Added the [decorate](/documentation/streams-platform/1.8/reference/helpers#decorate) helper function.
-- Added the [undecorate](/documentation/streams-platform/1.8/reference/helpers#undecorate) helper function.
-
-#### Fixed
-- Fixed issue with validation extender not passing along unique field types per extending validation rule.
+### Changed
+- Added integrator to not throw such a fit if the addon class does not exist.

From 7e7cf901777135337e00ca8b578117464d12809a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 4 Mar 2021 16:14:25 -0600
Subject: [PATCH 193/256] Path

---
 docs/en/03.reference/11.configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/03.reference/11.configuration.md b/docs/en/03.reference/11.configuration.md
index c253cb35f..4bab5c8bf 100644
--- a/docs/en/03.reference/11.configuration.md
+++ b/docs/en/03.reference/11.configuration.md
@@ -95,7 +95,7 @@ Specify addons by path to load first. The path should be relative to your projec
 
 ```php
 'eager' => [
-    //'core/anomaly/redirects-module'
+    //'vendor/anomaly/redirects-module'
 ],
 ```
 

From 652b931cb8505246e16a77301b27d963329145a6 Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Thu, 4 Mar 2021 14:36:17 -0800
Subject: [PATCH 194/256] Update for L8

---
 resources/stubs/entity/factory.stub | 31 ++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/resources/stubs/entity/factory.stub b/resources/stubs/entity/factory.stub
index 831d90e0f..0149faf14 100644
--- a/resources/stubs/entity/factory.stub
+++ b/resources/stubs/entity/factory.stub
@@ -1,10 +1,23 @@
-<?php
-
-$factory->define(
-    {model}::class,
-    function (Faker\Generator $faker) {
-        return [
-            //'title' => $faker->words(2),
-        ];
+<?php namespace {namespace};
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class {class} extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var {model}
+     */
+    protected $model = {model}::class;
+
+
+    /**
+     * @return array
+     * @throws \Exception
+     */
+    public function definition()
+    {
+        return [];
     }
-);
+}

From fc3c7f2a39180dec5a9cf7585f33fcd46a1fda36 Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Thu, 4 Mar 2021 14:37:56 -0800
Subject: [PATCH 195/256] Add L8 Factory support

---
 resources/stubs/entity/model.stub | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/stubs/entity/model.stub b/resources/stubs/entity/model.stub
index 8c0f9174f..8887510e8 100644
--- a/resources/stubs/entity/model.stub
+++ b/resources/stubs/entity/model.stub
@@ -2,8 +2,17 @@
 
 use {interface};
 use {base};
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class {class} extends {extends} implements {implements}
 {
+    use HasFactory;
 
+    /**
+     * @return {factory}
+     */
+    protected static function newFactory()
+    {
+        return {factory}::new();
+    }
 }

From 5f6492f60ccf50276c16801df478567b253a527d Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Thu, 4 Mar 2021 14:39:25 -0800
Subject: [PATCH 196/256] Add L8 factory support

---
 src/Stream/Console/Command/WriteEntityModel.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Stream/Console/Command/WriteEntityModel.php b/src/Stream/Console/Command/WriteEntityModel.php
index b60c79314..9ce1034a1 100644
--- a/src/Stream/Console/Command/WriteEntityModel.php
+++ b/src/Stream/Console/Command/WriteEntityModel.php
@@ -64,6 +64,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
 
         $class      = "{$entity}Model";
         $implements = "{$entity}Interface";
+        $factory    = "{$entity}Factory";
         $extends    = $prefix . $suffix . 'EntryModel';
         $namespace  = $this->addon->getTransformedClass("{$entity}");
         $interface  = $this->addon->getTransformedClass("{$entity}\\Contract\\{$entity}Interface");
@@ -79,7 +80,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
 
         $filesystem->put(
             $path,
-            $parser->parse($template, compact('class', 'extends', 'implements', 'namespace', 'interface', 'base'))
+            $parser->parse($template, compact('class', 'extends', 'implements', 'namespace', 'interface', 'base', 'factory'))
         );
     }
 }

From 1b361c9568c66e3d9340a95872700bda42ce7998 Mon Sep 17 00:00:00 2001
From: edster <edsters88@hotmail.com>
Date: Thu, 4 Mar 2021 14:39:51 -0800
Subject: [PATCH 197/256] Add L8 Factory support

---
 src/Stream/Console/Command/WriteEntityFactory.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Stream/Console/Command/WriteEntityFactory.php b/src/Stream/Console/Command/WriteEntityFactory.php
index 423361d51..dce8f730e 100644
--- a/src/Stream/Console/Command/WriteEntityFactory.php
+++ b/src/Stream/Console/Command/WriteEntityFactory.php
@@ -45,8 +45,8 @@ class WriteEntityFactory
      */
     public function __construct(Addon $addon, $slug, $namespace)
     {
-        $this->slug      = $slug;
-        $this->addon     = $addon;
+        $this->slug = $slug;
+        $this->addon = $addon;
         $this->namespace = $namespace;
     }
 
@@ -61,12 +61,12 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $suffix = ucfirst(camel_case($this->slug));
         $entity = str_singular($suffix);
 
-        $class     = "{$entity}Model";
+        $class = "{$entity}Factory";
+        $model = "{$entity}Model";
         $namespace = $this->addon->getTransformedClass("{$entity}");
 
-        $model = $namespace . '\\' . $class;
 
-        $path = $this->addon->getPath("factories/{$entity}Factory.php");
+        $path = $this->addon->getPath("src/{$entity}/{$entity}Factory.php");
 
         $template = $filesystem->get(
             base_path("vendor/anomaly/streams-platform/resources/stubs/entity/factory.stub")
@@ -74,6 +74,6 @@ public function handle(Parser $parser, Filesystem $filesystem)
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
 
-        $filesystem->put($path, $parser->parse($template, compact('model')));
+        $filesystem->put($path, $parser->parse($template, compact('model', 'class', 'namespace')));
     }
 }

From eaab531e381eca9e484202237992b15452715b58 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 4 Mar 2021 16:43:10 -0600
Subject: [PATCH 198/256] Autoload addons:

---
 resources/config/addons.php | 12 ++++++++++++
 src/Addon/AddonManager.php  | 11 +++++++++++
 src/Addon/AddonPaths.php    |  5 ++---
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/resources/config/addons.php b/resources/config/addons.php
index fcae8de1d..f4bce797d 100644
--- a/resources/config/addons.php
+++ b/resources/config/addons.php
@@ -76,4 +76,16 @@
     'deferred' => [
         //'core/anomaly/pages-module'
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Autoload Addons
+    |--------------------------------------------------------------------------
+    |
+    | Disable autoloading on the fly to improve performance.
+    | Requires registering addons as local composer packages.
+    |
+    */
+
+    'autoload' => env('STREAMS_ADDONS_AUTOLOAD', true),
 ];
diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 250e6e4bb..81c353c25 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -2,6 +2,7 @@
 
 namespace Anomaly\Streams\Platform\Addon;
 
+use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Contracts\Container\Container;
 use Anomaly\Streams\Platform\Addon\Module\ModuleModel;
@@ -123,6 +124,16 @@ function () use ($installed) {
 
         $paths = $this->paths->all();
 
+        $addonsDirectory = base_path('addons');
+
+        if (config('streams::addons.autoload', true)) {
+            array_map(function ($path) {
+                $this->loader->load($path);
+            }, array_filter($paths, function ($path) use ($addonsDirectory) {
+                return Str::startsWith($path, $addonsDirectory);
+            }));
+        }
+
         /**
          * If we need to load then
          * loop and load all the addons.
diff --git a/src/Addon/AddonPaths.php b/src/Addon/AddonPaths.php
index 7b67d8d66..c2d3ce759 100644
--- a/src/Addon/AddonPaths.php
+++ b/src/Addon/AddonPaths.php
@@ -53,7 +53,7 @@ public function all()
         $core        = $this->core() ?: [];
         $shared      = $this->shared() ?: [];
         $application = $this->application() ?: [];
-        $application = $this->native() ?: [];
+        $native = $this->native() ?: [];
 
         // Testing only addons.
         $testing = $this->testing() ?: [];
@@ -66,7 +66,6 @@ public function all()
          * onto the front and back of
          * the paths respectively.
          */
-
         return array_unique(
             array_merge(
                 $eager,
@@ -75,7 +74,7 @@ public function all()
                         array_reverse(
                             array_merge(
                                 array_filter(
-                                    array_merge($core, $shared, $application, $configured, $testing)
+                                    array_merge($native, $core, $shared, $application, $configured, $testing)
                                 ),
                                 $deferred
                             )

From 6d5adfe3e71ca0d62836572d2621170b568fb8cb Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 4 Mar 2021 16:47:15 -0600
Subject: [PATCH 199/256] Docs

---
 docs/en/01.prologue/02.change-log.md    |  1 +
 docs/en/01.prologue/03.upgrade-guide.md | 23 ++++-------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 1a4cbc840..c324a06e8 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -31,6 +31,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ### [1.9.0] - 2021-03-05
 ### Added
 - Added support for native addons in vendor directory.
+- Config `streams::addons.autoload` which defaults to `true`.
 
 ### Changed
 - Added integrator to not throw such a fit if the addon class does not exist.
diff --git a/docs/en/01.prologue/03.upgrade-guide.md b/docs/en/01.prologue/03.upgrade-guide.md
index 80c09ca52..bf53d4a89 100644
--- a/docs/en/01.prologue/03.upgrade-guide.md
+++ b/docs/en/01.prologue/03.upgrade-guide.md
@@ -6,27 +6,12 @@ title: Upgrade Guide
 
 <div class="documentation__toc"></div>
 
-## Upgrading from 1.6 to 1.7
+## Upgrading from 1.8 to 1.9
 
-**Estimated Upgrade Time: 3 - 5 Minutes**
+**Estimated Upgrade Time: 0 - 5 Minutes**
 
 > We attempt to document every possible breaking change. Since some of these breaking changes are in obscure parts of the framework only a portion of these changes may actually affect your application.{.notice}
 
-### Replace TNT Dependency
+### Configuration Warning
 
-The Search Module is now the default engine for searching using basic a basic multi-stream index in database.
-
-To pull TNT back in for search configurations using it simply require it in your project:
-
-```bash
-composer require teamtnt/laravel-scout-tntsearch-driver
-```
-
-### Clean Up
-
-It's a good idea to rebuild the system and freshen up caching and performance utilities:
-
-```bash
-php artisan build
-php artisan refresh
-```
+Eager and deferred loading addons are typically overridden and may contain references to `core/` addons which have been deprecated. Please review the `/resources/streams/config/addons.php` file for said references.

From c9c5baf5574c3f24852eebb48ebffcdf71cb3b1a Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 18 Mar 2021 11:24:33 -0500
Subject: [PATCH 200/256] Docs

---
 docs/en/01.prologue/03.upgrade-guide.md  | 2 +-
 docs/en/03.reference/11.configuration.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/03.upgrade-guide.md b/docs/en/01.prologue/03.upgrade-guide.md
index bf53d4a89..d71872539 100644
--- a/docs/en/01.prologue/03.upgrade-guide.md
+++ b/docs/en/01.prologue/03.upgrade-guide.md
@@ -14,4 +14,4 @@ title: Upgrade Guide
 
 ### Configuration Warning
 
-Eager and deferred loading addons are typically overridden and may contain references to `core/` addons which have been deprecated. Please review the `/resources/streams/config/addons.php` file for said references.
+Eager and deferred loading addons are typically overridden and may contain references to `core/` addons which have been deprecated. Please review the `/resources/streams/config/addons.php` file for said references and update the addon location, which is now within the vendor directory.
diff --git a/docs/en/03.reference/11.configuration.md b/docs/en/03.reference/11.configuration.md
index 4bab5c8bf..b2d117402 100644
--- a/docs/en/03.reference/11.configuration.md
+++ b/docs/en/03.reference/11.configuration.md
@@ -109,7 +109,7 @@ Specify addons by path to load last. The path should be relative to your project
 
 ```php
 'deferred' => [
-    //'core/anomaly/pages-module'
+    //'vendor/anomaly/pages-module'
 ],
 ```
 

From 9728430e2d7bb0465d3fed65749e80f632244aaa Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 18 Mar 2021 11:26:05 -0500
Subject: [PATCH 201/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index c324a06e8..0ee4628f4 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -30,8 +30,8 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ### [1.9.0] - 2021-03-05
 ### Added
-- Added support for native addons in vendor directory.
+- Added support for addons in vendor directory.
 - Config `streams::addons.autoload` which defaults to `true`.
 
 ### Changed
-- Added integrator to not throw such a fit if the addon class does not exist.
+- Changed integrator to not throw such a fit if a suspected addon class does not exist.

From 263077539c67394b4a1114e0153634c799f7faa6 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 18 Mar 2021 11:26:50 -0500
Subject: [PATCH 202/256] Doc

---
 docs/en/01.prologue/02.change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 0ee4628f4..ce7047055 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,7 +28,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.9.0] - 2021-03-05
+### [1.9.0] - 2021-03-18
 ### Added
 - Added support for addons in vendor directory.
 - Config `streams::addons.autoload` which defaults to `true`.

From 589ce02e2feb6614e58b6a4d70b803e36a8528dd Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 5 Apr 2021 12:08:10 +0300
Subject: [PATCH 203/256] 1.9

---
 .gitignore                                    |   1 +
 composer.json                                 |  49 ++--
 docs/en/01.prologue/02.change-log.md          | 227 +-----------------
 docs/en/01.prologue/03.upgrade-guide.md       |  34 +--
 docs/en/03.reference/10.helpers.md            |  26 +-
 docs/en/03.reference/11.configuration.md      |  16 +-
 docs/en/06.entries/06.observers.md            |  20 +-
 docs/en/12.front-end-development/03.assets.md |   2 +-
 docs/en/12.front-end-development/07.forms.md  |   2 +-
 resources/config/addons.php                   |  12 +
 resources/config/themes.php                   |   4 +-
 resources/lang/tr/entry.php                   |   8 +-
 resources/lang/tr/message.php                 |   4 +-
 resources/stubs/entity/factory.stub           |  31 ++-
 resources/stubs/entity/model.stub             |   9 +
 resources/views/form/ajax/layout.twig         |   4 +-
 resources/views/form/partials/layout.twig     |   4 +-
 resources/views/grid/grid.twig                |   2 +-
 resources/views/table/ajax.twig               |   6 +-
 resources/views/table/ajax/filters.twig       |   2 +-
 resources/views/table/ajax/header.twig        |   2 +-
 resources/views/table/ajax/views.twig         |   2 +-
 resources/views/table/partials/body.twig      |   2 +-
 resources/views/table/partials/filters.twig   |   2 +-
 resources/views/table/partials/header.twig    |   2 +-
 resources/views/table/partials/views.twig     |   2 +-
 resources/views/table/standard.twig           |   6 +-
 resources/views/table/standard/filters.twig   |   2 +-
 resources/views/table/standard/views.twig     |   2 +-
 resources/views/table/table.twig              |   6 +-
 resources/views/tree/tree.twig                |   2 +-
 src/Addon/AddonCollection.php                 |  24 --
 src/Addon/AddonIntegrator.php                 |   4 +
 src/Addon/AddonLoader.php                     |   2 +-
 src/Addon/AddonManager.php                    |  33 ++-
 src/Addon/AddonPaths.php                      |  26 +-
 src/Addon/AddonProvider.php                   |  35 +--
 .../Extension/Command/InstallExtension.php    |   9 +-
 src/Addon/Module/Command/InstallModule.php    |   3 +
 src/Addon/Module/ModuleManager.php            |   4 +-
 src/Application/Application.php               |   2 +-
 .../Command/ConfigureTranslator.php           |   5 +
 .../Command/InitializeApplication.php         |  17 +-
 .../Command/ReloadEnvironmentFile.php         |  16 +-
 src/Artisan/ArtisanServiceProvider.php        |   3 +-
 src/Asset/Asset.php                           | 154 ++----------
 .../Migration/Console/MigrateCommand.php      |   1 +
 .../Migration/MigrationRepository.php         |   2 +-
 .../Migration/MigrationServiceProvider.php    |  16 +-
 src/Entry/EntryModel.php                      |   8 +-
 src/Exception/ExceptionHandler.php            |  21 +-
 src/Exception/ExceptionIdentifier.php         |   6 +-
 src/Field/Form/FieldFormButtons.php           |  16 +-
 src/Http/Kernel.php                           |  13 +
 src/Model/EloquentFormRepository.php          |   5 +-
 src/Model/EloquentQueryBuilder.php            |  10 +-
 .../Console/Command/WriteEntityFactory.php    |  12 +-
 .../Console/Command/WriteEntityModel.php      |   3 +-
 src/Stream/StreamObserver.php                 |  11 +
 src/StreamsEventProvider.php                  |  26 +-
 src/StreamsPlugin.php                         |  12 +-
 src/StreamsServiceProvider.php                |  25 +-
 src/Support/Currency.php                      |   4 +-
 src/Support/Markdown.php                      |   6 +-
 src/Support/Str.php                           |  10 +-
 src/Support/_helpers.php                      |  13 +
 .../Listener/LoadControlPanel.php             |   4 +-
 src/Ui/Form/Command/FlashFieldValues.php      |   2 +-
 src/Ui/Form/Command/PostForm.php              |   2 +-
 src/Ui/Table/Command/GetTableEntries.php      |   3 +-
 .../Filter/Contract/FilterInterface.php       |   8 +
 src/Ui/Table/Component/Filter/Filter.php      |  23 ++
 .../Listener/DeleteVersionableHistory.php     |   6 +-
 src/Version/Table/VersionTableBuilder.php     |  36 ++-
 src/View/Twig/Loader.php                      |   4 +-
 src/View/ViewComposer.php                     |   6 +-
 src/View/ViewIncludes.php                     |   4 +-
 .../Command/ReloadEnvironmentFileTest.php     |   4 +
 .../Command/WriteEnvironmentFileTest.php      |   4 +
 tests/Unit/Asset/AssetTest.php                |  71 ++----
 tests/Unit/Support/StrTest.php                |  50 ++++
 81 files changed, 571 insertions(+), 706 deletions(-)

diff --git a/.gitignore b/.gitignore
index 372f4e095..0d1abf8d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+composer.lock
 /bin
 /vendor
 /coverage
diff --git a/composer.json b/composer.json
index 3432ceaad..bdb1d98f0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "visiosoft/streams-platform",	
+    "name": "anomaly/streams-platform",
     "description": "A powerful, inclusive, modular PHP application engine built lovingly for Laravel.",
     "authors": [
         {
@@ -8,39 +8,26 @@
         }
     ],
     "require": {
-        "laravel/framework": "5.8.*",
-        "laravel/scout": "7.1.*",
-        "doctrine/dbal": "^2.6",
-        "intervention/image": "2.5.*",
-        "laravelcollective/html": "5.8.*",
+        "laravel/framework": "^8.0",
+        "laravel/helpers": "^1.0",
+        "laravel/scout": "^8.2",
+        "doctrine/dbal": "^2.6", 
+        "intervention/image": "^2.5.0",
+        "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
-        "barryvdh/laravel-debugbar": "3.2.*",
-        "coffeescript/coffeescript": "1.3.*",
-        "erusev/parsedown-extra": "0.7.1",
-        "cartalyst/assetic": "1.4.*",
-        "linkorb/jsmin-php": "1.0.0",
-        "leafo/scssphp": "0.7.*",
-        "natxet/cssmin": "3.0.*",
-        "oyejorge/less.php": "1.7.*",
-        "ptachoire/cssembed": "1.0.*",
-        "robclancy/presenter": "1.3.*",
-        "nicmart/string-template": "0.1.*",
-        "teamtnt/laravel-scout-tntsearch-driver": "7.1.*",
-        "symfony/yaml": "3.4.*",
-        "jenssegers/agent": "2.6.*",
-        "asm89/twig-cache-extension": "1.3.*",
-        "misd/linkify": "1.1.*",
+        "barryvdh/laravel-debugbar": "^3.3",
+        "erusev/parsedown-extra": "^0.7.1",
+        "linkorb/jsmin-php": "^1.0.0",
+        "robclancy/presenter": "^1.3.0",
+        "nicmart/string-template": "^0.1.0",
+        "symfony/yaml": "^4",
+        "jenssegers/agent": "^2.6.0",
+        "barryvdh/laravel-httpcache": "^0.3",
+        "asm89/twig-cache-extension": "^1.3.0",
+        "vstelmakh/url-highlight": "^2.2",
         "ezyang/htmlpurifier": "~4.0",
-        "barryvdh/laravel-httpcache": "^0.3.0",
         "tubalmartin/cssmin": "~4.0",
-        "mrclay/jsmin-php": "~2.4",
-        "fzaninotto/faker": "~1.4",
-        "symfony/console": "v4.4.8",
-        "symfony/debug": "v4.4.8",
-        "symfony/error-handler": "v4.4.8",
-        "symfony/http-kernel": "v4.4.8",
-        "symfony/mime": "v5.0.9",
-        "symfony/var-dumper": "v4.4.8"
+        "fzaninotto/faker": "~1.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 856eb9cff..ce7047055 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,225 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.7.33] - 2020-07-04
-- Added a deprecated CacheConfig in the correct PSR-4 autoloading location for backwards compatibility in `anomaly/settings-module`.
+### [1.9.0] - 2021-03-18
+### Added
+- Added support for addons in vendor directory.
+- Config `streams::addons.autoload` which defaults to `true`.
 
-### [1.7.32] - 2020-07-03
-#### Changed
-- Fixed _old_ autoloading case issue.
-
-
-### [1.7.31] - 2020-07-01
-#### Changed
-- Fixed autoloading on several platform classes.
-
-
-### [1.7.30] - 2020-06-15
-#### Changed
-- Updated Twig slightly for better support with PHP 7.4.
-
-
-### [1.7.29] - 2020-06-11
-#### Fixed
-- Replace a couple remaining "helper_function" instances with `Illuminate\Support\*` functionality.
-
-
-### [1.7.28] - 2020-06-09
-#### Fixed
-- Replaced all `str_contains()` with `Str::contains()` and unlocked Symfony dependencies.
-
-
-### [1.7.27] - 2020-06-01
-#### Fixed
-- Hotfixed PHP 8 `str_contains` function by locking dependencies before Symfony polyfil.
-
-
-### [1.7.26] - 2020-03-22
-#### Changed
-- Changed `ProxySession` to set the `secure cookie` flag to a sensible default.
-
-
-### [1.7.25] - 2020-03-16
-#### Fixed
-- Fixed issue where doubling up / erroneous form `locking` messages were being generated.
-
-
-### [1.7.24] - 2020-02-28
-#### Changed
-- Changed `makeImage` in `Image` to use `url` instead of `read` for making intervention instances.
-
-#### Fixed
-- Fixed issue with `Image` instances not being able to access local resources by path in order to properly `Orientate`.
-
-
-### [1.7.23] - 2020-02-21
-#### Added
-- `FiresCallbacks` and `Hookable` along with `registering` and `registered` callbacks to `AddonServiceProvider`.
-
-#### Changed
-- Optimized viewport declaration in `metadata.twig` stub.
-
-#### Fixed
-- Fixed issue where dropdown items were not being hidden by permissions in UI where applicable.
-- Fixed incorrect argument cast on `IconRegistry`.
-
-### [1.7.22] - 2020-01-21
-#### Fixed
-- Fixed issue where `--message` option was not working with `php artisan down`.
-
-
-### [1.7.21] - 2020-01-08
-#### Changed
-- Corrected the `.env` data in order to correctly set `APP_LOCALE`.
-
-
-### [1.7.20] - 2020-01-02
-#### Fixed
-- Fixed issue with deep attributes and custom validation not working properly.
-
-
-### [1.7.19] - 2019-12-19
-#### Changed
-- Remove unused `run` method in base seeder class. This blocked dependency injection due to declaration compatibility.
-
-
-### [1.7.18] - 2019-11-14
-#### Fixed
-- Fix issue with `config/streams.php` bindings and singletons not working.
-- Fix issue with `env:set` command mucking up the formatting in the file.
-
-
-### [1.7.17] - 2019-11-14
-#### Fixed
-- Fixed issue with remote assets and non-root hosting locations.
-
-#### Added
-- Added `findWithTrashed($id)` shortcut method to base repositories.
-
-
-### [1.7.16] - 2019-11-06
-#### Changed
-- Escaped the URL in `constants.twig` partial.
-
-
-### [1.7.15] - 2019-10-28
-#### Added
-- Added default ID support to field types.
-- Added "for" attribute to input wrapper view.
-
-
-### [1.7.14] - 2019-10-22
-#### Fixed
-- Fixed issue when setting template data using `template` helper.
-- Fixed issue where field filters for non-existing fields caused a fatal error.
-
-
-### [1.7.13] - 2019-10-16
-#### Added
-- Added support for non-dot single stream arguments (namespace is same as slug) to `GetStream` command.
-
-
-### [1.7.12] - 2019-10-15
-#### Added
-- Added very simple support for routing views from array.
-
-#### Fixed
-- Fixed edge case situation in parser where route parameters need a bit of cleaning.
-
-
-### [1.7.11] - 2019-10-10
-#### Fixed
-- Fixed issue where translated entries were potentially duplicating results due to default ordering.
-
-
-### [1.7.10] - 2019-09-30
-#### Fixed
-- Fixed issue where responses without cookie support (media stream) would result in fatal errors.
-
-
-### [1.7.9] - 2019-09-24
-#### Fixed
-- Fixed issue where responses without cookie support (media stream) would result in fatal errors.
-
-
-### [1.7.8] - 2019-09-19
-#### Fixed
-- Fixed issue with installer where .env was not reloading properly since moving to Laravel 5.8
-
-
-### [1.7.7] - 2019-09-11
-#### Fixed
-- Fixed issue with button guesser leaving route objects in buttons and thus breaking form views.
-
-
-### [1.7.6] - 2019-09-10
-#### Changed
-- Cleaned up message output from `build` command.
-
-#### Fixed
-- Fixed issue with validation extender not passing along unique field types per extending validation rule.
-
-
-### [1.7.5] - 2019-09-09
-#### Fixed
-- Fixed issue with `inline` images when using SVG sources.
-- Fix active theme resolution in view loader. View composer was unaffected.
-
-#### Changed
-- Changed `ViewOverrides` collection to force dot notation view names.
-
-
-### [1.7.4] - 2019-09-06
-#### Added
-- Added coverage configuration to `phpunit.stub`.
-
-#### Changed
-- Bumped to `"axios": "^0.19",` in `package.theme.stub`.
-
-#### Fixed
-- Fixed `cleanup` functionality in `\Anomaly\Streams\Platform\Field\FieldRepository`.
-- Fixed `cleanup` functionality in `\Anomaly\Streams\Platform\Stream\StreamRepository`.
-
-
-### [1.7.3] - 2019-08-29
-#### Fixed
-- Fixed issue where `\Anomaly\Streams\Platform\Database\Migration\Console\MigrateMakeCommand` was out of date with Laravel. Threw error on missing `--fullpath` option.
-
-
-### [1.7.2] - 2019-08-18
-#### Fixed
-- Fixed issue where users would be getting logged out after viewing pages cached by HTTPCACHE.
-
-#### Changed
-- Moved cookie middleware in `Kernel` to after session start just like Laravel.
-
-#### Added
-- Added `session_proxy` boolean flag to mark logged in users to pre-boot services like HTTPCACHE.
-
-
-### [1.7.1] - 2019-08-16
-#### Added
-- Added `config:cache` control to `refresh` command.
-- Added `route:cache` control to `refresh` command.
-- The `refresh` command now clears `bootstrap/cache/services.php`.
-- The `refresh` command now clears `bootstrap/cache/packages.php`.
-
-
-### [1.7.0] - 2019-08-06
-#### Changed
-- Updated `laravel/framework` to `5.8.*`.
-- Updated `laravel/scout` to `7.1.*`.
-- Updated `intervention/image` to `2.5.*`.
-- Updated `laravelcollective/html` to `5.8.*`.
-- Updated `teamtnt/laravel-scout-tntsearch-driver` to `7.1.*`.
-- Changed `add` to `include` in `\Anomaly\Streams\Platform\View\ViewIncludes` to comply with Laravel 5.8.
-- Changed all instances of `\Illuminate\Contracts\Events\Dispatcher` to use `event`.
-
-#### Removed
-- Removed `symfony/class-loader` dependency (it's in Laravel).
-- Removed `add` method from `\Anomaly\Streams\Platform\View\ViewOverrides` (use `put`).
-- Removed `add` method from `\Anomaly\Streams\Platform\View\ViewMobileOverrides` (use `put`).
-- Removed unused `\Anomaly\Streams\Platform\Stream\Console\Event\StreamsIsRefreshing`.
-
-#### Added
-- Added `streams:index` to `build` command.
+### Changed
+- Changed integrator to not throw such a fit if a suspected addon class does not exist.
diff --git a/docs/en/01.prologue/03.upgrade-guide.md b/docs/en/01.prologue/03.upgrade-guide.md
index ed7851d58..d71872539 100644
--- a/docs/en/01.prologue/03.upgrade-guide.md
+++ b/docs/en/01.prologue/03.upgrade-guide.md
@@ -6,38 +6,12 @@ title: Upgrade Guide
 
 <div class="documentation__toc"></div>
 
-## Upgrading from 1.6 to 1.7
+## Upgrading from 1.8 to 1.9
 
-**Estimated Upgrade Time: 1 - 2 Minutes**
+**Estimated Upgrade Time: 0 - 5 Minutes**
 
 > We attempt to document every possible breaking change. Since some of these breaking changes are in obscure parts of the framework only a portion of these changes may actually affect your application.{.notice}
 
-### Update Search Configuration
+### Configuration Warning
 
-Update your configuration according to the following source files:
-
-- [https://github.com/pyrocms/pyrocms/blob/3.7/config/logging.php](https://github.com/pyrocms/pyrocms/blob/3.7/config/logging.php)
-- [https://github.com/pyrocms/pyrocms/blob/3.7/config/debugbar.php](https://github.com/pyrocms/pyrocms/blob/3.7/config/debugbar.php)
-- [https://github.com/pyrocms/pyrocms/blob/3.7/config/httpcache.php](https://github.com/pyrocms/pyrocms/blob/3.7/config/httpcache.php)
-
-### Disable Package Discovery for Laravel
-
-Disable package discovery by appending your `composer.json` file: https://github.com/pyrocms/pyrocms/blob/3.7/composer.json#L127-L131
-
-### Run Migrations
-
-Migrate the core as well as all installed addons:
-
-```bash
-php artisan migrate --path=vendor/visiosoft/streams-platform/migrations/application
-php artisan migrate --all-addons
-```
-
-### Clean Up
-
-It's a good idea to rebuild the system and freshen up caching and performance utilities:
-
-```bash
-php artisan build
-php artisan refresh
-```
+Eager and deferred loading addons are typically overridden and may contain references to `core/` addons which have been deprecated. Please review the `/resources/streams/config/addons.php` file for said references and update the addon location, which is now within the vendor directory.
diff --git a/docs/en/03.reference/10.helpers.md b/docs/en/03.reference/10.helpers.md
index 87907f0b0..580f9f844 100644
--- a/docs/en/03.reference/10.helpers.md
+++ b/docs/en/03.reference/10.helpers.md
@@ -58,7 +58,7 @@ echo render('Welcome {{ user().username }}');
 
 ### filesize\_for\_humans
 
-The `filesize_for_humans` returns the provided `bytes` as a human readable filesize string.
+The `filesize_for_humans` function returns the provided `bytes` as a human readable filesize string.
  
  ```php
  filesize_for_humans($bytes, $decimals = 2)
@@ -66,3 +66,27 @@ The `filesize_for_humans` returns the provided `bytes` as a human readable files
  echo filesize_for_humans(5000000, 1);
  // 500 kB
  ```
+
+### console
+
+The `console` function returns the CLI console instance.
+ 
+ ```php
+ console()->info('Why hello there.');
+ ```
+
+### decorate
+
+The `decorate` function decorates the `target` object or returns it as is if already decorated.
+ 
+ ```php
+ $presenter = decorate($target);
+ ```
+
+### undecorate
+
+The `undecorate` function undecorates the `target` object or returns it as is if already decorated.
+ 
+ ```php
+ $object = undecorate($target);
+ ```
diff --git a/docs/en/03.reference/11.configuration.md b/docs/en/03.reference/11.configuration.md
index 99ccb191e..b2d117402 100644
--- a/docs/en/03.reference/11.configuration.md
+++ b/docs/en/03.reference/11.configuration.md
@@ -95,7 +95,7 @@ Specify addons by path to load first. The path should be relative to your projec
 
 ```php
 'eager' => [
-    //'core/anomaly/redirects-module'
+    //'vendor/anomaly/redirects-module'
 ],
 ```
 
@@ -109,7 +109,7 @@ Specify addons by path to load last. The path should be relative to your project
 
 ```php
 'deferred' => [
-    //'core/anomaly/pages-module'
+    //'vendor/anomaly/pages-module'
 ],
 ```
 
@@ -819,15 +819,15 @@ LOCKING_ENABLED=true
 Specify the default `admin` theme.
 
 ```php
-'admin' => env('ADMIN_THEME', 'anomaly.theme.anomaly'),
+'admin' => env('ADMIN_THEME', 'pyrocms.theme.accelerant'),
 ```
 
 ```php
-config(['streams::themes.admin' => 'anomaly.theme.anomaly');
+config(['streams::themes.admin' => 'pyrocms.theme.accelerant');
 ```
 
 ```bash
-ADMIN_THEME=anomaly.theme.anomaly
+ADMIN_THEME=pyrocms.theme.accelerant
 ```
 
 ### Standard
@@ -835,13 +835,13 @@ ADMIN_THEME=anomaly.theme.anomaly
 Specify the default `standard` (public facing) theme.
 
 ```php
-'standard' => env('STANDARD_THEME', 'anomaly.theme.starter'),
+'standard' => env('STANDARD_THEME', 'pyrocms.theme.starter'),
 ```
 
 ```php
-config(['streams::themes.standard' => 'anomaly.theme.starter');
+config(['streams::themes.standard' => 'pyrocms.theme.starter');
 ```
 
 ```bash
-STANDARD_THEME=anomaly.theme.starter
+STANDARD_THEME=pyrocms.theme.starter
 ```
diff --git a/docs/en/06.entries/06.observers.md b/docs/en/06.entries/06.observers.md
index eb1ef8fd2..f7d747d55 100644
--- a/docs/en/06.entries/06.observers.md
+++ b/docs/en/06.entries/06.observers.md
@@ -83,11 +83,11 @@ public function creating(EntryInterface $entry)
 This event is fired just after the `entry` is created.
  
 ```php
-public function creating(EntryInterface $entry)
+public function created(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::creating($entry);
+    parent::created($entry);
 }
 ```
 
@@ -109,11 +109,11 @@ public function updating(EntryInterface $entry)
 This event is fired just after the `entry` is updated.
  
 ```php
-public function updating(EntryInterface $entry)
+public function updated(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::updating($entry);
+    parent::updated($entry);
 }
 ```
 
@@ -148,11 +148,11 @@ public function saving(EntryInterface $entry)
 This event is fired just after the `entry` is saved.
  
 ```php
-public function saving(EntryInterface $entry)
+public function saved(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::saving($entry);
+    parent::saved($entry);
 }
 ```
 
@@ -174,11 +174,11 @@ public function deleting(EntryInterface $entry)
 This event is fired just after the `entry` is deleted.
  
 ```php
-public function deleting(EntryInterface $entry)
+public function deleted(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::deleting($entry);
+    parent::deleted($entry);
 }
 ```
 
@@ -213,10 +213,10 @@ public function restoring(EntryInterface $entry)
 This event is fired just after the `entry` is restored.
  
 ```php
-public function restoring(EntryInterface $entry)
+public function restored(EntryInterface $entry)
 {
     // Do stuff.
     
-    parent::restoring($entry);
+    parent::restored($entry);
 }
 ```
diff --git a/docs/en/12.front-end-development/03.assets.md b/docs/en/12.front-end-development/03.assets.md
index 86d92c396..008dcd3ec 100644
--- a/docs/en/12.front-end-development/03.assets.md
+++ b/docs/en/12.front-end-development/03.assets.md
@@ -91,7 +91,7 @@ $asset->add("collection.css", "theme::example.scss", ["min", "live"]);
 - `less`: parses LESS into CSS
 - `styl`: parses STYL into CSS
 - `scss`: parses SCSS into CSS
-- `parse`: parses content with Twig
+- `parse`: parses content with Twig. Uses an alternate comment syntax `{* *}` to prevent clashes with CSS selectors.
 - `coffee`: compiles CoffeeScript into Javascript
 - `embed`: embeds image data in your stylesheets
 - `live`: refreshes content when LIVE_ASSETS is enabled
diff --git a/docs/en/12.front-end-development/07.forms.md b/docs/en/12.front-end-development/07.forms.md
index df12b6a15..69b1e669c 100644
--- a/docs/en/12.front-end-development/07.forms.md
+++ b/docs/en/12.front-end-development/07.forms.md
@@ -23,7 +23,7 @@ The `render` method will trigger display but it is optional as `__toString` will
 You may want to take more control and set the form to a variable and use it.
 
 ```twig
-{% set form = form('books', 'reviews') %}
+{% set form = form('books', 'reviews').get() %}
 
 {{ form.open|raw }}
 
diff --git a/resources/config/addons.php b/resources/config/addons.php
index fcae8de1d..f4bce797d 100644
--- a/resources/config/addons.php
+++ b/resources/config/addons.php
@@ -76,4 +76,16 @@
     'deferred' => [
         //'core/anomaly/pages-module'
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Autoload Addons
+    |--------------------------------------------------------------------------
+    |
+    | Disable autoloading on the fly to improve performance.
+    | Requires registering addons as local composer packages.
+    |
+    */
+
+    'autoload' => env('STREAMS_ADDONS_AUTOLOAD', true),
 ];
diff --git a/resources/config/themes.php b/resources/config/themes.php
index 430b73ff8..7de1cb15c 100644
--- a/resources/config/themes.php
+++ b/resources/config/themes.php
@@ -11,6 +11,6 @@
     |
     */
 
-    'admin'    => env('ADMIN_THEME', 'anomaly.theme.anomaly'),
-    'standard' => env('STANDARD_THEME', 'anomaly.theme.starter')
+    'admin'    => env('ADMIN_THEME', 'pyrocms.theme.accelerant'),
+    'standard' => env('STANDARD_THEME', 'pyrocms.theme.starter')
 ];
diff --git a/resources/lang/tr/entry.php b/resources/lang/tr/entry.php
index 043f7b9cb..82741e5d5 100644
--- a/resources/lang/tr/entry.php
+++ b/resources/lang/tr/entry.php
@@ -3,8 +3,8 @@
 return [
     'id'         => 'ID',
     'name'       => 'Giriş',
-    'created_at' => 'Oluşturuldu',
-    'created_by' => 'Tarafından oluşturuldu',
-    'updated_at' => 'Yüklendi',
-    'updated_by' => 'Tarafından yüklendi',
+    'created_at' => 'Kayıt tarihi',
+    'created_by' => 'Oluşturan kullanıcı',
+    'updated_at' => 'Güncelleme tarihi',
+    'updated_by' => 'Güncelletyen kullanıcı',
 ];
diff --git a/resources/lang/tr/message.php b/resources/lang/tr/message.php
index 197c623d9..906b6492c 100644
--- a/resources/lang/tr/message.php
+++ b/resources/lang/tr/message.php
@@ -10,8 +10,8 @@
     'access_denied'             => 'Erişim reddedildi.',
     'no_fields_available'       => 'Alan yok',
     'delete_restrict'           => 'Silinemiyor: ad sınırlı olduğundan adı. Önce ilgili ": ilişki" yi silin.',
-    'delete_success'            => ':count satır başarıyla silindi.',
-    'reorder_success'           => ':count satır başarıyla yeniden sıralandı.',
+    'delete_success'            => ':count satır (lar) başarıyla silindi.',
+    'reorder_success'           => ':count satır (lar) başarıyla yeniden sıralandı.',
     'csrf_token_mismatch'       => 'Güvenlik simgenizin süresi doldu. Lütfen formu tekrar gönderin.',
     'form_expired'              => 'Formun süresi doldu. Lütfen tekrar deneyin.',
     'create_success'            => ':name başarıyla oluşturuldu.',
diff --git a/resources/stubs/entity/factory.stub b/resources/stubs/entity/factory.stub
index 831d90e0f..0149faf14 100644
--- a/resources/stubs/entity/factory.stub
+++ b/resources/stubs/entity/factory.stub
@@ -1,10 +1,23 @@
-<?php
-
-$factory->define(
-    {model}::class,
-    function (Faker\Generator $faker) {
-        return [
-            //'title' => $faker->words(2),
-        ];
+<?php namespace {namespace};
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class {class} extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var {model}
+     */
+    protected $model = {model}::class;
+
+
+    /**
+     * @return array
+     * @throws \Exception
+     */
+    public function definition()
+    {
+        return [];
     }
-);
+}
diff --git a/resources/stubs/entity/model.stub b/resources/stubs/entity/model.stub
index 8c0f9174f..8887510e8 100644
--- a/resources/stubs/entity/model.stub
+++ b/resources/stubs/entity/model.stub
@@ -2,8 +2,17 @@
 
 use {interface};
 use {base};
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class {class} extends {extends} implements {implements}
 {
+    use HasFactory;
 
+    /**
+     * @return {factory}
+     */
+    protected static function newFactory()
+    {
+        return {factory}::new();
+    }
 }
diff --git a/resources/views/form/ajax/layout.twig b/resources/views/form/ajax/layout.twig
index 1322679f7..36d7ad186 100644
--- a/resources/views/form/ajax/layout.twig
+++ b/resources/views/form/ajax/layout.twig
@@ -1,11 +1,11 @@
-{% if form.fields.empty %}
+{% if form.fields.isEmpty() %}
     <div class="panel">
         <div class="panel-body">
             {{ trans("streams::message.no_fields_available") }}
         </div>
     </div>
 {% else %}
-    {% if not form.sections.empty() %}
+    {% if not form.sections.isEmpty() %}
         {% for section in form.sections %}
             {% if section.view %}
                 {% include section.view %}
diff --git a/resources/views/form/partials/layout.twig b/resources/views/form/partials/layout.twig
index c2dd64bc8..3eb76a693 100644
--- a/resources/views/form/partials/layout.twig
+++ b/resources/views/form/partials/layout.twig
@@ -1,4 +1,4 @@
-{% if form.fields.empty %}
+{% if form.fields.isEmpty() %}
 
     <div class="card">
         <div class="card-block card-body">
@@ -8,7 +8,7 @@
 
 {% else %}
 
-    {% if not form.sections.empty() %}
+    {% if not form.sections.isEmpty() %}
 
         {% for section in form.sections %}
             {% if section.view %}
diff --git a/resources/views/grid/grid.twig b/resources/views/grid/grid.twig
index f34009dd5..3d3f957ff 100644
--- a/resources/views/grid/grid.twig
+++ b/resources/views/grid/grid.twig
@@ -4,7 +4,7 @@
 
     <div class="container-fluid">
 
-        {% if not grid.items.empty() %}
+        {% if not grid.items.isEmpty() %}
             <ul class="grid grid--sortable sortable row">
                 {% for item in grid.items %}
                     <li data-id="{{ item.id }}">
diff --git a/resources/views/table/ajax.twig b/resources/views/table/ajax.twig
index 608af21b8..a43e50d49 100644
--- a/resources/views/table/ajax.twig
+++ b/resources/views/table/ajax.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -13,7 +13,7 @@
 {{ view("streams::table/ajax/views", {'table': table}) }}
 {{ view("streams::table/ajax/filters", {'table': table}) }}
 
-{% if table.rows.empty() %}
+{% if table.rows.isEmpty() %}
     {% block no_results %}
         <div class="no-results">
             <p>
@@ -23,7 +23,7 @@
     {% endblock %}
 {% endif %}
 
-{% if not table.rows.empty() %}
+{% if not table.rows.isEmpty() %}
 
     {{ form_open({'url': url_full(), 'class': 'ajax'}) }}
 
diff --git a/resources/views/table/ajax/filters.twig b/resources/views/table/ajax/filters.twig
index b68c73cf2..967b002e8 100644
--- a/resources/views/table/ajax/filters.twig
+++ b/resources/views/table/ajax/filters.twig
@@ -1,4 +1,4 @@
-{% if not table.filters.empty() %}
+{% if not table.filters.isEmpty() %}
     <div class="table-filters">
 
         {{ form_open({'method': 'get', 'id': 'filters', 'url': url_full(), 'class': 'ajax form-inline'}) }}
diff --git a/resources/views/table/ajax/header.twig b/resources/views/table/ajax/header.twig
index 7e4c90e74..5e0af80c6 100644
--- a/resources/views/table/ajax/header.twig
+++ b/resources/views/table/ajax/header.twig
@@ -5,7 +5,7 @@
         <th style="width: 30px;">&nbsp;</th>
     {% endif %}
 
-    {% if not table.actions.empty() %}
+    {% if not table.actions.isEmpty() %}
         <th style="width: 30px;">
             <input data-toggle="all" type="checkbox">
         </th>
diff --git a/resources/views/table/ajax/views.twig b/resources/views/table/ajax/views.twig
index 0c582f919..43250ffc0 100644
--- a/resources/views/table/ajax/views.twig
+++ b/resources/views/table/ajax/views.twig
@@ -1,4 +1,4 @@
-{% if not table.views.empty() %}
+{% if not table.views.isEmpty() %}
     <nav class="navbar navbar-light">
         <div class="nav navbar-nav">
             {% for view in table.views %}
diff --git a/resources/views/table/partials/body.twig b/resources/views/table/partials/body.twig
index 5954abae8..fdb6f85f0 100644
--- a/resources/views/table/partials/body.twig
+++ b/resources/views/table/partials/body.twig
@@ -9,7 +9,7 @@
             </td>
         {% endif %}
 
-        {% if not table.actions.empty() %}
+        {% if not table.actions.isEmpty() %}
             <td>
                 <input type="checkbox" data-toggle="action" name="{{ row.table.options.prefix }}id[]" value="{{ row.key }}"/>
             </td>
diff --git a/resources/views/table/partials/filters.twig b/resources/views/table/partials/filters.twig
index 1c4b67f21..28a676770 100644
--- a/resources/views/table/partials/filters.twig
+++ b/resources/views/table/partials/filters.twig
@@ -1,4 +1,4 @@
-{% if not table.filters.empty() %}
+{% if not table.filters.isEmpty() %}
     <div class="card card-container">
         {{ form_open({'method': 'get', 'id': 'filters', 'url': url_full(), 'class': 'form-inline'}) }}
         <input type="hidden" name="{{ table.options.prefix }}limit" value="{{ table.options.limit }}">
diff --git a/resources/views/table/partials/header.twig b/resources/views/table/partials/header.twig
index 218000a3e..af36dd1c0 100644
--- a/resources/views/table/partials/header.twig
+++ b/resources/views/table/partials/header.twig
@@ -5,7 +5,7 @@
         <th style="width: 30px;">&nbsp;</th>
     {% endif %}
 
-    {% if not table.actions.empty() %}
+    {% if not table.actions.isEmpty() %}
         <th style="width: 30px;">
             <input data-toggle="all" type="checkbox">
         </th>
diff --git a/resources/views/table/partials/views.twig b/resources/views/table/partials/views.twig
index 7f8d3f476..1a9f2ea37 100644
--- a/resources/views/table/partials/views.twig
+++ b/resources/views/table/partials/views.twig
@@ -1,4 +1,4 @@
-{% if not table.views.empty() %}
+{% if not table.views.isEmpty() %}
     <div class="card">
 
         <nav class="navbar navbar-light">
diff --git a/resources/views/table/standard.twig b/resources/views/table/standard.twig
index b1ba54e81..9367711cc 100644
--- a/resources/views/table/standard.twig
+++ b/resources/views/table/standard.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -13,8 +13,8 @@
 
 {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
-{% if not table.rows.empty() %}
-    {{ form_open({ 'url': url_full() }) }}
+{% if not table.rows.isEmpty() %}
+    {{ form_open({ 'url': table.options.url ?: url_full() }) }}
     <div class="table-stack">
         <table
                 class="
diff --git a/resources/views/table/standard/filters.twig b/resources/views/table/standard/filters.twig
index 18125ae62..91095489a 100644
--- a/resources/views/table/standard/filters.twig
+++ b/resources/views/table/standard/filters.twig
@@ -1,4 +1,4 @@
-{% if not table.filters.empty() %}
+{% if not table.filters.isEmpty() %}
     {{ form_open({'method': 'get', 'id': 'filters', 'url': url_full(), 'class': 'form-inline'}) }}
     <input type="hidden" name="{{ table.options.prefix }}limit" value="{{ table.options.limit }}">
     <input type="hidden" name="{{ table.options.prefix }}view" value="{{ table.views.active().getSlug() }}">
diff --git a/resources/views/table/standard/views.twig b/resources/views/table/standard/views.twig
index d173dff53..e86ef88bc 100644
--- a/resources/views/table/standard/views.twig
+++ b/resources/views/table/standard/views.twig
@@ -1,4 +1,4 @@
-{% if not table.views.empty() %}
+{% if not table.views.isEmpty() %}
     <nav class="navbar navbar-light">
         <div class="nav navbar-nav">
             {% for view in table.views %}
diff --git a/resources/views/table/table.twig b/resources/views/table/table.twig
index b949c6ac8..07b09ecf0 100644
--- a/resources/views/table/table.twig
+++ b/resources/views/table/table.twig
@@ -1,6 +1,6 @@
 {{ asset_add("scripts.js", "streams::js/table/table.js") }}
 
-{% if not actions.empty() %}
+{% if not actions.isEmpty() %}
     {{ asset_add("scripts.js", "streams::js/table/actions.js") }}
 {% endif %}
 
@@ -15,11 +15,11 @@
 
     {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }}
 
-    {% if not table.rows.empty() %}
+    {% if not table.rows.isEmpty() %}
         {% block card %}
             <div class="card">
 
-                {{ form_open({ 'url': url_full() }) }}
+                {{ form_open({ 'url': table.options.url ?: url_full() }) }}
                 <div class="table-stack">
                     <table
                             class="
diff --git a/resources/views/tree/tree.twig b/resources/views/tree/tree.twig
index 43d31c08c..574022eab 100644
--- a/resources/views/tree/tree.twig
+++ b/resources/views/tree/tree.twig
@@ -7,7 +7,7 @@
 
     <div class="container-fluid">
 
-        {% if not tree.items.empty() %}
+        {% if not tree.items.isEmpty() %}
             <ul class="tree tree--sortable sortable">
                 {{ macro.tree(tree.items.root(), tree) }}
             </ul>
diff --git a/src/Addon/AddonCollection.php b/src/Addon/AddonCollection.php
index 77168c40b..18a388bc0 100644
--- a/src/Addon/AddonCollection.php
+++ b/src/Addon/AddonCollection.php
@@ -1,7 +1,5 @@
 <?php namespace Anomaly\Streams\Platform\Addon;
 
-use Anomaly\Streams\Platform\Addon\Extension\Extension;
-use Anomaly\Streams\Platform\Addon\Module\Module;
 use Illuminate\Support\Collection;
 
 /**
@@ -243,28 +241,6 @@ public function withAnyConfig(array $keys)
         return self::make($addons);
     }
 
-    /**
-     * Sort through each item with a callback.
-     *
-     * @param  callable|null $callback
-     * @return static
-     */
-    public function sort(callable $callback = null)
-    {
-        return parent::sort(
-            $callback ?: function ($a, $b) {
-
-                /* @var Addon $a */
-                /* @var Addon $b */
-                if ($a->getSlug() == $b->getSlug()) {
-                    return 0;
-                }
-
-                return ($a->getSlug() < $b->getSlug()) ? -1 : 1;
-            }
-        );
-    }
-
     /**
      * Return only installable addons.
      *
diff --git a/src/Addon/AddonIntegrator.php b/src/Addon/AddonIntegrator.php
index 7990cd031..2783409c9 100644
--- a/src/Addon/AddonIntegrator.php
+++ b/src/Addon/AddonIntegrator.php
@@ -113,6 +113,10 @@ public function register($path, $namespace, $enabled, $installed)
             ) . studly_case($type);
 
         /* @var Addon|Module|Extension|Twig_ExtensionInterface $addon */
+        if (!class_exists($class)) {
+            return null;
+        }
+
         $addon = app($class)
             ->setPath($path)
             ->setType($type)
diff --git a/src/Addon/AddonLoader.php b/src/Addon/AddonLoader.php
index 291fbbba7..19c91ea83 100644
--- a/src/Addon/AddonLoader.php
+++ b/src/Addon/AddonLoader.php
@@ -121,7 +121,7 @@ public function classLoader()
      */
     public function dump()
     {
-        $process = new Process('composer dump-autoload');
+        $process = new Process(['composer dump-autoload']);
 
         $process->run();
         $process->wait();
diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 2a1460e54..30a5039e7 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -1,9 +1,13 @@
-<?php namespace Anomaly\Streams\Platform\Addon;
+<?php
 
-use Anomaly\Streams\Platform\Addon\Event\AddonsHaveRegistered;
-use Anomaly\Streams\Platform\Addon\Extension\ExtensionModel;
-use Anomaly\Streams\Platform\Addon\Module\ModuleModel;
+namespace Anomaly\Streams\Platform\Addon;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Contracts\Container\Container;
+use Anomaly\Streams\Platform\Addon\Module\ModuleModel;
+use Anomaly\Streams\Platform\Addon\Extension\ExtensionModel;
+use Anomaly\Streams\Platform\Addon\Event\AddonsHaveRegistered;
 
 /**
  * Class AddonManager
@@ -120,6 +124,16 @@ function () use ($installed) {
 
         $paths = $this->paths->all();
 
+        $addonsDirectory = base_path('addons');
+
+        if (config('streams::addons.autoload', true)) {
+            array_map(function ($path) {
+                $this->loader->load($path);
+            }, array_filter($paths, function ($path) use ($addonsDirectory) {
+                return Str::startsWith($path, $addonsDirectory);
+            }));
+        }
+
         /**
          * If we need to load then
          * loop and load all the addons.
@@ -161,8 +175,13 @@ function () use ($installed) {
                 in_array($namespace, $installed)
             );
 
+            /**
+             * It's not an addon, k.
+             * Debug your addon by noting it not being loaded O_O
+             * Exception was forward...
+             */
             if (!$addon) {
-                throw new \Exception("Addon path not found [{$path}]. Check [resources/streams/config/addons.php]");
+                continue;
             }
 
             foreach ($addon->getAddons() as $class) {
@@ -202,7 +221,7 @@ function () use ($installed) {
      */
     protected function getEnabledAddonNamespaces()
     {
-        if (!env('INSTALLED')) {
+        if (!env('INSTALLED') || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
             return [];
         }
 
@@ -247,7 +266,7 @@ function () {
      */
     protected function getInstalledAddonNamespaces()
     {
-        if (!env('INSTALLED')) {
+        if (!env('INSTALLED') || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
             return [];
         }
 
diff --git a/src/Addon/AddonPaths.php b/src/Addon/AddonPaths.php
index 3011e0fd6..7b5b56274 100644
--- a/src/Addon/AddonPaths.php
+++ b/src/Addon/AddonPaths.php
@@ -53,6 +53,7 @@ public function all()
         $core        = $this->core() ?: [];
         $shared      = $this->shared() ?: [];
         $application = $this->application() ?: [];
+        $native = $this->native() ?: [];
 
         // Testing only addons.
         $testing = $this->testing() ?: [];
@@ -65,7 +66,6 @@ public function all()
          * onto the front and back of
          * the paths respectively.
          */
-
         return array_unique(
             array_merge(
                 $eager,
@@ -74,7 +74,7 @@ public function all()
                         array_reverse(
                             array_merge(
                                 array_filter(
-                                    array_merge($core, $shared, $application, $configured, $testing)
+                                    array_merge($native, $core, $shared, $application, $configured, $testing)
                                 ),
                                 $deferred
                             )
@@ -115,6 +115,28 @@ function ($path) {
         );
     }
 
+    /**
+     * Return all native addon paths.
+     *
+     * @return bool
+     */
+    public function native()
+    {
+        $path = base_path('vendor');
+
+        if (!is_dir($path)) {
+            return false;
+        }
+        
+        $paths = [];
+
+        foreach (config('streams::addons.types') as $type) {
+            $paths = array_merge($paths, glob("{$path}/*/*-{$type}", GLOB_ONLYDIR));
+        }
+        
+        return $paths;
+    }
+    
     /**
      * Return all core addon paths in a given folder.
      *
diff --git a/src/Addon/AddonProvider.php b/src/Addon/AddonProvider.php
index 85259e8fa..b2a9c1151 100644
--- a/src/Addon/AddonProvider.php
+++ b/src/Addon/AddonProvider.php
@@ -6,7 +6,6 @@
 use Illuminate\Routing\Router;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Traits\Macroable;
-use Illuminate\Database\Eloquent\Factory;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Console\Events\ArtisanStarting;
@@ -53,13 +52,6 @@ class AddonProvider
      */
     protected $router;
 
-    /**
-     * The factory manager.
-     *
-     * @var Factory
-     */
-    protected $factory;
-
     /**
      * The scheduler instance.
      *
@@ -166,8 +158,6 @@ public function register(Addon $addon)
         $this->registerGroupMiddleware($provider);
         $this->registerRouteMiddleware($provider);
 
-        $this->registerFactories($addon);
-
         if (method_exists($provider, 'register')) {
             $this->application->call([$provider, 'register'], ['provider' => $this]);
         }
@@ -234,21 +224,6 @@ function (ArtisanStarting $event) use ($commands) {
         }
     }
 
-    /**
-     * Register the addon commands.
-     *
-     * @param Addon $addon
-     */
-    protected function registerFactories(Addon $addon)
-    {
-        if (
-            (env('APP_ENV') == 'testing' || $this->application->runningInConsole())
-            && is_dir($factories = $addon->getPath('factories'))
-        ) {
-            app(Factory::class)->load($factories);
-        }
-    }
-
     /**
      * Bind class aliases.
      *
@@ -358,7 +333,10 @@ protected function registerRoutes(AddonServiceProvider $provider, Addon $addon)
             $middleware  = array_pull($route, 'middleware', []);
             $constraints = array_pull($route, 'constraints', []);
 
-            array_set($route, 'streams::addon', $addon->getNamespace());
+
+            if (!isset($route['streams::addon'])) {
+                array_set($route, 'streams::addon', $addon->getNamespace());
+            }
 
             if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                 $this->router->resource($uri, $route['uses']);
@@ -418,7 +396,10 @@ function (Router $router) use ($routes, $addon) {
                     $middleware  = array_pull($route, 'middleware', []);
                     $constraints = array_pull($route, 'constraints', []);
 
-                    array_set($route, 'streams::addon', $addon->getNamespace());
+
+                    if (!isset($route['streams::addon'])) {
+                        array_set($route, 'streams::addon', $addon->getNamespace());
+                    }
 
                     if (is_string($route['uses']) && !Str::contains($route['uses'], '@')) {
                         $router->resource($uri, $route['uses']);
diff --git a/src/Addon/Extension/Command/InstallExtension.php b/src/Addon/Extension/Command/InstallExtension.php
index 000c38e99..0ab28811c 100644
--- a/src/Addon/Extension/Command/InstallExtension.php
+++ b/src/Addon/Extension/Command/InstallExtension.php
@@ -1,10 +1,11 @@
 <?php namespace Anomaly\Streams\Platform\Addon\Extension\Command;
 
+use Anomaly\Streams\Platform\Console\Kernel;
 use Anomaly\Streams\Platform\Addon\AddonManager;
-use Anomaly\Streams\Platform\Addon\Extension\Contract\ExtensionRepositoryInterface;
-use Anomaly\Streams\Platform\Addon\Extension\Event\ExtensionWasInstalled;
 use Anomaly\Streams\Platform\Addon\Extension\Extension;
-use Anomaly\Streams\Platform\Console\Kernel;
+use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
+use Anomaly\Streams\Platform\Addon\Extension\Event\ExtensionWasInstalled;
+use Anomaly\Streams\Platform\Addon\Extension\Contract\ExtensionRepositoryInterface;
 
 /**
  * Class InstallExtension
@@ -66,6 +67,8 @@ public function handle(
 
         $extensions->install($this->extension);
 
+        dispatch_now(new AutoloadEntryModels);
+        
         $manager->register();
 
         if ($this->seed) {
diff --git a/src/Addon/Module/Command/InstallModule.php b/src/Addon/Module/Command/InstallModule.php
index 088712cfa..f0f789d9b 100644
--- a/src/Addon/Module/Command/InstallModule.php
+++ b/src/Addon/Module/Command/InstallModule.php
@@ -5,6 +5,7 @@
 use Anomaly\Streams\Platform\Addon\Module\Event\ModuleWasInstalled;
 use Anomaly\Streams\Platform\Addon\Module\Module;
 use Anomaly\Streams\Platform\Console\Kernel;
+use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
 
 /**
  * Class InstallModule
@@ -64,6 +65,8 @@ public function handle(
 
         $console->call('migrate', $options);
 
+        dispatch_now(new AutoloadEntryModels);
+        
         $modules->install($this->module);
 
         $manager->register();
diff --git a/src/Addon/Module/ModuleManager.php b/src/Addon/Module/ModuleManager.php
index b0a259dc8..febc71cb5 100644
--- a/src/Addon/Module/ModuleManager.php
+++ b/src/Addon/Module/ModuleManager.php
@@ -1,11 +1,11 @@
 <?php namespace Anomaly\Streams\Platform\Addon\Module;
 
-use Anomaly\Streams\Platform\Addon\Module\Command\DisableModule;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Anomaly\Streams\Platform\Addon\Module\Command\EnableModule;
+use Anomaly\Streams\Platform\Addon\Module\Command\DisableModule;
 use Anomaly\Streams\Platform\Addon\Module\Command\InstallModule;
 use Anomaly\Streams\Platform\Addon\Module\Command\MigrateModule;
 use Anomaly\Streams\Platform\Addon\Module\Command\UninstallModule;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 
 /**
  * Class ModuleManager
diff --git a/src/Application/Application.php b/src/Application/Application.php
index e28b512cb..d64058dc7 100644
--- a/src/Application/Application.php
+++ b/src/Application/Application.php
@@ -202,7 +202,7 @@ public function isEnabled()
     public function isInstalled()
     {
         if (is_null($this->installed)) {
-            $this->installed = file_exists(base_path('.env'));
+            $this->installed = env('INSTALLED');
         }
 
         return $this->installed;
diff --git a/src/Application/Command/ConfigureTranslator.php b/src/Application/Command/ConfigureTranslator.php
index 1b86f0d23..b10742b0d 100644
--- a/src/Application/Command/ConfigureTranslator.php
+++ b/src/Application/Command/ConfigureTranslator.php
@@ -73,5 +73,10 @@ function ($application) {
 
         // Set our locale namespace.
         $application->make('translator')->addNamespace('streams', realpath(__DIR__ . '/../../../resources/lang'));
+
+        // Polyfill ->trans()
+        $application->make('translator')->macro('trans', function($key, array $replace = [], $locale = null, $fallback = true) {
+            return app('translator')->get($key, $replace, $locale, $fallback);
+        });
     }
 }
diff --git a/src/Application/Command/InitializeApplication.php b/src/Application/Command/InitializeApplication.php
index b0a327801..922559dce 100644
--- a/src/Application/Command/InitializeApplication.php
+++ b/src/Application/Command/InitializeApplication.php
@@ -65,27 +65,24 @@ function () use ($laravel) {
          * then locate the application and
          * initialize.
          */
-        if ($application->isInstalled()) {
+        if (env('DB_CONNECTION', env('DB_DRIVER'))) {
 
-            if (env('DB_CONNECTION', env('DB_DRIVER'))) {
-
-                try {
+            try {
 
+                $application->setup();
+                
+                if ($application->isInstalled()) {
                     if (PHP_SAPI != 'cli') {
                         $application->locate();
                     }
 
-                    $application->setup();
-
                     if (!$application->isEnabled()) {
                         abort(503);
                     }
-                } catch (\Exception $e) {
-                    // Do nothing.
                 }
+            } catch (\Exception $e) {
+                // Do nothing.
             }
-
-            return;
         }
     }
 }
diff --git a/src/Application/Command/ReloadEnvironmentFile.php b/src/Application/Command/ReloadEnvironmentFile.php
index fab5c541b..ecfe9cf89 100644
--- a/src/Application/Command/ReloadEnvironmentFile.php
+++ b/src/Application/Command/ReloadEnvironmentFile.php
@@ -1,4 +1,9 @@
-<?php namespace Anomaly\Streams\Platform\Application\Command;
+<?php
+
+namespace Anomaly\Streams\Platform\Application\Command;
+
+use Dotenv\Dotenv;
+use Illuminate\Support\Env;
 
 /**
  * Class ReadEnvironmentFile
@@ -32,7 +37,12 @@ public function handle()
          * and overload from the changes that may
          * have taken place.
          */
-        $dotenv = \Dotenv\Dotenv::create(base_path());
-        $dotenv->overload();
+        $dotenv = Dotenv::create(
+            Env::getRepository(),
+            app()->environmentPath(),
+            app()->environmentFile()
+        );
+
+        $dotenv->load();
     }
 }
diff --git a/src/Artisan/ArtisanServiceProvider.php b/src/Artisan/ArtisanServiceProvider.php
index aa4266527..61308166c 100644
--- a/src/Artisan/ArtisanServiceProvider.php
+++ b/src/Artisan/ArtisanServiceProvider.php
@@ -6,6 +6,7 @@
 use Anomaly\Streams\Platform\Database\Migration\Console\ResetCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\RollbackCommand;
 use Anomaly\Streams\Platform\Database\Seeder\Console\SeedCommand;
+use Illuminate\Contracts\Events\Dispatcher;
 
 /**
  * Class StreamsConsoleProvider
@@ -103,7 +104,7 @@ protected function registerMigrateCommand()
         $this->app->singleton(
             'command.migrate',
             function ($app) {
-                return new MigrateCommand($app['migrator']);
+                return new MigrateCommand($app['migrator'], $app[Dispatcher::class]);
             }
         );
     }
diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index 642d16068..f26199ad2 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -130,7 +130,6 @@ class Asset
     public function __construct(
         Application $application,
         ThemeCollection $themes,
-        MountManager $manager,
         AssetFilters $filters,
         AssetParser $parser,
         Template $template,
@@ -144,7 +143,6 @@ public function __construct(
         $this->themes      = $themes;
         $this->parser      = $parser;
         $this->filters     = $filters;
-        $this->manager     = $manager;
         $this->template    = $template;
         $this->application = $application;
     }
@@ -525,11 +523,7 @@ protected function getPath($collection, $filters)
         $path = $this->paths->outputPath($collection);
 
         if ($this->shouldPublish($path, $collection, $filters)) {
-            if (!env('ASSETIC_ENABLED', true)) {
-                $this->publishWithoutAssetic($path, $collection, $filters);
-            } else {
-                $this->publish($path, $collection, $filters);
-            }
+            $this->publish($path, $collection, $filters);
         }
 
         if (
@@ -556,82 +550,11 @@ protected function publish($path, $collection, $additionalFilters)
         if (Str::contains($collection, public_path())) {
             return;
         }
-
-        $hint    = $this->paths->hint($collection);
-        $filters = $this->collectionFilters($collection, $additionalFilters);
-        $assets  = $this->getAssetCollection($collection, $additionalFilters);
-
-        $path = $this->directory . DIRECTORY_SEPARATOR . $path;
-
-        $this->files->makeDirectory((new \SplFileInfo($path))->getPath(), 0777, true, true);
-
-        /**
-         * Process the contents with Assetic.
-         */
-        $contents = $assets->dump();
-
-        /**
-         * Parse the content. Always parse CSS.
-         */
-        if (in_array('parse', $filters) || $hint == 'css') {
-            try {
-                $contents = $this->template
-                    ->render($contents)
-                    ->render();
-            } catch (\Exception $e) {
-
-                if (config('app.debug')) {
-                    dd($e->getMessage());
-                }
-
-                \Log::error($e->getMessage());
-            }
-        }
-
-        /**
-         * Minify CSS separately because of the
-         * issue with filter ordering in Assetic.
-         */
-        if (in_array('min', $filters) && $hint == 'css') {
-            $contents = \CssMin::minify($contents);
-        }
-
-        /**
-         * Minify JS separately because of the
-         * issue with filter ordering in Assetic.
-         */
-        if (in_array('min', $filters) && $hint == 'js') {
-            $contents = preg_replace("/\;{2,}$/", ';', \JSMin::minify($contents));
-        }
-
-        /**
-         * Save the processed content.
-         */
-        $this->files->put(
-            $path,
-            $contents
-        );
-    }
-
-    /**
-     * Publish the collection of assets to the path.
-     *
-     * @param $path
-     * @param $collection
-     * @param $additionalFilters
-     */
-    protected function publishWithoutAssetic($path, $collection, $additionalFilters)
-    {
-        $path = ltrim($path, '/\\');
-
-        if (Str::contains($collection, public_path())) {
-            return;
-        }
-
+        
         $hint = $this->paths->hint($collection);
 
         $filters = $this->collectionFilters($collection, $additionalFilters); // Returns combined filter flags
-
+        
         /**
          * Get the concatenated content
          * of the asset collection.
@@ -642,6 +565,14 @@ protected function publishWithoutAssetic($path, $collection, $additionalFilters)
          * Parse the content. Always parse CSS.
          */
         if (in_array('parse', $filters) || $hint == 'css') {
+            $twig = resolve('twig');
+
+            $twig->setLexer(
+                new \Twig_Lexer($twig, [
+                    'tag_comment' => ['{^', '^}']
+                ])
+            );
+            
             try {
                 $contents = (string) render($contents);
             } catch (\Exception $e) {
@@ -652,12 +583,14 @@ protected function publishWithoutAssetic($path, $collection, $additionalFilters)
 
                 \Log::error($e->getMessage());
             }
+
+            $twig->setLexer(
+                new \Twig_Lexer($twig, [
+                    'tag_comment' => ['{#', '#}']
+                ])
+            );
         }
 
-        /**
-         * Minify CSS separately because of the
-         * issue with filter ordering in Assetic.
-         */
         if (in_array('min', $filters) && $hint == 'css') {
 
             $compressor = new Minifier;
@@ -669,10 +602,6 @@ protected function publishWithoutAssetic($path, $collection, $additionalFilters)
             $contents = $compressor->run($contents);
         }
 
-        /**
-         * Minify JS separately because of the
-         * issue with filter ordering in Assetic.
-         */
         if (in_array('min', $filters) && $hint == 'js') {
             $contents = \JSMin::minify($contents);
         }
@@ -779,15 +708,15 @@ function ($filter) use ($path) {
             $filters = array_filter(array_unique(array_merge($filters, $fileFilters)));
         }
 
-        $assets = $this->getAssetCollection($collection);
-
         /**
          * If any of the files are more recent
          * than the cache file then publish.
+         *
+         * @todo See about fixing this so that it still tracks.. Maybe force @watch?
          */
-        if ($assets->getLastModified() > filemtime($path)) {
-            return true;
-        }
+//        if ($this->lastModifiedAt($collection) > filemtime($path)) {
+//            return true;
+//        }
 
         return false;
     }
@@ -838,45 +767,6 @@ public function setDirectory($directory)
         return $this;
     }
 
-    /**
-     * Create asset collection from collection array
-     *
-     * @param                  $collection
-     * @param  array $additionalFilters
-     * @return AssetCollection
-     */
-    protected function getAssetCollection($collection, $additionalFilters = [])
-    {
-        $assets = new AssetCollection();
-
-        foreach ($this->collections[$collection] as $file => $filters) {
-
-            $filters = array_filter(array_merge($filters, $additionalFilters));
-
-            $filters = $this->filters->transform($filters);
-
-            $asset = FileAsset::class;
-
-            if (in_array('glob', $filters)) {
-                $asset = GlobAsset::class;
-            }
-
-            $file = new $asset(
-                $file,
-                array_filter(
-                    $filters,
-                    function ($value) {
-                        return !is_string($value);
-                    }
-                )
-            );
-
-            $assets->add($file);
-        }
-
-        return $assets;
-    }
-
     /**
      * Return the filters used in a collection.
      *
diff --git a/src/Database/Migration/Console/MigrateCommand.php b/src/Database/Migration/Console/MigrateCommand.php
index e31ec7a4e..3fca80a86 100644
--- a/src/Database/Migration/Console/MigrateCommand.php
+++ b/src/Database/Migration/Console/MigrateCommand.php
@@ -35,6 +35,7 @@ class MigrateCommand extends \Illuminate\Database\Console\Migrations\MigrateComm
                 {--force : Force the operation to run when in production.}
                 {--path= : The path of migrations files to be executed.}
                 {--realpath : Indicate any provided migration file paths are pre-resolved absolute paths}
+                {--schema-path= : The path to a schema dump file}
                 {--pretend : Dump the SQL queries that would be run.}
                 {--seed : Indicates if the seed task should be re-run.}
                 {--step : Force the migrations to be run so they can be rolled back individually.}
diff --git a/src/Database/Migration/MigrationRepository.php b/src/Database/Migration/MigrationRepository.php
index 2d4a7ec2e..cf012e1f2 100644
--- a/src/Database/Migration/MigrationRepository.php
+++ b/src/Database/Migration/MigrationRepository.php
@@ -26,7 +26,7 @@ class MigrationRepository extends DatabaseMigrationRepository
      */
     public function getRan($namespace = null)
     {
-        if ($addon = $this->migrator->getAddon()) {
+        if ($this->migrator && $addon = $this->migrator->getAddon()) {
             return $this->table()
                 ->orderBy('batch', 'asc')
                 ->orderBy('migration', 'asc')
diff --git a/src/Database/Migration/MigrationServiceProvider.php b/src/Database/Migration/MigrationServiceProvider.php
index 8c51d6deb..d8d70bb0d 100644
--- a/src/Database/Migration/MigrationServiceProvider.php
+++ b/src/Database/Migration/MigrationServiceProvider.php
@@ -1,10 +1,10 @@
 <?php namespace Anomaly\Streams\Platform\Database\Migration;
 
+use Anomaly\Streams\Platform\Database\Migration\Console\ResetCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\MigrateCommand;
-use Anomaly\Streams\Platform\Database\Migration\Console\MigrateMakeCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\RefreshCommand;
-use Anomaly\Streams\Platform\Database\Migration\Console\ResetCommand;
 use Anomaly\Streams\Platform\Database\Migration\Console\RollbackCommand;
+use Anomaly\Streams\Platform\Database\Migration\Console\MigrateMakeCommand;
 
 /**
  * Class MigrationServiceProvider
@@ -56,7 +56,7 @@ function ($app) {
      *
      * @return void
      */
-    protected function registerMakeCommand()
+    protected function registerMigrateMakeCommand()
     {
         $this->registerCreator();
 
@@ -85,7 +85,7 @@ protected function registerMigrateCommand()
         $this->app->singleton(
             'command.migrate',
             function ($app) {
-                return new MigrateCommand($app['migrator']);
+                return new MigrateCommand($app['migrator'], $app['events']);
             }
         );
     }
@@ -95,7 +95,7 @@ function ($app) {
      *
      * @return void
      */
-    protected function registerResetCommand()
+    protected function registerMigrateResetCommand()
     {
         $this->app->singleton(
             'command.migrate.reset',
@@ -110,7 +110,7 @@ function ($app) {
      *
      * @return void
      */
-    protected function registerRefreshCommand()
+    protected function registerMigrateRefreshCommand()
     {
         $this->app->singleton(
             'command.migrate.refresh',
@@ -125,7 +125,7 @@ function () {
      *
      * @return void
      */
-    protected function registerRollbackCommand()
+    protected function registerMigrateRollbackCommand()
     {
         $this->app->singleton(
             'command.migrate.rollback',
@@ -145,7 +145,7 @@ protected function registerCreator()
         $this->app->singleton(
             'migration.creator',
             function ($app) {
-                return new MigrationCreator($app['files']);
+                return new MigrationCreator($app['files'], $app->basePath('stubs'));
             }
         );
     }
diff --git a/src/Entry/EntryModel.php b/src/Entry/EntryModel.php
index 85bcee29a..49c934b73 100644
--- a/src/Entry/EntryModel.php
+++ b/src/Entry/EntryModel.php
@@ -428,8 +428,12 @@ public function setAttribute($key, $value)
     public function getAttribute($key)
     {
 
-        // Check if it's a relationship first.
-        if (in_array($key, array_merge($this->relationships, ['created_by', 'updated_by']))) {
+        // Check if it's a relationship first. Ignore translated relationships as these
+        // end up being handled by the field type anyway.
+        if (
+            in_array($key, array_merge($this->relationships, ['created_by', 'updated_by']))
+            && !in_array($key, $this->translatedAttributes)
+        ) {
             return parent::getAttribute(camel_case($key));
         }
 
diff --git a/src/Exception/ExceptionHandler.php b/src/Exception/ExceptionHandler.php
index 8889d7cd2..654fb52e8 100644
--- a/src/Exception/ExceptionHandler.php
+++ b/src/Exception/ExceptionHandler.php
@@ -3,13 +3,14 @@
 namespace Anomaly\Streams\Platform\Exception;
 
 use Exception;
-use Illuminate\Auth\AuthenticationException;
-use Illuminate\Foundation\Exceptions\Handler;
+use Throwable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Auth\AuthenticationException;
+use Illuminate\Foundation\Exceptions\Handler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Throwable;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 /**
  * Class ExceptionHandler
@@ -50,7 +51,7 @@ class ExceptionHandler extends Handler
      * @param Exception $e
      * @return Exception
      */
-    protected function prepareException(Exception $e)
+    protected function prepareException(Throwable $e)
     {
         $this->original = $e;
 
@@ -64,7 +65,7 @@ protected function prepareException(Exception $e)
      * @param  Exception $e
      * @return Response|\Symfony\Component\HttpFoundation\Response
      */
-    public function render($request, Exception $e)
+    public function render($request, Throwable $e)
     {
         /**
          * Have to catch this for some reason.
@@ -125,10 +126,10 @@ protected function renderHttpException(HttpExceptionInterface $e)
      *
      * But first make sure it's stashed.
      *
-     * @param Exception $e
+     * @param Throwable $e
      * @return mixed
      */
-    public function report(Exception $e)
+    public function report(Throwable $e)
     {
         $this->original = $e;
 
@@ -145,8 +146,8 @@ protected function context()
         try {
             return array_filter(
                 [
-                    'user'       => \Auth::id(),
-                    'email'      => \Auth::user() ? \Auth::user()->email : null,
+                    'user'       => Auth::id(),
+                    'email'      => Auth::user() ? Auth::user()->email : null,
                     'url'        => request() ? request()->fullUrl() : null,
                     'identifier' => $this->container->make(ExceptionIdentifier::class)->identify($this->original),
                 ]
diff --git a/src/Exception/ExceptionIdentifier.php b/src/Exception/ExceptionIdentifier.php
index b5d3bc121..31a532e9e 100644
--- a/src/Exception/ExceptionIdentifier.php
+++ b/src/Exception/ExceptionIdentifier.php
@@ -1,6 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Exception;
 
-use Exception;
+use Throwable;
 
 /**
  * Class ExceptionIdentifier
@@ -26,11 +26,11 @@ class ExceptionIdentifier
     /**
      * Identify the given exception.
      *
-     * @param \Exception $exception
+     * @param Throwable $exception
      *
      * @return string
      */
-    public function identify(Exception $exception)
+    public function identify(Throwable $exception)
     {
         $hash = spl_object_hash($exception);
 
diff --git a/src/Field/Form/FieldFormButtons.php b/src/Field/Form/FieldFormButtons.php
index 5e64ecdac..44d427af7 100644
--- a/src/Field/Form/FieldFormButtons.php
+++ b/src/Field/Form/FieldFormButtons.php
@@ -1,4 +1,6 @@
-<?php namespace Anomaly\Streams\Platform\Field\Form;
+<?php
+
+namespace Anomaly\Streams\Platform\Field\Form;
 
 use Anomaly\Streams\Platform\Addon\Module\ModuleCollection;
 use Anomaly\Streams\Platform\Routing\UrlGenerator;
@@ -28,6 +30,10 @@ public function handle(FieldFormBuilder $builder, ModuleCollection $modules, Rou
         $field  = $builder->getFormEntry();
         $type   = $field->getType();
 
+        $enabled = $builder->getFormMode() == 'edit'
+            && $module
+            && $url->hasRoute($module->getNamespace('fields.change'));
+
         $builder->setButtons(
             [
                 'cancel',
@@ -36,13 +42,11 @@ public function handle(FieldFormBuilder $builder, ModuleCollection $modules, Rou
                     'data-target' => '#modal',
                     'disabled'    => $builder->getFormMode() == 'edit'
                         && !$type->getColumnType(),
-                    'enabled'     => $builder->getFormMode() == 'edit'
-                        && $module
-                        && $url->hasRoute($module->getNamespace('fields.change')),
-                    'href'        => $url->route(
+                    'enabled'     => $enabled,
+                    'href'        => $enabled ? $url->route(
                         $module->getNamespace('fields.change'),
                         ['id' => $route->parameter('id')]
-                    ),
+                    ) : '#',
                 ],
             ]
         );
diff --git a/src/Http/Kernel.php b/src/Http/Kernel.php
index 7b351fad7..fd9237943 100644
--- a/src/Http/Kernel.php
+++ b/src/Http/Kernel.php
@@ -97,6 +97,19 @@ public function __construct(Application $app, Router $router)
         parent::__construct($app, $router);
     }
 
+    /**
+     * Add a middleware group and sync.
+     *
+     * @param $group
+     * @param array $middleware
+     */
+    public function addMiddlewareGroup($group, $middleware = []) {
+        
+        $this->middlewareGroups[$group] = $middleware;
+
+        $this->syncMiddlewareToRouter();
+    }
+
     /**
      * Send the request through the router.
      *
diff --git a/src/Model/EloquentFormRepository.php b/src/Model/EloquentFormRepository.php
index ff0e77c29..68ac98088 100644
--- a/src/Model/EloquentFormRepository.php
+++ b/src/Model/EloquentFormRepository.php
@@ -91,13 +91,11 @@ public function save(FormBuilder $builder)
         if ($entry->getId()) {
             $entry->update($data);
         } else {
-            $entry = $entry->create($data);
+            $entry->fill($data)->save();
         }
 
         $entry->reguard();
 
-        $builder->setFormEntry($entry);
-
         $this->processSelfHandlingFields($builder);
 
         /**
@@ -107,7 +105,6 @@ public function save(FormBuilder $builder)
         if ($builder->versioningEnabled() && in_array(Versionable::class, $classes) && isset($enabled) && $enabled == true) {
             $entry->enableVersioning();
         }
-
     }
 
     /**
diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 576967253..9e5f508e2 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -361,6 +361,9 @@ function ($column) use ($model) {
                 )
         );
 
+        /**
+         * removed to prevent data repeatation( getTranslationsTableName() )
+         */
         $this->query->groupBy([$model->getTableName() . '.id']);
 
         /**
@@ -369,10 +372,9 @@ function ($column) use ($model) {
          */
         $this->query->where(
             function (\Illuminate\Database\Query\Builder $query) use ($model, $locale) {
-                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));//active lang
-                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));//system lang
-                $query->orWhere($model->getTranslationsTableName() . '.locale','en');//default lang
-                $query->orWhereNull($model->getTranslationsTableName() . '.locale');
+                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));//active language
+                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));//or default setting language
+                $query->orWhere($model->getTranslationsTableName() . '.locale','en');//or default module language
             }
         );
 
diff --git a/src/Stream/Console/Command/WriteEntityFactory.php b/src/Stream/Console/Command/WriteEntityFactory.php
index b5e250d63..0b166bea2 100644
--- a/src/Stream/Console/Command/WriteEntityFactory.php
+++ b/src/Stream/Console/Command/WriteEntityFactory.php
@@ -45,8 +45,8 @@ class WriteEntityFactory
      */
     public function __construct(Addon $addon, $slug, $namespace)
     {
-        $this->slug      = $slug;
-        $this->addon     = $addon;
+        $this->slug = $slug;
+        $this->addon = $addon;
         $this->namespace = $namespace;
     }
 
@@ -61,12 +61,12 @@ public function handle(Parser $parser, Filesystem $filesystem)
         $suffix = ucfirst(camel_case($this->slug));
         $entity = str_singular($suffix);
 
-        $class     = "{$entity}Model";
+        $class = "{$entity}Factory";
+        $model = "{$entity}Model";
         $namespace = $this->addon->getTransformedClass("{$entity}");
 
-        $model = $namespace . '\\' . $class;
 
-        $path = $this->addon->getPath("factories/{$entity}Factory.php");
+        $path = $this->addon->getPath("src/{$entity}/{$entity}Factory.php");
 
         $template = $filesystem->get(
             base_path("vendor/visiosoft/streams-platform/resources/stubs/entity/factory.stub")
@@ -74,6 +74,6 @@ public function handle(Parser $parser, Filesystem $filesystem)
 
         $filesystem->makeDirectory(dirname($path), 0755, true, true);
 
-        $filesystem->put($path, $parser->parse($template, compact('model')));
+        $filesystem->put($path, $parser->parse($template, compact('model', 'class', 'namespace')));
     }
 }
diff --git a/src/Stream/Console/Command/WriteEntityModel.php b/src/Stream/Console/Command/WriteEntityModel.php
index 269162264..95fabdb78 100644
--- a/src/Stream/Console/Command/WriteEntityModel.php
+++ b/src/Stream/Console/Command/WriteEntityModel.php
@@ -64,6 +64,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
 
         $class      = "{$entity}Model";
         $implements = "{$entity}Interface";
+        $factory    = "{$entity}Factory";
         $extends    = $prefix . $suffix . 'EntryModel';
         $namespace  = $this->addon->getTransformedClass("{$entity}");
         $interface  = $this->addon->getTransformedClass("{$entity}\\Contract\\{$entity}Interface");
@@ -79,7 +80,7 @@ public function handle(Parser $parser, Filesystem $filesystem)
 
         $filesystem->put(
             $path,
-            $parser->parse($template, compact('class', 'extends', 'implements', 'namespace', 'interface', 'base'))
+            $parser->parse($template, compact('class', 'extends', 'implements', 'namespace', 'interface', 'base', 'factory'))
         );
     }
 }
diff --git a/src/Stream/StreamObserver.php b/src/Stream/StreamObserver.php
index 965b8ac29..d2bb99ad6 100644
--- a/src/Stream/StreamObserver.php
+++ b/src/Stream/StreamObserver.php
@@ -9,6 +9,7 @@
 use Anomaly\Streams\Platform\Stream\Command\DropStreamsEntryTable;
 use Anomaly\Streams\Platform\Stream\Command\RenameStreamsEntryTable;
 use Anomaly\Streams\Platform\Stream\Contract\StreamInterface;
+use Anomaly\Streams\Platform\Stream\Event\StreamIsDeleting;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasCreated;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasDeleted;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasSaved;
@@ -91,6 +92,16 @@ public function updated(StreamInterface $model)
         $this->events->dispatch(new StreamWasUpdated($model));
     }
 
+    /**
+     * Run before a stream is deleted.
+     *
+     * @param StreamInterface $model
+     */
+    public function deleting(StreamInterface $model)
+    {
+        $this->events->dispatch(new StreamIsDeleting($model));
+    }
+
     /**
      * Run after a stream has been deleted.
      *
diff --git a/src/StreamsEventProvider.php b/src/StreamsEventProvider.php
index 61c4e2764..c708a7140 100644
--- a/src/StreamsEventProvider.php
+++ b/src/StreamsEventProvider.php
@@ -6,6 +6,7 @@
 use Anomaly\Streams\Platform\Asset\Listener\AddAddonPaths as AddAddonAssetPaths;
 use Anomaly\Streams\Platform\Image\Listener\AddAddonPaths as AddAddonImagePaths;
 use Anomaly\Streams\Platform\Message\Listener\LoadMessageBag;
+use Anomaly\Streams\Platform\Stream\Event\StreamIsDeleting;
 use Anomaly\Streams\Platform\Stream\Event\StreamWasDeleted;
 use Anomaly\Streams\Platform\Ui\Breadcrumb\Listener\GuessBreadcrumbs;
 use Anomaly\Streams\Platform\Ui\Breadcrumb\Listener\LoadBreadcrumbs;
@@ -60,31 +61,8 @@ class StreamsEventProvider extends EventServiceProvider
             ApplyView::class,
             FilterResults::class,
         ],
-        StreamWasDeleted::class      => [
+        StreamIsDeleting::class      => [
             DeleteVersionableHistory::class,
         ],
     ];
-
-    /**
-     * Register the application's event listeners.
-     */
-    public function boot()
-    {
-        foreach ($this->listen as $event => $listeners) {
-            foreach ($listeners as $key => $listener) {
-                if (is_integer($listener)) {
-                    $listener = $key;
-                    $priority = $listener;
-                } else {
-                    $priority = 0;
-                }
-
-                app('events')->listen($event, $listener, $priority);
-            }
-        }
-
-        foreach ($this->subscribe as $subscriber) {
-            app('events')->subscribe($subscriber);
-        }
-    }
 }
diff --git a/src/StreamsPlugin.php b/src/StreamsPlugin.php
index b63a08978..14d8f2e96 100644
--- a/src/StreamsPlugin.php
+++ b/src/StreamsPlugin.php
@@ -111,8 +111,8 @@ function () {
 
                     if (count($arguments) >= 2) {
                         $arguments = [
-                            'namespace' => array_get(func_get_args(), 0),
-                            'stream'    => array_get(func_get_args(), 1),
+                            'namespace' => Arr::get(func_get_args(), 0),
+                            'stream'    => Arr::get(func_get_args(), 1),
                         ];
                     }
 
@@ -133,9 +133,9 @@ function () {
 
                     if (count($arguments) >= 2) {
                         $arguments = [
-                            'namespace' => array_get(func_get_args(), 0),
-                            'stream'    => array_get(func_get_args(), 1),
-                            'entry'     => array_get(func_get_args(), 2),
+                            'namespace' => Arr::get(func_get_args(), 0),
+                            'stream'    => Arr::get(func_get_args(), 1),
+                            'entry'     => Arr::get(func_get_args(), 2),
                         ];
                     }
 
@@ -399,7 +399,7 @@ function ($email, array $parameters = []) {
             new \Twig_SimpleFunction(
                 'cookie',
                 function ($key, $default = null) {
-                    return array_get($_COOKIE, $key, $default);
+                    return Arr::get($_COOKIE, $key, $default);
                 }
             ),
             new \Twig_SimpleFunction(
diff --git a/src/StreamsServiceProvider.php b/src/StreamsServiceProvider.php
index d464adbab..eab1ad4d6 100644
--- a/src/StreamsServiceProvider.php
+++ b/src/StreamsServiceProvider.php
@@ -47,6 +47,7 @@
 use Anomaly\Streams\Platform\Application\Command\ConfigureFileCacheStore;
 use Anomaly\Streams\Platform\Application\Command\LoadEnvironmentOverrides;
 use Anomaly\Streams\Platform\Application\Command\LoadStreamsConfiguration;
+use Illuminate\Support\Facades\Request;
 
 /**
  * Class StreamsServiceProvider
@@ -194,12 +195,21 @@ class StreamsServiceProvider extends ServiceProvider
      */
     public function boot(Dispatcher $events)
     {
+        if (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin') {
+
+            $this->dispatchNow(new SetCoreConnection());
+            $this->dispatchNow(new AutoloadEntryModels());
+            $this->dispatchNow(new InitializeApplication());
+
+            return;
+        }
+
         $events->dispatch(new Booting());
 
         // Next take care of core utilities.
         $this->dispatchNow(new SetCoreConnection());
         $this->dispatchNow(new ConfigureUriValidator());
-        $this->dispatchNow(new InitializeApplication()); // 24
+        $this->dispatchNow(new InitializeApplication());
 
         // Load application specific .env file.
         $this->dispatchNow(new LoadEnvironmentOverrides());
@@ -316,6 +326,18 @@ function (RegisteringTwigPlugins $event) {
      */
     public function register()
     {
+        if (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin') {
+
+            /**
+             * Fallback to database users.
+             */
+            config([
+                'auth.providers.users.driver' => 'database',
+                'auth.providers.users.table' => 'users_users',
+            ]);
+
+            return;
+        }
 
         /**
          * When config is cached by Laravel we
@@ -338,7 +360,6 @@ public function register()
         $this->app->register(\Barryvdh\HttpCache\ServiceProvider::class);
         $this->app->register(\Collective\Html\HtmlServiceProvider::class);
         $this->app->register(\Intervention\Image\ImageServiceProvider::class);
-        $this->app->register(\TeamTNT\Scout\TNTSearchScoutServiceProvider::class);
 
         // Register listeners.
         $events = $this->app->make(Dispatcher::class);
diff --git a/src/Support/Currency.php b/src/Support/Currency.php
index a26b73046..c4e1a1b0d 100644
--- a/src/Support/Currency.php
+++ b/src/Support/Currency.php
@@ -52,7 +52,7 @@ public function format($number, $currency = null, array $options = [])
             $suffix = $this->symbol($currency);
         }
 
-        return $prefix . number_format(floor(($number * 100)) / 100, $decimals, $point, $separator) . $suffix;
+        return $prefix . number_format(floor(($number * 1000)) / 1000, $decimals, $point, $separator) . $suffix;
     }
 
     /**
@@ -83,7 +83,7 @@ public function normalize($number, $currency = null, array $options = [])
             config('streams::currencies.supported.' . $currency . '.point', '.')
         );
 
-        return number_format(floor(($number * 100)) / 100, $decimals, $point, $separator);
+        return number_format(floor(($number * 1000)) / 1000, $decimals, $point, $separator);
     }
 
     /**
diff --git a/src/Support/Markdown.php b/src/Support/Markdown.php
index 0af12cb38..964e0b15b 100644
--- a/src/Support/Markdown.php
+++ b/src/Support/Markdown.php
@@ -53,7 +53,11 @@ protected function blockQuote($line)
      */
     protected function inlineLink($excerpt)
     {
-        $link = parent::inlineLink($excerpt);
+        try {
+            $link = parent::inlineLink($excerpt);
+        } catch (\ErrorException $e) {
+            return;
+        }
 
         if (!isset($link['element']['text'][0])) {
             return $link;
diff --git a/src/Support/Str.php b/src/Support/Str.php
index f73f2faba..1051b7ece 100644
--- a/src/Support/Str.php
+++ b/src/Support/Str.php
@@ -1,6 +1,9 @@
 <?php namespace Anomaly\Streams\Platform\Support;
 
-use Misd\Linkify\Linkify;
+use Illuminate\Support\Arr;
+use VStelmakh\UrlHighlight\Encoder\HtmlSpecialcharsEncoder;
+use VStelmakh\UrlHighlight\Highlighter\HtmlHighlighter;
+use VStelmakh\UrlHighlight\UrlHighlight;
 
 /**
  * Class Str
@@ -67,7 +70,10 @@ public function truncate($value, $limit = 100, $end = '...')
      */
     public function linkify($text, array $options = [])
     {
-        return (new Linkify($options))->process($text);
+        $encoder = new HtmlSpecialcharsEncoder();
+        $highlighter = new HtmlHighlighter('http', Arr::get($options, 'attr', []));
+        $urlHighlight = new UrlHighlight(null, $highlighter, $encoder);
+        return $urlHighlight->highlightUrls($text);
     }
 
     /**
diff --git a/src/Support/_helpers.php b/src/Support/_helpers.php
index ec9f3c8c3..21e0a007e 100644
--- a/src/Support/_helpers.php
+++ b/src/Support/_helpers.php
@@ -223,3 +223,16 @@ function template()
         return $template;
     }
 }
+
+if (!function_exists('console')) {
+
+    /**
+     * Return the console instance.
+     *
+     * @return \Anomaly\Streams\Platform\Console\Kernel
+     */
+    function console()
+    {
+        return app(\Anomaly\Streams\Platform\Console\Kernel::class);
+    }
+}
diff --git a/src/Ui/ControlPanel/Listener/LoadControlPanel.php b/src/Ui/ControlPanel/Listener/LoadControlPanel.php
index d8d7f0e30..3c82ddbd7 100644
--- a/src/Ui/ControlPanel/Listener/LoadControlPanel.php
+++ b/src/Ui/ControlPanel/Listener/LoadControlPanel.php
@@ -79,6 +79,8 @@ public function handle()
             return;
         }
 
-        $this->template->put('cp', $this->controlPanel->build());
+        if (!$this->template->has('cp')) {
+            $this->template->put('cp', $this->controlPanel->build());
+        }
     }
 }
diff --git a/src/Ui/Form/Command/FlashFieldValues.php b/src/Ui/Form/Command/FlashFieldValues.php
index f78b70f0e..02ccb8ea0 100644
--- a/src/Ui/Form/Command/FlashFieldValues.php
+++ b/src/Ui/Form/Command/FlashFieldValues.php
@@ -44,7 +44,7 @@ public function handle(Store $session)
 
         /* @var FieldType $field */
         foreach ($this->builder->getFormFields() as $field) {
-            $session->flash($field->getFieldName(), $field->getPostValue());
+            $session->flash($field->getFieldName(), $field->getRepopulateValue());
         }
     }
 }
diff --git a/src/Ui/Form/Command/PostForm.php b/src/Ui/Form/Command/PostForm.php
index 5456c3517..b086f9f96 100644
--- a/src/Ui/Form/Command/PostForm.php
+++ b/src/Ui/Form/Command/PostForm.php
@@ -54,8 +54,8 @@ public function handle()
 
         $this->dispatchNow(new LoadFormValues($this->builder));
         $this->dispatchNow(new RemoveSkippedFields($this->builder));
-        $this->dispatchNow(new HandleVersioning($this->builder));
         $this->dispatchNow(new HandleForm($this->builder));
+        $this->dispatchNow(new HandleVersioning($this->builder));
         $this->dispatchNow(new SetSuccessMessage($this->builder));
         $this->dispatchNow(new SetActionResponse($this->builder));
 
diff --git a/src/Ui/Table/Command/GetTableEntries.php b/src/Ui/Table/Command/GetTableEntries.php
index cc4fc4541..5a1b29000 100644
--- a/src/Ui/Table/Command/GetTableEntries.php
+++ b/src/Ui/Table/Command/GetTableEntries.php
@@ -43,10 +43,11 @@ public function handle(Container $container)
         /*
          * If the builder has an entries handler
          * then call it through the container and
-         * let it load the entries itself.
+         * let it load the entries itself, then repopulate the variable for comparison.
          */
         if (is_string($entries) || $entries instanceof \Closure) {
             $container->call($entries, ['builder' => $this->builder], 'handle');
+            $entries = $this->builder->getEntries();
         }
 
         /**
diff --git a/src/Ui/Table/Component/Filter/Contract/FilterInterface.php b/src/Ui/Table/Component/Filter/Contract/FilterInterface.php
index 68f7a595c..30e50e7aa 100644
--- a/src/Ui/Table/Component/Filter/Contract/FilterInterface.php
+++ b/src/Ui/Table/Component/Filter/Contract/FilterInterface.php
@@ -49,6 +49,14 @@ public function getInputName();
      */
     public function getValue();
 
+    /**
+     * Set the filter value.
+     *
+     * @param $value
+     * @return $this
+     */
+    public function setValue($value);
+
     /**
      * Set the exact flag.
      *
diff --git a/src/Ui/Table/Component/Filter/Filter.php b/src/Ui/Table/Component/Filter/Filter.php
index b40ef2ee3..8073e4b02 100644
--- a/src/Ui/Table/Component/Filter/Filter.php
+++ b/src/Ui/Table/Component/Filter/Filter.php
@@ -64,6 +64,13 @@ class Filter implements FilterInterface
      */
     protected $column = null;
 
+    /**
+     * The filter value.
+     *
+     * @var mixed
+     */
+    protected $value = '__BLANK';
+
     /**
      * The filter placeholder.
      *
@@ -141,9 +148,25 @@ public function getInput()
      */
     public function getValue()
     {
+        if ($this->value != '__BLANK') {
+            return $this->value;
+        }
+
         return app('request')->get($this->getInputName());
     }
 
+    /**
+     * Get the filter value.
+     *
+     * @return $this
+     */
+    public function setValue($value)
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
     /**
      * Get the filter name.
      *
diff --git a/src/Version/Listener/DeleteVersionableHistory.php b/src/Version/Listener/DeleteVersionableHistory.php
index 89ee1c24e..5ba25021d 100644
--- a/src/Version/Listener/DeleteVersionableHistory.php
+++ b/src/Version/Listener/DeleteVersionableHistory.php
@@ -1,6 +1,6 @@
 <?php namespace Anomaly\Streams\Platform\Version\Listener;
 
-use Anomaly\Streams\Platform\Stream\Event\StreamWasDeleted;
+use Anomaly\Streams\Platform\Stream\Event\StreamIsDeleting;
 use Anomaly\Streams\Platform\Version\Contract\VersionRepositoryInterface;
 
 /**
@@ -33,9 +33,9 @@ public function __construct(VersionRepositoryInterface $versions)
     /**
      * Handle the event.
      *
-     * @param StreamWasDeleted $event
+     * @param StreamIsDeleting $event
      */
-    public function handle(StreamWasDeleted $event)
+    public function handle(StreamIsDeleting $event)
     {
         $stream = $event->getStream();
 
diff --git a/src/Version/Table/VersionTableBuilder.php b/src/Version/Table/VersionTableBuilder.php
index d9c1ccd54..7333b5483 100644
--- a/src/Version/Table/VersionTableBuilder.php
+++ b/src/Version/Table/VersionTableBuilder.php
@@ -1,10 +1,12 @@
-<?php namespace Anomaly\Streams\Platform\Version\Table;
+<?php
 
+namespace Anomaly\Streams\Platform\Version\Table;
+
+use Illuminate\Database\Eloquent\Builder;
 use Anomaly\Streams\Platform\Model\EloquentModel;
-use Anomaly\Streams\Platform\Model\Traits\Versionable;
 use Anomaly\Streams\Platform\Ui\Table\TableBuilder;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
+use Anomaly\Streams\Platform\Model\Traits\Versionable;
+use Anomaly\Streams\Platform\Version\VersionModel;
 
 /**
  * Class VersionTableBuilder
@@ -30,6 +32,13 @@ class VersionTableBuilder extends TableBuilder
      */
     protected $type = null;
 
+    /**
+     * The current version.
+     *
+     * @var mixed
+     */
+    protected $current = null;
+
     /**
      * The table filters.
      *
@@ -139,4 +148,23 @@ public function setType($type)
         return $this;
     }
 
+    /**
+     * Set the current version.
+     *
+     * @param VersionModel $current
+     */
+    public function setCurrent(VersionModel $current)
+    {
+        $this->current = $current;
+
+        return $this;
+    }
+
+    /**
+     * Get the current version.
+     */
+    public function getCurrent()
+    {
+        return $this->current;
+    }
 }
diff --git a/src/View/Twig/Loader.php b/src/View/Twig/Loader.php
index 4f397cd28..b4f7872cb 100644
--- a/src/View/Twig/Loader.php
+++ b/src/View/Twig/Loader.php
@@ -132,13 +132,13 @@ class Loader extends OriginalLoader
     public function __construct(
         Filesystem $files,
         ViewFinderInterface $finder,
-        $extension = 'twig',
         Factory $view,
         Mobile_Detect $agent,
         AddonCollection $addons,
         ViewOverrides $overrides,
         Request $request,
-        ViewMobileOverrides $mobiles
+        ViewMobileOverrides $mobiles,
+        $extension = 'twig'
     ) {
         $this->view      = $view;
         $this->agent     = $agent;
diff --git a/src/View/ViewComposer.php b/src/View/ViewComposer.php
index 326a902e6..27f5d5a46 100644
--- a/src/View/ViewComposer.php
+++ b/src/View/ViewComposer.php
@@ -144,7 +144,8 @@ function (&$value) {
 
         if (!$this->theme || !env('INSTALLED')) {
 
-            if (!self::$loaded && self::$loaded = true) {
+            // ensure we re-view compose on every testing run.
+            if ((!self::$loaded && self::$loaded = true) || env('APP_ENV') === 'testing') {
                 /* @deprecated since 1.6; this is no longer needed for every view. */
                 event(new ViewComposed($view));
             }
@@ -154,7 +155,8 @@ function (&$value) {
 
         $this->setPath($view);
 
-        if (!self::$loaded && self::$loaded = true) {
+        // ensure we re-view compose on every testing run.
+        if ((!self::$loaded && self::$loaded = true) || env('APP_ENV') === 'testing') {
             /* @deprecated since 1.6; this is no longer needed for every view. */
             event(new ViewComposed($view));
         }
diff --git a/src/View/ViewIncludes.php b/src/View/ViewIncludes.php
index 35bd2884a..2c9fde10c 100644
--- a/src/View/ViewIncludes.php
+++ b/src/View/ViewIncludes.php
@@ -46,13 +46,13 @@ public function render($slot)
         }
 
         return implode(
+            "\n",
             array_map(
                 function ($include) {
                     return view($include)->render();
                 },
                 $includes->all()
-            ),
-            "\n"
+            )
         );
     }
 }
diff --git a/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php b/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php
index 5bafec684..15a35cf01 100644
--- a/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php
+++ b/tests/Unit/Application/Command/ReloadEnvironmentFileTest.php
@@ -7,6 +7,10 @@ class ReloadEnvironmentFileTest extends TestCase
 
     public function testCanReadEnvironmentFile()
     {
+        $this->markTestSkipped('We should not be touching the file.');
+
+        return;
+        
         $this->dispatchNow(
             new \Anomaly\Streams\Platform\Application\Command\WriteEnvironmentFile(
                 array_merge(
diff --git a/tests/Unit/Application/Command/WriteEnvironmentFileTest.php b/tests/Unit/Application/Command/WriteEnvironmentFileTest.php
index 0e5f45163..252a738c8 100644
--- a/tests/Unit/Application/Command/WriteEnvironmentFileTest.php
+++ b/tests/Unit/Application/Command/WriteEnvironmentFileTest.php
@@ -7,6 +7,10 @@ class WriteEnvironmentFileTest extends TestCase
 
     public function testCanWriteEnvironmentFile()
     {
+        $this->markTestSkipped('We should not be touching the file.');
+
+        return;
+        
         $this->dispatchNow(
             new \Anomaly\Streams\Platform\Application\Command\WriteEnvironmentFile(
                 array_merge(
diff --git a/tests/Unit/Asset/AssetTest.php b/tests/Unit/Asset/AssetTest.php
index d7bfd7e32..6d55dfcae 100644
--- a/tests/Unit/Asset/AssetTest.php
+++ b/tests/Unit/Asset/AssetTest.php
@@ -8,7 +8,7 @@ public function testCanDownload()
         /* @var \Anomaly\Streams\Platform\Asset\Asset $asset */
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
-        $target = 'https://gist.githubusercontent.com/RyanThompson/f75b540ecbd3bc9b5ee8614ccd4dc080/raw/01fc971eda86bd89cad8c91c9042261aeb0b5d18/test.scss';
+        $target = 'https://gist.githubusercontent.com/RyanThompson/f75b540ecbd3bc9b5ee8614ccd4dc080/raw/a224e8c477bf5c3c081cdeb02b3e0bbd430bd12b/test.css';
 
         $path = $asset->download($target);
 
@@ -17,38 +17,9 @@ public function testCanDownload()
             file_get_contents($asset->realPath($path))
         );
 
-        $content = $asset->inline($path, ["min"]);
-
-        $this->assertEquals($content, '.test{color:#fff}.test .invert{color:#000}');
-    }
-
-    public function testPreCompilers()
-    {
-        /* @var \Anomaly\Streams\Platform\Asset\Asset $asset */
-        $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
-
-        // @todo fix coffee or drop it
-//        $this->assertEquals(
-//            "\nalert('Hello');",
-//            $asset->inline('anomaly.module.test::scripts/test.coffee')
-//        );
-
-        $this->assertEquals(
-            '.test{color:#fff}.test .invert{color:#000}',
-            $asset->inline('anomaly.module.test::styles/test.scss', ['min'])
-        );
-
-        $this->assertEquals(
-            '.test{color:#ffffff}.test .invert{color:#000000}',
-            $asset->inline('anomaly.module.test::styles/test.less', ['min'])
-        );
-
-        // @todo fix stylus or drop it
-//        $this->assertEquals(
-//            '.test{color:#ffffff}.test .invert{color:#000000}',
-//            $asset->inline('anomaly.module.test::styles/test.styl', ['min'])
-//        );
+        $content = $asset->inline($path, ["min", "scss"]);
 
+        $this->assertEquals('.test{color:#fff}', $content);
     }
 
     public function testInline()
@@ -62,7 +33,7 @@ public function testInline()
         );
 
         $this->assertEquals(
-            ".test{color:#ffffff}",
+            ".test{color:#fff}",
             $asset->inline('anomaly.module.test::styles/test.css', ['min'])
         );
     }
@@ -73,7 +44,7 @@ public function testUrl()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            url('app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js'),
+            url('app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js'),
             $asset->url('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -84,7 +55,7 @@ public function testPath()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
+            '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
             $asset->path('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -95,7 +66,7 @@ public function testAsset()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
+            '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js',
             $asset->asset('anomaly.module.test::scripts/test.js', ['noversion'])
         );
     }
@@ -106,7 +77,7 @@ public function testScript()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '<script foo="bar" src="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
+            '<script foo="bar" src="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
             $asset->script('anomaly.module.test::scripts/test.js', ['noversion'], ['foo' => 'bar'])
         );
     }
@@ -117,7 +88,7 @@ public function testStyle()
         $asset = app(\Anomaly\Streams\Platform\Asset\Asset::class);
 
         $this->assertEquals(
-            '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
+            '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
             $asset->style('anomaly.module.test::styles/test.css', ['noversion'], ['foo' => 'bar'])
         );
     }
@@ -132,8 +103,8 @@ public function testScripts()
 
         $this->assertEquals(
             [
-                '<script foo="bar" src="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
-                '<script foo="bar" src="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/scripts/test2.js"></script>',
+                '<script foo="bar" src="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test.js"></script>',
+                '<script foo="bar" src="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/scripts/test2.js"></script>',
             ],
             $asset->scripts('test.js', ['noversion'], ['foo' => 'bar'])
         );
@@ -149,8 +120,8 @@ public function testStyles()
 
         $this->assertEquals(
             [
-                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
-                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test2.css">',
+                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css">',
+                '<link foo="bar" media="all" type="text/css" rel="stylesheet" href="/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css">',
             ],
             $asset->styles('test.css', ['noversion'], ['foo' => 'bar'])
         );
@@ -166,8 +137,8 @@ public function testPaths()
 
         $this->assertEquals(
             [
-                '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css',
-                '/app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test2.css',
+                '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css',
+                '/app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css',
             ],
             $asset->paths('test.css', ['noversion'], ['foo' => 'bar'])
         );
@@ -184,10 +155,10 @@ public function testUrls()
         $this->assertEquals(
             [
                 url(
-                    'app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css'
+                    'app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'
                 ),
                 url(
-                    'app/default/assets/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test2.css'
+                    'app/'.env('APPLICATION_REFERENCE', 'default').'/assets/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test2.css'
                 ),
             ],
             $asset->urls('test.css', ['noversion'])
@@ -204,8 +175,8 @@ public function testInlines()
 
         $this->assertEquals(
             [
-                '.test{color:#ffffff}',
-                '.test{color:#000000}',
+                '.test{color:#fff}',
+                '.test{color:#000}',
             ],
             $asset->inlines('test.css', ['noversion', 'min'], ['foo' => 'bar'])
         );
@@ -233,11 +204,11 @@ public function testAddPath()
 
         $asset->addPath(
             'test',
-            base_path('vendor/visiosoft/streams-platform/addons/anomaly/test-module/resources')
+            base_path('vendor/anomaly/streams-platform/addons/anomaly/test-module/resources')
         );
 
         $this->assertEquals(
-            base_path('vendor/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css'),
+            base_path('vendor/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'),
             $asset->realPath('test::styles/test.css')
         );
     }
diff --git a/tests/Unit/Support/StrTest.php b/tests/Unit/Support/StrTest.php
index 3c9dbc686..2a14e7b22 100644
--- a/tests/Unit/Support/StrTest.php
+++ b/tests/Unit/Support/StrTest.php
@@ -12,4 +12,54 @@ public function testCanTruncateString()
     {
         $this->assertEquals('Ryan...', (new \Anomaly\Streams\Platform\Support\Str())->truncate('Ryan Thompson', 7));
     }
+
+    /**
+     * @dataProvider linkifyDataProvider
+     */
+    public function testLinkify(string $text, array $attributes, string $expected): void
+    {
+        self::assertSame(
+            $expected,
+            (new \Anomaly\Streams\Platform\Support\Str())->linkify($text, ['attr' => $attributes])
+        );
+    }
+
+    /**
+     * @return array[]
+     */
+    public function linkifyDataProvider(): array
+    {
+        return [
+            'one url' => [
+                'Some http://example.com text',
+                [],
+                'Some <a href="http://example.com">http://example.com</a> text',
+            ],
+            'two urls' => [
+                'Visit http://example.com, and see some example.com content.',
+                [],
+                'Visit <a href="http://example.com">http://example.com</a>, and see some <a href="http://example.com">example.com</a> content.',
+            ],
+            'html special chars encoded' => [
+                'Some &lt;b&gt;http://example.com&lt;/b&gt; text',
+                [],
+                'Some &lt;b&gt;<a href="http://example.com">http://example.com</a>&lt;/b&gt; text',
+            ],
+            'already highlighted' => [
+                'Some <a href="http://example.com">http://example.com</a> text',
+                [],
+                'Some <a href="http://example.com">http://example.com</a> text',
+            ],
+            'email' => [
+                'Some user@example.com text',
+                [],
+                'Some <a href="mailto:user@example.com">user@example.com</a> text',
+            ],
+            'attributes' => [
+                'Some http://example.com text',
+                ['target' => '_blank'],
+                'Some <a href="http://example.com" target="_blank">http://example.com</a> text',
+            ],
+        ];
+    }
 }

From c16c8f1374a9a59730f0e3004254012b27426b06 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 5 Apr 2021 12:20:28 +0300
Subject: [PATCH 204/256] 1.9 update

---
 composer.json                         | 2 +-
 docs/en/03.the-basics/08.contracts.md | 2 +-
 tests/Unit/Asset/AssetTest.php        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index bdb1d98f0..43c61b129 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "anomaly/streams-platform",
+    "name": "visiosoft/streams-platform",
     "description": "A powerful, inclusive, modular PHP application engine built lovingly for Laravel.",
     "authors": [
         {
diff --git a/docs/en/03.the-basics/08.contracts.md b/docs/en/03.the-basics/08.contracts.md
index dab3f63db..5db165dec 100644
--- a/docs/en/03.the-basics/08.contracts.md
+++ b/docs/en/03.the-basics/08.contracts.md
@@ -12,7 +12,7 @@ Much of the Streams Platform and it's addons utilize the `interface` pattern. Th
 Contracts and implementations and resolving from the service container is used heavily within the Streams Platform in order to allow a very wide and low-level approach to extending core functionality. 
 
 ```bash
-/vendor/anomaly/streams-module/src/Entry/Contract/EntryInterface
+/vendor/visiosoft/streams-module/src/Entry/Contract/EntryInterface
 ```
 
 ### Loose Coupling
diff --git a/tests/Unit/Asset/AssetTest.php b/tests/Unit/Asset/AssetTest.php
index 6d55dfcae..6238b1ccc 100644
--- a/tests/Unit/Asset/AssetTest.php
+++ b/tests/Unit/Asset/AssetTest.php
@@ -204,11 +204,11 @@ public function testAddPath()
 
         $asset->addPath(
             'test',
-            base_path('vendor/anomaly/streams-platform/addons/anomaly/test-module/resources')
+            base_path('vendor/visiosoft/streams-platform/addons/anomaly/test-module/resources')
         );
 
         $this->assertEquals(
-            base_path('vendor/anomaly/streams-platform/addons/anomaly/test-module/resources/styles/test.css'),
+            base_path('vendor/visiosoft/streams-platform/addons/anomaly/test-module/resources/styles/test.css'),
             $asset->realPath('test::styles/test.css')
         );
     }

From 8ae25cda830a743e6918aa1bcc8e782657e8073b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 5 Apr 2021 12:49:37 +0300
Subject: [PATCH 205/256] fixed 1.9 scss

---
 composer.json       | 3 ++-
 src/Asset/Asset.php | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 43c61b129..1f2f86f8d 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
         "vstelmakh/url-highlight": "^2.2",
         "ezyang/htmlpurifier": "~4.0",
         "tubalmartin/cssmin": "~4.0",
-        "fzaninotto/faker": "~1.4"
+        "fzaninotto/faker": "~1.4",
+        "leafo/scssphp": "^0.8.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index f26199ad2..0fdb4e9cf 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -13,6 +13,7 @@
 use Anomaly\Streams\Platform\Support\Template;
 use Anomaly\Streams\Platform\Application\Application;
 use Anomaly\Streams\Platform\Addon\Theme\ThemeCollection;
+use Leafo\ScssPhp\Compiler;
 
 /**
  * Class Asset
@@ -561,6 +562,13 @@ protected function publish($path, $collection, $additionalFilters)
          */
         $contents = $this->content($collection);
 
+        //scss fix
+        $type = explode('.', $collection);
+        if (end($type) == "scss") {
+            $compiler_scss = new Compiler();
+            $contents = $compiler_scss->compile($contents);
+        }
+
         /**
          * Parse the content. Always parse CSS.
          */

From 9b9104d8d8600f44d5152d56d7c3e975951076be Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 19 Apr 2021 22:15:23 -0500
Subject: [PATCH 206/256] Fix L8 migrations

---
 docs/en/01.prologue/02.change-log.md                         | 4 ++++
 src/Database/Migration/Console/Command/ConfigureMigrator.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index ce7047055..f73cfe5a2 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.1] - 2021-03-18
+### Fixed
+- Fixed migration support for L8.
+
 ### [1.9.0] - 2021-03-18
 ### Added
 - Added support for addons in vendor directory.
diff --git a/src/Database/Migration/Console/Command/ConfigureMigrator.php b/src/Database/Migration/Console/Command/ConfigureMigrator.php
index ef9bca4ff..36f0bbe6f 100644
--- a/src/Database/Migration/Console/Command/ConfigureMigrator.php
+++ b/src/Database/Migration/Console/Command/ConfigureMigrator.php
@@ -72,7 +72,7 @@ public function handle()
         $this->migrator->setAddon($addon);
 
         $paths = [
-            $addon->getPath('migrations'),
+            //$addon->getPath('migrations')
             $this->command->getLaravel()->databasePath()
             . DIRECTORY_SEPARATOR.'migrations'
             . DIRECTORY_SEPARATOR.$addon->getNamespace(),

From e95fa66a354d3b34ab199bff800956cf279ec541 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 20 Apr 2021 11:25:04 +0300
Subject: [PATCH 207/256] Revert "Fix L8 migrations"

This reverts commit 9b9104d8
---
 docs/en/01.prologue/02.change-log.md                         | 4 ----
 src/Database/Migration/Console/Command/ConfigureMigrator.php | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f73cfe5a2..ce7047055 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,10 +28,6 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.9.1] - 2021-03-18
-### Fixed
-- Fixed migration support for L8.
-
 ### [1.9.0] - 2021-03-18
 ### Added
 - Added support for addons in vendor directory.
diff --git a/src/Database/Migration/Console/Command/ConfigureMigrator.php b/src/Database/Migration/Console/Command/ConfigureMigrator.php
index 36f0bbe6f..ef9bca4ff 100644
--- a/src/Database/Migration/Console/Command/ConfigureMigrator.php
+++ b/src/Database/Migration/Console/Command/ConfigureMigrator.php
@@ -72,7 +72,7 @@ public function handle()
         $this->migrator->setAddon($addon);
 
         $paths = [
-            //$addon->getPath('migrations')
+            $addon->getPath('migrations'),
             $this->command->getLaravel()->databasePath()
             . DIRECTORY_SEPARATOR.'migrations'
             . DIRECTORY_SEPARATOR.$addon->getNamespace(),

From 883e6c5185e2b1196394883584f791d237efbc88 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <service@aiwebsystems.com>
Date: Thu, 22 Apr 2021 15:05:57 -0500
Subject: [PATCH 208/256] Resolve migration issues

---
 docs/en/01.prologue/02.change-log.md                  |  4 ++++
 .../Migration/Console/Command/ConfigureMigrator.php   |  2 +-
 src/Database/Migration/Migrator.php                   | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index f73cfe5a2..250602b71 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.2] - 2021-03-22
+### Fixed
+- Fixed migration class issues.
+
 ### [1.9.1] - 2021-03-18
 ### Fixed
 - Fixed migration support for L8.
diff --git a/src/Database/Migration/Console/Command/ConfigureMigrator.php b/src/Database/Migration/Console/Command/ConfigureMigrator.php
index 36f0bbe6f..ef9bca4ff 100644
--- a/src/Database/Migration/Console/Command/ConfigureMigrator.php
+++ b/src/Database/Migration/Console/Command/ConfigureMigrator.php
@@ -72,7 +72,7 @@ public function handle()
         $this->migrator->setAddon($addon);
 
         $paths = [
-            //$addon->getPath('migrations')
+            $addon->getPath('migrations'),
             $this->command->getLaravel()->databasePath()
             . DIRECTORY_SEPARATOR.'migrations'
             . DIRECTORY_SEPARATOR.$addon->getNamespace(),
diff --git a/src/Database/Migration/Migrator.php b/src/Database/Migration/Migrator.php
index 8aff4f220..3ee63c9f6 100644
--- a/src/Database/Migration/Migrator.php
+++ b/src/Database/Migration/Migrator.php
@@ -196,6 +196,17 @@ public function resolve($file)
         return $migration;
     }
 
+    /**
+     * Resolve a migration instance from a migration path.
+     *
+     * @param  string  $path
+     * @return object
+     */
+    protected function resolvePath(string $path)
+    {
+        return $this->resolve($path);
+    }
+
     /**
      * Set the addon.
      *

From 30534235313f9701d2e2c2ecfe2ebff002be4de4 Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Thu, 20 May 2021 17:36:10 +0300
Subject: [PATCH 209/256] fix js error

---
 resources/views/form/partials/wrapper.twig | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/resources/views/form/partials/wrapper.twig b/resources/views/form/partials/wrapper.twig
index 4c2aa035a..ed9076b16 100644
--- a/resources/views/form/partials/wrapper.twig
+++ b/resources/views/form/partials/wrapper.twig
@@ -38,61 +38,3 @@
     </div>
 
 </div>
-
-{% if field_type.required %}
-    <script>
-        if (typeof inputsTrans === 'undefined') {
-            var inputsTrans = {
-                {{ field_type.attributes.id }}: {
-                    label: `{{ field_type.object.label }}`,
-                    lang: `{{ field_type.object.locale }}`
-                }
-            }
-        } else {
-            inputsTrans.{{ field_type.attributes.id }} = {
-                label: `{{ field_type.object.label }}`,
-                lang: `{{ field_type.object.locale }}`
-            }
-        }
-
-        var createAllErrors = function() {
-            var form = $( this );
-
-            var showAllErrorMessages = function() {
-                // Find all invalid fields within the form.
-                var invalidFields = form.find( ":invalid" ).each( function( index, node ) {
-
-                    // Find the field's corresponding label
-                    if (node.nodeName !== 'FIELDSET') {
-                        var label = inputsTrans[node.id],
-                            // Opera incorrectly does not fill the validationMessage property.
-                            message = node.validationMessage || 'Invalid value.';
-
-                        alert(label.label + (label.lang ? ' (' + label.lang + ')' : '') + ': ' + message)
-                    }
-                });
-            };
-
-            // Support Safari
-            form.off( "submit").on( "submit", function( event ) {
-                if ( this.checkValidity && !this.checkValidity() ) {
-                    $( this ).find( ":invalid" ).first().focus();
-                    event.preventDefault();
-                }
-            });
-
-            $( "input[type=submit], button:not([type=button])", form )
-                .off( "click").on( "click", showAllErrorMessages);
-
-            // $( "input", form ).off( "keypress").on( "keypress", function( event ) {
-            //     var type = $( this ).attr( "type" );
-            //     if ( /date|email|month|number|search|tel|text|time|url|week/.test ( type )
-            //         && event.keyCode == 13 ) {
-            //         showAllErrorMessages();
-            //     }
-            // });
-        };
-
-        $( "form" ).each( createAllErrors );
-    </script>
-{% endif %}

From accb2530ac1284fc73aea31e6d9cbe16ea576be6 Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Sat, 29 May 2021 16:37:38 +0300
Subject: [PATCH 210/256] Update distribution.php

---
 resources/config/distribution.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/config/distribution.php b/resources/config/distribution.php
index 08fec9249..2f89039f8 100644
--- a/resources/config/distribution.php
+++ b/resources/config/distribution.php
@@ -11,7 +11,7 @@
     |
     */
 
-    'name'        => 'Streams Platform',
-    'description' => 'Streams is an abstracted modular platform for developing web applications.',
+    'name'        => 'PHP Classifieds Marketplace software',
+    'description' => 'OpenClassify is modular and most advanced open source classified platform build with Laravel.Use it in real estate classifieds, auto, e-commerce and other ...',
     'version'     => 'v1.1',
 ];

From 7c72fbadd5b29ada7119316ff3e8fdd264f3192a Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Tue, 10 Aug 2021 12:13:39 +0300
Subject: [PATCH 211/256] fixed edit problem for id

---
 src/Model/EloquentQueryBuilder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 9e5f508e2..bc00c765f 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -356,6 +356,7 @@ function ($column) use ($model) {
                             'updated_at',
                             'updated_by_id',
                             'sort_order',
+                            'id',
                         ]
                     )
                 )

From 06d52d83956635787616427b6b99bcfb39c9cf53 Mon Sep 17 00:00:00 2001
From: diashalabi <diahshalabi@hotmail.com>
Date: Thu, 9 Sep 2021 12:39:24 +0300
Subject: [PATCH 212/256] =?UTF-8?q?#4433=20Mod=C3=BCl=20deneme=20s=C3=BCre?=
 =?UTF-8?q?si?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Addon/Console/AddonDisable.php     | 47 ++++++++++++++++++++++++++
 src/Artisan/ArtisanServiceProvider.php |  1 +
 2 files changed, 48 insertions(+)
 create mode 100644 src/Addon/Console/AddonDisable.php

diff --git a/src/Addon/Console/AddonDisable.php b/src/Addon/Console/AddonDisable.php
new file mode 100644
index 000000000..0d539fb74
--- /dev/null
+++ b/src/Addon/Console/AddonDisable.php
@@ -0,0 +1,47 @@
+<?php namespace Anomaly\Streams\Platform\Addon\Console;
+
+use Anomaly\Streams\Platform\Addon\AddonCollection;
+use Anomaly\Streams\Platform\Addon\Extension\Extension;
+use Anomaly\Streams\Platform\Addon\Extension\ExtensionManager;
+use Anomaly\Streams\Platform\Addon\Module\Module;
+use Anomaly\Streams\Platform\Addon\Module\ModuleManager;
+use Illuminate\Console\Command;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Symfony\Component\Console\Input\InputArgument;
+
+class AddonDisable extends Command
+{
+    use DispatchesJobs;
+
+    protected $name = 'addon:disable';
+
+    protected $description = 'Disable an addon.';
+
+    public function handle(AddonCollection $addons, ModuleManager $modules, ExtensionManager $extensions)
+    {
+        if (!$addon = $addons->get($this->argument('addon'))) {
+            $this->error('The [' . $this->argument('addon') . '] could not be found.');
+        }
+
+        if ($addon instanceof Module) {
+
+            $modules->disable($addon);
+
+            $this->info('The [' . $this->argument('addon') . '] module was disabled.');
+        }
+
+        if ($addon instanceof Extension) {
+
+            $extensions->disable($addon);
+
+            $this->info('The [' . $this->argument('addon') . '] extension was disabled.');
+        }
+    }
+
+    protected function getArguments()
+    {
+        return [
+            ['addon', InputArgument::REQUIRED, 'The addon to install.'],
+        ];
+    }
+}
diff --git a/src/Artisan/ArtisanServiceProvider.php b/src/Artisan/ArtisanServiceProvider.php
index 61308166c..bee68f831 100644
--- a/src/Artisan/ArtisanServiceProvider.php
+++ b/src/Artisan/ArtisanServiceProvider.php
@@ -50,6 +50,7 @@ class ArtisanServiceProvider extends \Illuminate\Foundation\Providers\ArtisanSer
         \Anomaly\Streams\Platform\Addon\Console\AddonInstall::class,
         \Anomaly\Streams\Platform\Addon\Console\AddonUninstall::class,
         \Anomaly\Streams\Platform\Addon\Console\AddonReinstall::class,
+        \Anomaly\Streams\Platform\Addon\Console\AddonDisable::class,
 
         // Application Commands
         \Anomaly\Streams\Platform\Application\Console\Build::class,

From 707337e8cd2b2d4d4a5d38d6052e79a021249b56 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 13 Oct 2021 14:13:03 +0300
Subject: [PATCH 213/256] =?UTF-8?q?added=20T=C3=BCrkisch=20in=20trans=20fi?=
 =?UTF-8?q?le=20for=20germany?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/lang/de/locale.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/lang/de/locale.php b/resources/lang/de/locale.php
index cc42a179e..a47398804 100644
--- a/resources/lang/de/locale.php
+++ b/resources/lang/de/locale.php
@@ -52,6 +52,9 @@
     'cn' => [
         'name' => 'Chinesisch'
     ],
+    'tr' => [
+        'name' => 'Türkisch'
+    ],
     'tw' => [
         'name' => 'Twi'
     ],

From 49bbece142b75c2ca531c044df9dfee0b82d00dd Mon Sep 17 00:00:00 2001
From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com>
Date: Thu, 21 Oct 2021 10:51:14 +0200
Subject: [PATCH 214/256] #4704 error page shows when put into maintenance mode

---
 .../Middleware/CheckForMaintenanceMode.php    | 121 +++++++++++++++++-
 1 file changed, 118 insertions(+), 3 deletions(-)

diff --git a/src/Http/Middleware/CheckForMaintenanceMode.php b/src/Http/Middleware/CheckForMaintenanceMode.php
index dd6ff91d3..4225c6975 100644
--- a/src/Http/Middleware/CheckForMaintenanceMode.php
+++ b/src/Http/Middleware/CheckForMaintenanceMode.php
@@ -3,6 +3,7 @@
 namespace Anomaly\Streams\Platform\Http\Middleware;
 
 use Closure;
+use Illuminate\Foundation\Http\MaintenanceModeBypassCookie;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Contracts\Auth\Guard;
@@ -12,6 +13,7 @@
 use Anomaly\Streams\Platform\Application\Application;
 use Illuminate\Contracts\Foundation\Application as Laravel;
 use Illuminate\Foundation\Http\Exceptions\MaintenanceModeException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 /**
  * Class CheckForMaintenanceMode
@@ -30,6 +32,13 @@ class CheckForMaintenanceMode
      */
     protected $app;
 
+    /**
+     * The URIs that should be accessible while maintenance mode is enabled.
+     *
+     * @var array
+     */
+    protected $except = [];
+
     /**
      * The auth guard.
      *
@@ -124,12 +133,118 @@ public function handle(Request $request, Closure $next)
             return $response;
         }
 
-        $data = json_decode(file_get_contents($this->app->storagePath() . '/framework/down'), true);
+        $data = json_decode(file_get_contents($this->app->storagePath().'/framework/down'), true);
 
-        if (isset($data['allowed']) && IpUtils::checkIp($request->ip(), (array) $data['allowed'])) {
+        if (isset($data['secret']) && $request->path() === $data['secret']) {
+            return $this->bypassResponse($data['secret']);
+        }
+
+        if ($this->hasValidBypassCookie($request, $data) ||
+            $this->inExceptArray($request)) {
             return $next($request);
         }
 
-        throw new MaintenanceModeException($data['time'], $data['retry'], $data['message']);
+        if (isset($data['redirect'])) {
+            $path = $data['redirect'] === '/'
+                ? $data['redirect']
+                : trim($data['redirect'], '/');
+
+            if ($request->path() !== $path) {
+                return redirect($path);
+            }
+        }
+
+        if (isset($data['template'])) {
+            return response(
+                $data['template'],
+                $data['status'] ?? 503,
+                $this->getHeaders($data)
+            );
+        }
+
+        throw new HttpException(
+            $data['status'] ?? 503,
+            'Service Unavailable',
+            null,
+            $this->getHeaders($data)
+        );
+    }
+
+    /**
+     * Determine if the incoming request has a maintenance mode bypass cookie.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  array  $data
+     * @return bool
+     */
+    protected function hasValidBypassCookie($request, array $data)
+    {
+        return isset($data['secret']) &&
+            $request->cookie('laravel_maintenance') &&
+            MaintenanceModeBypassCookie::isValid(
+                $request->cookie('laravel_maintenance'),
+                $data['secret']
+            );
+    }
+
+    /**
+     * Determine if the request has a URI that should be accessible in maintenance mode.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
+    protected function inExceptArray($request)
+    {
+        foreach ($this->except as $except) {
+            if ($except !== '/') {
+                $except = trim($except, '/');
+            }
+
+            if ($request->fullUrlIs($except) || $request->is($except)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Redirect the user back to the root of the application with a maintenance mode bypass cookie.
+     *
+     * @param  string  $secret
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function bypassResponse(string $secret)
+    {
+        return redirect('/')->withCookie(
+            MaintenanceModeBypassCookie::create($secret)
+        );
+    }
+
+    /**
+     * Get the headers that should be sent with the response.
+     *
+     * @param  array  $data
+     * @return array
+     */
+    protected function getHeaders($data)
+    {
+        $headers = isset($data['retry']) ? ['Retry-After' => $data['retry']] : [];
+
+        if (isset($data['refresh'])) {
+            $headers['Refresh'] = $data['refresh'];
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Get the URIs that should be accessible even when maintenance mode is enabled.
+     *
+     * @return array
+     */
+    public function getExcludedPaths()
+    {
+        return $this->except;
     }
 }

From fdbfd33f82128215a7a8e9931131204f38d8cea2 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 17 Jan 2022 00:29:56 -0600
Subject: [PATCH 215/256] No such thing.

---
 src/Model/EloquentCriteria.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Model/EloquentCriteria.php b/src/Model/EloquentCriteria.php
index 26372a394..2312b8945 100644
--- a/src/Model/EloquentCriteria.php
+++ b/src/Model/EloquentCriteria.php
@@ -297,10 +297,6 @@ public function __call($name, $arguments)
             return $this->call($hook, $arguments);
         }
 
-        if ($this->query->hasHook($hook)) {
-            return $this->query->call($hook, $arguments);
-        }
-
         if ($this->methodExists($name) && $this->methodIsSafe($name)) {
 
             call_user_func_array([$this->query, $name], $arguments);

From 232ac7c7082686ee70549bb3d2e8162848d0ea7e Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 17 Jan 2022 00:30:58 -0600
Subject: [PATCH 216/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 250602b71..a586fa8ed 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.3] - 2022-01-17
+### Fixed
+- Fix issue where `EloquentCriteria` was returning null.
+
 ### [1.9.2] - 2021-03-22
 ### Fixed
 - Fixed migration class issues.

From 37faec80f95b568dfca248f627abd0b07ff788c2 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Sun, 23 Jan 2022 23:18:18 -0600
Subject: [PATCH 217/256] Add 'F j, Y' option to date format settings.

---
 docs/en/01.prologue/02.change-log.md   | 5 +++++
 resources/config/settings/settings.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index a586fa8ed..5217fd8a6 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.4] - 2022-01-23
+### Added
+- Added `F j, Y` date format option.
+
+
 ### [1.9.3] - 2022-01-17
 ### Fixed
 - Fix issue where `EloquentCriteria` was returning null.
diff --git a/resources/config/settings/settings.php b/resources/config/settings/settings.php
index e8bc8b1d9..5a23ea618 100644
--- a/resources/config/settings/settings.php
+++ b/resources/config/settings/settings.php
@@ -60,6 +60,7 @@
         'required'    => true,
         'config'      => [
             'options' => [
+                'F j, Y' => date('F j, Y'), // July 10, 2015
                 'j F, Y' => date('j F, Y'), // 10 July, 2015
                 'j M, y' => date('j M, y'), // 10 Jul, 15
                 'm/d/Y'  => date('m/d/Y'),  // 07/10/2015

From 180a69f62ca36396f3b15826b7ce0b946a253896 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 11:18:50 -0600
Subject: [PATCH 218/256] Prevent the translatable ID from overlapping the main
 ID in queries.

---
 src/Model/EloquentQueryBuilder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 9e5f508e2..9bdddc876 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -350,6 +350,7 @@ function ($column) use ($model) {
                     array_diff(
                         $this->getConnection()->getSchemaBuilder()->getColumnListing($model->getTranslationTableName()),
                         [
+                            'id',
                             'entry_id',
                             'created_at',
                             'created_by_id',

From abfe58ed15f28fa4d221502ceb1229caf7b4708d Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 11:22:18 -0600
Subject: [PATCH 219/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 5217fd8a6..1b9067a7c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -33,6 +33,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 - Added `F j, Y` date format option.
 
 
+### [1.9.4] - 2022-01-25
+### Fixed
+- Fix issue where translation IDs were overriding main IDs.
+
 ### [1.9.3] - 2022-01-17
 ### Fixed
 - Fix issue where `EloquentCriteria` was returning null.

From 111827a25d922c1516a1eef277cd41f0647b53ac Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 11:22:47 -0600
Subject: [PATCH 220/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 1b9067a7c..45b6a518c 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,7 +28,7 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.9.4] - 2022-01-23
+### [1.9.5] - 2022-01-23
 ### Added
 - Added `F j, Y` date format option.
 

From 47a1d0e18e6e422a21037796af3a69277546bfde Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 11:24:29 -0600
Subject: [PATCH 221/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 45b6a518c..8422ccb68 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,14 +28,13 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
-### [1.9.5] - 2022-01-23
+### [1.9.5] - 2022-01-25
 ### Added
-- Added `F j, Y` date format option.
-
+- Fix issue where translation IDs were overriding main IDs.
 
-### [1.9.4] - 2022-01-25
+### [1.9.4] - 2022-01-23
 ### Fixed
-- Fix issue where translation IDs were overriding main IDs.
+- Added `F j, Y` date format option.
 
 ### [1.9.3] - 2022-01-17
 ### Fixed

From 8bae0934d1e1845aa195f4911b15bdce57199106 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 11:24:48 -0600
Subject: [PATCH 222/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 8422ccb68..8d91aec3d 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -29,11 +29,11 @@ Features that are deprecated will generally be removed in the next `minor` updat
 ## Releases
 
 ### [1.9.5] - 2022-01-25
-### Added
+### Fixed
 - Fix issue where translation IDs were overriding main IDs.
 
 ### [1.9.4] - 2022-01-23
-### Fixed
+### Added
 - Added `F j, Y` date format option.
 
 ### [1.9.3] - 2022-01-17

From 3e379044d3923172fc51857422a3605dd1d57935 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 12:23:50 -0600
Subject: [PATCH 223/256] Replace spaces with + symbols in cache paths."

---
 src/Image/Image.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Image/Image.php b/src/Image/Image.php
index 9066038d4..2a4094397 100644
--- a/src/Image/Image.php
+++ b/src/Image/Image.php
@@ -604,7 +604,7 @@ protected function getCachePath()
             return $this->getImage();
         }
 
-        $path = $this->paths->outputPath($this);
+        $path = str_replace(' ', '+', $this->paths->outputPath($this));
 
         try {
             if ($this->shouldPublish($path)) {

From 5f1e011c485d9a65247b79a12f48ed6d0c34bcd2 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Tue, 25 Jan 2022 12:24:43 -0600
Subject: [PATCH 224/256] Update 02.change-log.md

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index 8d91aec3d..c04b6992d 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.6] - 2022-01-25
+### Changed
+- Replace spaces with `+` in image cache paths.
+
 ### [1.9.5] - 2022-01-25
 ### Fixed
 - Fix issue where translation IDs were overriding main IDs.

From a34ea8ed758543ed1ba36ac37072441632b4d113 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Thu, 27 Jan 2022 00:12:49 -0600
Subject: [PATCH 225/256] Remove the fill symbol a little differently as PHP 8
 behaves a little differently here.

---
 src/Ui/Form/Component/Field/FieldFiller.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Ui/Form/Component/Field/FieldFiller.php b/src/Ui/Form/Component/Field/FieldFiller.php
index 1b488c5ed..49699cacb 100644
--- a/src/Ui/Form/Component/Field/FieldFiller.php
+++ b/src/Ui/Form/Component/Field/FieldFiller.php
@@ -48,6 +48,7 @@ public function fill(FormBuilder $builder)
          * set the position.
          */
         foreach ($fields as $parameters) {
+            
             if (is_string($parameters) && $parameters === '*') {
                 continue;
             }
@@ -68,8 +69,15 @@ public function fill(FormBuilder $builder)
          */
         if (($position = array_search('*', $fields)) !== false) {
             array_splice($fields, $position, null, $fill);
+        }
 
-            unset($fields[array_search('*', $fields)]);
+        /**
+         * Remove the fill symbol.
+         */
+        foreach ($fields as $key => $field) {
+            if (is_string($field) && $field === '*') {
+                unset($fields[$key]);
+            }
         }
 
         $builder->setFields($fields);

From a75f7b63e354c0e4134b97d5c9ce568a63b69780 Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Fri, 28 Jan 2022 10:57:52 -0600
Subject: [PATCH 226/256] Field filler

---
 docs/en/01.prologue/02.change-log.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index c04b6992d..ce6ec6097 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.7] - 2022-01-27
+### Fixed
+- Fix PHP 8 issue where filling `*` fields was removing a field upon symbol removal.
+
 ### [1.9.6] - 2022-01-25
 ### Changed
 - Replace spaces with `+` in image cache paths.

From fa66a3910eb52374d8eb75c7eaf7b6c4071c2dc2 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 15 Feb 2022 17:18:42 +0300
Subject: [PATCH 227/256] for multiple site installer

---
 composer.json                                 |  6 ++--
 src/Addon/AddonManager.php                    | 36 +++++++++++++++++--
 .../Console/Command/SetDatabasePrefix.php     | 11 ++++--
 src/Installer/Console/Install.php             | 18 ++++++++++
 src/Model/EloquentQueryBuilder.php            | 18 +++++++++-
 5 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 1f2f86f8d..23a15a9e7 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "laravel/framework": "^8.0",
         "laravel/helpers": "^1.0",
         "laravel/scout": "^8.2",
-        "doctrine/dbal": "^2.6", 
+        "doctrine/dbal": "^2.6",
         "intervention/image": "^2.5.0",
         "laravelcollective/html": "^6.1",
         "twig/twig": "^2.10",
@@ -28,7 +28,9 @@
         "ezyang/htmlpurifier": "~4.0",
         "tubalmartin/cssmin": "~4.0",
         "fzaninotto/faker": "~1.4",
-        "leafo/scssphp": "^0.8.4"
+        "leafo/scssphp": "^0.8.4",
+        "pyrocms/accelerant-theme": "^1.2",
+        "pyrocms/starter-theme": "^1.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index 30a5039e7..de9ba75f8 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -2,12 +2,14 @@
 
 namespace Anomaly\Streams\Platform\Addon;
 
+use Dotenv\Dotenv;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Contracts\Container\Container;
 use Anomaly\Streams\Platform\Addon\Module\ModuleModel;
 use Anomaly\Streams\Platform\Addon\Extension\ExtensionModel;
 use Anomaly\Streams\Platform\Addon\Event\AddonsHaveRegistered;
+use Symfony\Component\Console\Input\ArgvInput;
 
 /**
  * Class AddonManager
@@ -221,7 +223,22 @@ function () use ($installed) {
      */
     protected function getEnabledAddonNamespaces()
     {
-        if (!env('INSTALLED') || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
+        /*
+         * The INSTALLED variable in the .env file for the site module has been made dynamic.
+         * Owner : Vedat Akdoğan
+         */
+
+        $app = (new ArgvInput())->getParameterOption('--app', env('APPLICATION_REFERENCE', 'default'));
+
+        $is_installed = env('INSTALLED');
+
+        if (env('APPLICATION_REFERENCE', 'default') != $app) {
+
+            $app_config = \Dotenv\Dotenv::parse(file_get_contents(base_path('resources/' . $app . '/.env')));
+            $is_installed = filter_var($app_config['INSTALLED'], FILTER_VALIDATE_BOOLEAN);
+        }
+
+        if (!$is_installed || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
             return [];
         }
 
@@ -266,7 +283,22 @@ function () {
      */
     protected function getInstalledAddonNamespaces()
     {
-        if (!env('INSTALLED') || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
+        /*
+         * The INSTALLED variable in the .env file for the site module has been made dynamic.
+         * Owner : Vedat Akdoğan
+         */
+
+        $app = (new ArgvInput())->getParameterOption('--app', env('APPLICATION_REFERENCE', 'default'));
+
+        $is_installed = env('INSTALLED');
+
+        if (env('APPLICATION_REFERENCE', 'default') != $app) {
+
+            $app_config = \Dotenv\Dotenv::parse(file_get_contents(base_path('resources/' . $app . '/.env')));
+            $is_installed = filter_var($app_config['INSTALLED'], FILTER_VALIDATE_BOOLEAN);
+        }
+
+        if (!$is_installed || (Request::segment(1) !== 'admin' && env('INSTALLED') === 'admin')) {
             return [];
         }
 
diff --git a/src/Installer/Console/Command/SetDatabasePrefix.php b/src/Installer/Console/Command/SetDatabasePrefix.php
index 673d4ee9a..edc4f1a18 100644
--- a/src/Installer/Console/Command/SetDatabasePrefix.php
+++ b/src/Installer/Console/Command/SetDatabasePrefix.php
@@ -1,6 +1,7 @@
 <?php namespace Anomaly\Streams\Platform\Installer\Console\Command;
 
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Symfony\Component\Console\Input\ArgvInput;
 
 /**
  * Class SetDatabasePrefix
@@ -19,9 +20,15 @@ class SetDatabasePrefix
      */
     public function handle()
     {
-        app('db')->getSchemaBuilder()->getConnection()->setTablePrefix(env('APPLICATION_REFERENCE') . '_');
+        /*
+         * The INSTALLED variable in the .env file for the site module has been made dynamic.
+         * Owner : Vedat Akdoğan
+         */
+        $app = (new ArgvInput())->getParameterOption('--app', env('APPLICATION_REFERENCE', 'default'));
+
+        app('db')->getSchemaBuilder()->getConnection()->setTablePrefix($app . '_');
         app('db')->getSchemaBuilder()->getConnection()->getSchemaGrammar()->setTablePrefix(
-            env('APPLICATION_REFERENCE') . '_'
+            $app . '_'
         );
     }
 }
diff --git a/src/Installer/Console/Install.php b/src/Installer/Console/Install.php
index 9ce888526..ce276aa43 100644
--- a/src/Installer/Console/Install.php
+++ b/src/Installer/Console/Install.php
@@ -5,6 +5,7 @@
 use Anomaly\Streams\Platform\Application\Command\LoadEnvironmentOverrides;
 use Anomaly\Streams\Platform\Application\Command\ReloadEnvironmentFile;
 use Anomaly\Streams\Platform\Application\Command\WriteEnvironmentFile;
+use Anomaly\Streams\Platform\Console\Kernel;
 use Anomaly\Streams\Platform\Entry\Command\AutoloadEntryModels;
 use Anomaly\Streams\Platform\Installer\Console\Command\ConfigureDatabase;
 use Anomaly\Streams\Platform\Installer\Console\Command\ConfirmLicense;
@@ -98,6 +99,11 @@ function () use ($manager) {
 
                     $this->call('env:set', ['line' => 'INSTALLED=true']);
 
+                    if ($this->option('app'))
+                    {
+                        $this->call('env:set', ['line' => 'APPLICATION_REFERENCE='.$this->option('app')]);
+                    }
+
                     $this->dispatchNow(new ReloadEnvironmentFile());
                     $this->dispatchNow(new AutoloadEntryModels()); // Don't forget!
 
@@ -114,6 +120,18 @@ function () use ($manager) {
         $this->dispatchNow(new LoadBaseMigrations($installers));
         $this->dispatchNow(new LoadBaseSeeders($installers));
 
+        $installers->push(
+            new Installer(
+                'Set default .env values',
+                function () {
+                    $this->call(
+                        'env:set',
+                        ['line' => 'APPLICATION_REFERENCE=default']
+                    );
+                }
+            )
+        );
+
         $this->dispatchNow(new RunInstallers($installers, $this));
     }
 
diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index bc00c765f..281ad07ba 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -11,6 +11,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Symfony\Component\Console\Input\ArgvInput;
 
 /**
  * Class EloquentQueryBuilder
@@ -287,10 +288,25 @@ protected function orderByDefault()
         $model = $this->getModel();
         $query = $this->getQuery();
 
+        /*
+         * The INSTALLED variable in the .env file for the site module has been made dynamic.
+         * Owner : Vedat Akdoğan
+         */
+
+        $app = (new ArgvInput())->getParameterOption('--app', env('APPLICATION_REFERENCE', 'default'));
+
+        $is_installed = env('INSTALLED');
+
+        if (env('APPLICATION_REFERENCE', 'default') != $app) {
+
+            $app_config = \Dotenv\Dotenv::parse(file_get_contents(base_path('resources/' . $app . '/.env')));
+            $is_installed = filter_var($app_config['INSTALLED'], FILTER_VALIDATE_BOOLEAN);
+        }
+
         if ($query->orders === null) {
             if ($model instanceof AssignmentModel) {
                 $query->orderBy('streams_assignments.sort_order', 'ASC');
-            } elseif ($model instanceof StreamModel && env('INSTALLED')) { // Ensure migrations are complete.
+            } elseif ($model instanceof StreamModel && $is_installed) { // Ensure migrations are complete.
                 $query->orderBy('streams_streams.sort_order', 'ASC');
             } elseif ($model instanceof EntryInterface) {
                 if ($model->getStream()->isSortable()) {

From d3b4624f1a4660598fd0805eb2d5a63f4b77aefe Mon Sep 17 00:00:00 2001
From: Ryan Thompson <ryan@pyrocms.com>
Date: Mon, 21 Feb 2022 13:06:42 -0600
Subject: [PATCH 228/256] Fix issue with filling fields

---
 docs/en/01.prologue/02.change-log.md        | 4 ++++
 src/Ui/Form/Component/Field/FieldFiller.php | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/en/01.prologue/02.change-log.md b/docs/en/01.prologue/02.change-log.md
index ce6ec6097..877946d17 100644
--- a/docs/en/01.prologue/02.change-log.md
+++ b/docs/en/01.prologue/02.change-log.md
@@ -28,6 +28,10 @@ Features that are deprecated will generally be removed in the next `minor` updat
 
 ## Releases
 
+### [1.9.8] - 2022-02-21
+### Fixed
+- Fix PHP 8 issue when filling `*` fields.
+- 
 ### [1.9.7] - 2022-01-27
 ### Fixed
 - Fix PHP 8 issue where filling `*` fields was removing a field upon symbol removal.
diff --git a/src/Ui/Form/Component/Field/FieldFiller.php b/src/Ui/Form/Component/Field/FieldFiller.php
index 49699cacb..e3559963e 100644
--- a/src/Ui/Form/Component/Field/FieldFiller.php
+++ b/src/Ui/Form/Component/Field/FieldFiller.php
@@ -67,10 +67,12 @@ public function fill(FormBuilder $builder)
          * in the remaining fill fields in place
          * of the fill marker.
          */
-        if (($position = array_search('*', $fields)) !== false) {
-            array_splice($fields, $position, null, $fill);
+        if (array_search('*', $fields) !== false) {
+            foreach ($fill as $field) {
+                $fields[] = $field;
+            }
         }
-
+        
         /**
          * Remove the fill symbol.
          */

From 29a80f908503b634468709bed13935cbb06a717c Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 28 Feb 2022 11:39:20 +0300
Subject: [PATCH 229/256] trans table order bug

---
 src/Model/EloquentQueryBuilder.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 281ad07ba..49ceae11a 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -103,6 +103,11 @@ function () use ($columns) {
 
         $this->orderByDefault();
 
+        if ($this->getModel()->isTranslatable())
+        {
+            $this->translate();
+        }
+
         /**
          * Skip this all together if
          * we are not installed or

From 3d25f1ecb5cf047f39ff4f5b9b14062275c27855 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 28 Feb 2022 15:09:28 +0300
Subject: [PATCH 230/256] trans table hotfix

---
 src/Model/EloquentQueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 49ceae11a..0cefc7d43 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -103,7 +103,7 @@ function () use ($columns) {
 
         $this->orderByDefault();
 
-        if ($this->getModel()->isTranslatable())
+        if ($this->model instanceof EntryInterface && $this->getModel()->isTranslatable())
         {
             $this->translate();
         }

From 326a344e983447064f536179a6983141dc904000 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 28 Feb 2022 15:26:44 +0300
Subject: [PATCH 231/256] Revert "trans table order bug"

This reverts commit 29a80f90
---
 src/Model/EloquentQueryBuilder.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 0cefc7d43..281ad07ba 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -103,11 +103,6 @@ function () use ($columns) {
 
         $this->orderByDefault();
 
-        if ($this->model instanceof EntryInterface && $this->getModel()->isTranslatable())
-        {
-            $this->translate();
-        }
-
         /**
          * Skip this all together if
          * we are not installed or

From e91b4b04d92222bf7af44accbd60faebceaf502e Mon Sep 17 00:00:00 2001
From: spektra2147 <spektra2147@gmail.com>
Date: Fri, 4 Mar 2022 18:01:27 +0300
Subject: [PATCH 232/256] fix installation for app

---
 src/Application/Application.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Application/Application.php b/src/Application/Application.php
index d64058dc7..ed62c0a4f 100644
--- a/src/Application/Application.php
+++ b/src/Application/Application.php
@@ -1,5 +1,7 @@
 <?php namespace Anomaly\Streams\Platform\Application;
 
+use Illuminate\Support\Facades\DB;
+
 /**
  * Class Application
  *
@@ -146,7 +148,9 @@ public function getResourcesPath($path = '')
      */
     public function tablePrefix()
     {
-        return $this->reference . '_';
+        $app = DB::select('select * from applications where domain = "' . \Request::server("HTTP_HOST") . '"');
+
+        return (array_first($app)) ? array_first($app)->reference . '_' : $this->reference . '_';
     }
 
     /**

From 7609776988395a5e9fe93e7860eb92add7247f95 Mon Sep 17 00:00:00 2001
From: spektra2147 <39536659+spektra2147@users.noreply.github.com>
Date: Tue, 15 Mar 2022 10:31:24 +0300
Subject: [PATCH 233/256] add domain for app

---
 src/Application/Application.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Application/Application.php b/src/Application/Application.php
index ed62c0a4f..49f912b7a 100644
--- a/src/Application/Application.php
+++ b/src/Application/Application.php
@@ -148,7 +148,11 @@ public function getResourcesPath($path = '')
      */
     public function tablePrefix()
     {
-        $app = DB::select('select * from applications where domain = "' . \Request::server("HTTP_HOST") . '"');
+        $app = DB::select('select applications.* from applications
+                                    left join applications_domains on
+                                    applications.id = applications_domains.application_id
+                                    where applications.domain = "' . \Request::server("HTTP_HOST") . '"
+                                    or applications_domains.domain = "' . \Request::server("HTTP_HOST") . '"');
 
         return (array_first($app)) ? array_first($app)->reference . '_' : $this->reference . '_';
     }

From f89325b5ec4a0fcabac1d405766d255abc9a2b20 Mon Sep 17 00:00:00 2001
From: Mostafa Moradi <mostafa21tr@gmail.com>
Date: Thu, 28 Apr 2022 10:34:06 +0300
Subject: [PATCH 234/256] streams constants edited

---
 resources/views/partials/constants.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/constants.twig b/resources/views/partials/constants.twig
index c114d47fa..96e5fb960 100644
--- a/resources/views/partials/constants.twig
+++ b/resources/views/partials/constants.twig
@@ -1,6 +1,6 @@
 <script type="text/javascript">
 
-    const APPLICATION_URL = "{{ url()|escape }}";
+    const APPLICATION_URL = "";
     const APPLICATION_REFERENCE = "{{ env('APPLICATION_REFERENCE') }}";
     const APPLICATION_DOMAIN = "{{ env('APPLICATION_DOMAIN') }}";
 
@@ -11,5 +11,5 @@
     const REQUEST_ROOT_PATH = "{{ parse_url(request_root()).path }}";
     const TIMEZONE = "{{ config_get('app.timezone') }}";
     const LOCALE = "{{ config_get('app.locale') }}";
-    
+
 </script>

From a77bd904c0d11ef3096151b819a7632bf593857b Mon Sep 17 00:00:00 2001
From: Fatih Alp <fatihalp89@gmail.com>
Date: Sat, 30 Apr 2022 16:20:43 +0300
Subject: [PATCH 235/256] Update composer.json

---
 composer.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 23a15a9e7..45d20ca67 100644
--- a/composer.json
+++ b/composer.json
@@ -28,9 +28,7 @@
         "ezyang/htmlpurifier": "~4.0",
         "tubalmartin/cssmin": "~4.0",
         "fzaninotto/faker": "~1.4",
-        "leafo/scssphp": "^0.8.4",
-        "pyrocms/accelerant-theme": "^1.2",
-        "pyrocms/starter-theme": "^1.0"
+        "leafo/scssphp": "^0.8.4"
     },
     "autoload": {
         "psr-4": {

From b469ed185bdf198d2fe41b798ce039391229502f Mon Sep 17 00:00:00 2001
From: Metehan Celik <80481282+metehancelik@users.noreply.github.com>
Date: Wed, 18 May 2022 17:24:24 +0300
Subject: [PATCH 236/256] translatable salutation added

---
 resources/views/notifications/email.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/notifications/email.twig b/resources/views/notifications/email.twig
index 4f9b89811..271380e01 100644
--- a/resources/views/notifications/email.twig
+++ b/resources/views/notifications/email.twig
@@ -136,7 +136,7 @@
                                                 {% block salutation %}
                                                     <!-- Salutation -->
                                                     <p style="{{ style['paragraph'] }}">
-                                                        {{ salutation ?:'Regards' }},<br>{{ config('app.name') }}
+                                                        {{ trans('visiosoft.module.notifications::field.regards') }},<br>{{ config('app.name') }}
                                                     </p>
                                                 {% endblock %}
 

From 3584b560642395df29dd10c347720903e6d713ef Mon Sep 17 00:00:00 2001
From: Metehan Celik <80481282+metehancelik@users.noreply.github.com>
Date: Wed, 18 May 2022 18:42:08 +0300
Subject: [PATCH 237/256] Update email.twig

---
 resources/views/notifications/email.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/notifications/email.twig b/resources/views/notifications/email.twig
index 271380e01..d30e5ce8e 100644
--- a/resources/views/notifications/email.twig
+++ b/resources/views/notifications/email.twig
@@ -147,7 +147,7 @@
                                                             <tr>
                                                                 <td style="{{ fontFamily }}">
                                                                     <p style="{{ style['paragraph-sub'] }}">
-                                                                        If you’re having trouble clicking the "{{ actionText }}" button, copy and paste the URL below into your web browser:
+                                                                         {{ trans("visiosoft.module.notifications::field.footer_link_message" , {actionText : actionText}) }}
                                                                     </p>
 
                                                                     <p style="{{ style['paragraph-sub'] }}">

From 3397d3c9d4f72e35a8cb56f0e0badc68411fec22 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 26 May 2022 12:03:32 +0300
Subject: [PATCH 238/256] install sort problem

---
 src/Addon/AddonManager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Addon/AddonManager.php b/src/Addon/AddonManager.php
index de9ba75f8..fa3b56c3e 100644
--- a/src/Addon/AddonManager.php
+++ b/src/Addon/AddonManager.php
@@ -202,7 +202,10 @@ function () use ($installed) {
         }
 
         // Sort all addons.
-        $this->addons = $this->addons->sort();
+        /**
+         * Commented because of the sort problem of modules
+         */
+        // $this->addons = $this->addons->sort();
 
         /*
          * Disperse addons to their

From 670a5b6ccd7eba606eb1b4823f768811bccc644a Mon Sep 17 00:00:00 2001
From: erhanask <erhanasik8@gmail.com>
Date: Tue, 6 Sep 2022 12:53:42 +0300
Subject: [PATCH 239/256] Added mail encryption setting.

---
 resources/config/settings/sections.php | 1 +
 resources/config/settings/settings.php | 5 +++++
 resources/lang/en/setting.php          | 4 ++++
 resources/lang/tr/setting.php          | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/resources/config/settings/sections.php b/resources/config/settings/sections.php
index 3a47a0591..237afa272 100644
--- a/resources/config/settings/sections.php
+++ b/resources/config/settings/sections.php
@@ -50,6 +50,7 @@
                     'mail_port',
                     'mail_username',
                     'mail_password',
+                    'mail_encrypt',
                 ],
             ],
             'cache'        => [
diff --git a/resources/config/settings/settings.php b/resources/config/settings/settings.php
index 5a23ea618..491195e22 100644
--- a/resources/config/settings/settings.php
+++ b/resources/config/settings/settings.php
@@ -266,6 +266,11 @@
             'type' => 'password',
         ],
     ],
+    'mail_encrypt'         => [
+        'env'  => 'MAIL_ENCRYPTION',
+        'bind' => 'mail.encryption',
+        'type' => 'anomaly.field_type.text',
+    ],
     'http_cache'            => [
         'env'    => 'HTTP_CACHE',
         'bind'   => 'streams::httpcache.enabled',
diff --git a/resources/lang/en/setting.php b/resources/lang/en/setting.php
index 1cf5ce288..f280065b1 100644
--- a/resources/lang/en/setting.php
+++ b/resources/lang/en/setting.php
@@ -135,6 +135,10 @@
         'label'        => 'SMTP Password',
         'instructions' => 'Specify the SMTP password to use.',
     ],
+    'mail_encrypt'         => [
+        'label'        => 'SMTP Encryption',
+        'instructions' => 'Specify the SMTP encryption to use.',
+    ],
     'http_cache'            => [
         'label'        => 'HTTP Cache',
         'instructions' => 'Do you want to enable HTTP cache?',
diff --git a/resources/lang/tr/setting.php b/resources/lang/tr/setting.php
index b80a6c1f5..9a72bb5a4 100644
--- a/resources/lang/tr/setting.php
+++ b/resources/lang/tr/setting.php
@@ -134,6 +134,10 @@
         'label'        => 'SMTP Şifresi',
         'instructions' => 'Kullanılacak SMTP şifresini belirtin.',
     ],
+    'mail_encrypt'         => [
+        'label'        => 'SMTP Şifreleme',
+        'instructions' => 'Kullanılacak SMTP şifreleme yöntemini belirtin.',
+    ],
     'http_cache'            => [
         'label'        => 'HTTP Önbelleği',
         'instructions' => 'HTTP önbelleğini etkinleştirmek istiyor musunuz?',

From b618973e77ec16121088bc6069bef9d0dc6c9864 Mon Sep 17 00:00:00 2001
From: erhanask <erhanasik8@gmail.com>
Date: Fri, 30 Sep 2022 14:58:46 +0300
Subject: [PATCH 240/256] added default value to mail_encryption setting on
 email tab.

---
 resources/config/settings/settings.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/config/settings/settings.php b/resources/config/settings/settings.php
index 491195e22..34bd1a5f9 100644
--- a/resources/config/settings/settings.php
+++ b/resources/config/settings/settings.php
@@ -270,6 +270,9 @@
         'env'  => 'MAIL_ENCRYPTION',
         'bind' => 'mail.encryption',
         'type' => 'anomaly.field_type.text',
+        'config' => [
+            'default_value' => 'ssl',
+        ],
     ],
     'http_cache'            => [
         'env'    => 'HTTP_CACHE',

From c2341cdc542f4caa8ce236a91ef270e1255967fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedat=20AKDO=C4=9EAN?=
 <39536659+spektra2147@users.noreply.github.com>
Date: Wed, 5 Oct 2022 15:29:00 +0300
Subject: [PATCH 241/256] fixed upgrade problem for PHP8.x

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 45d20ca67..6e055387d 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "ezyang/htmlpurifier": "~4.0",
         "tubalmartin/cssmin": "~4.0",
         "fzaninotto/faker": "~1.4",
-        "leafo/scssphp": "^0.8.4"
+        "scssphp/scssphp": "^1.11"
     },
     "autoload": {
         "psr-4": {

From bb1431288fe768f364cc5800342566208b9431ed Mon Sep 17 00:00:00 2001
From: spektra2147 <spektra2147@gmail.com>
Date: Wed, 5 Oct 2022 15:46:52 +0300
Subject: [PATCH 242/256] update scss package namespace

---
 src/Asset/Asset.php                 | 2 +-
 src/Asset/Filter/RubySassFilter.php | 2 +-
 src/Asset/Filter/RubyScssFilter.php | 2 +-
 src/Asset/Filter/SassFilter.php     | 2 +-
 src/Asset/Filter/ScssFilter.php     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Asset/Asset.php b/src/Asset/Asset.php
index 0fdb4e9cf..492a10ddd 100644
--- a/src/Asset/Asset.php
+++ b/src/Asset/Asset.php
@@ -13,7 +13,7 @@
 use Anomaly\Streams\Platform\Support\Template;
 use Anomaly\Streams\Platform\Application\Application;
 use Anomaly\Streams\Platform\Addon\Theme\ThemeCollection;
-use Leafo\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Compiler;
 
 /**
  * Class Asset
diff --git a/src/Asset/Filter/RubySassFilter.php b/src/Asset/Filter/RubySassFilter.php
index c5be64377..d50ce31f8 100644
--- a/src/Asset/Filter/RubySassFilter.php
+++ b/src/Asset/Filter/RubySassFilter.php
@@ -4,7 +4,7 @@
 use Assetic\Asset\AssetInterface;
 use Assetic\Filter\Sass\SassFilter;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Leafo\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Compiler;
 
 /**
  * Class RubySassFilter
diff --git a/src/Asset/Filter/RubyScssFilter.php b/src/Asset/Filter/RubyScssFilter.php
index e26a7098f..baab956c5 100644
--- a/src/Asset/Filter/RubyScssFilter.php
+++ b/src/Asset/Filter/RubyScssFilter.php
@@ -4,7 +4,7 @@
 use Assetic\Asset\AssetInterface;
 use Assetic\Filter\Sass\ScssFilter;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Leafo\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Compiler;
 
 /**
  * Class RubyScssFilter
diff --git a/src/Asset/Filter/SassFilter.php b/src/Asset/Filter/SassFilter.php
index 80818fc09..e2105b241 100644
--- a/src/Asset/Filter/SassFilter.php
+++ b/src/Asset/Filter/SassFilter.php
@@ -4,7 +4,7 @@
 use Assetic\Asset\AssetInterface;
 use Assetic\Filter\SassphpFilter;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Leafo\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Compiler;
 
 /**
  * Class SassFilter
diff --git a/src/Asset/Filter/ScssFilter.php b/src/Asset/Filter/ScssFilter.php
index a7c1a0cc6..5b78c842d 100644
--- a/src/Asset/Filter/ScssFilter.php
+++ b/src/Asset/Filter/ScssFilter.php
@@ -4,7 +4,7 @@
 use Assetic\Asset\AssetInterface;
 use Assetic\Filter\ScssphpFilter;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Leafo\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Compiler;
 
 /**
  * Class ScssFilter

From 12d161169c35b8a6f6d932e950bffb0dd21360fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedat=20AKDO=C4=9EAN?=
 <39536659+spektra2147@users.noreply.github.com>
Date: Mon, 7 Nov 2022 17:17:32 +0300
Subject: [PATCH 243/256] fix with problem

---
 src/Model/EloquentModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/EloquentModel.php b/src/Model/EloquentModel.php
index 9d9ffa611..497e4e81d 100644
--- a/src/Model/EloquentModel.php
+++ b/src/Model/EloquentModel.php
@@ -657,7 +657,7 @@ public function toArray()
             }
         }
 
-        return $attributes;
+        return array_merge($attributes, $this->relationsToArray());
     }
 
     /**

From 51334d30a6ac70b54597a20610e4c5795f0d293c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedat=20AKDO=C4=9EAN?=
 <39536659+spektra2147@users.noreply.github.com>
Date: Tue, 27 Dec 2022 15:39:25 +0300
Subject: [PATCH 244/256] fix installer error

Contains solution for 'forge'@'localhost' error during installation.
---
 src/Installer/Console/Install.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Installer/Console/Install.php b/src/Installer/Console/Install.php
index ce276aa43..075fa9533 100644
--- a/src/Installer/Console/Install.php
+++ b/src/Installer/Console/Install.php
@@ -30,6 +30,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Symfony\Component\Console\Input\InputOption;
+use Illuminate\Support\Facades\DB;
 
 /**
  * Class Install
@@ -113,6 +114,8 @@ function () use ($manager) {
                 }
             )
         );
+        
+        DB::purge('mysql');
 
         $this->dispatchNow(new LoadModuleSeeders($installers));
         $this->dispatchNow(new LoadExtensionSeeders($installers));

From cc22b1666ecd27034f271d727e2ae3bcb73c4180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedat=20AKDO=C4=9EAN?=
 <39536659+spektra2147@users.noreply.github.com>
Date: Tue, 27 Dec 2022 16:12:27 +0300
Subject: [PATCH 245/256] fix database prefix

fix database prefix
---
 src/Installer/Console/Install.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Installer/Console/Install.php b/src/Installer/Console/Install.php
index 075fa9533..b97281a41 100644
--- a/src/Installer/Console/Install.php
+++ b/src/Installer/Console/Install.php
@@ -84,6 +84,9 @@ public function handle(AddonManager $manager)
         $this->dispatchNow(new InitializeApplication());
 
         $this->dispatchNow(new ConfigureDatabase());
+        
+        DB::purge(config()->get('database.default'));
+        
         $this->dispatchNow(new SetDatabasePrefix());
 
         $installers = new InstallerCollection();
@@ -115,8 +118,6 @@ function () use ($manager) {
             )
         );
         
-        DB::purge('mysql');
-
         $this->dispatchNow(new LoadModuleSeeders($installers));
         $this->dispatchNow(new LoadExtensionSeeders($installers));
 

From b5272135716aff29e39445a233375c3c9d279040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedat=20AKDO=C4=9EAN?=
 <39536659+spektra2147@users.noreply.github.com>
Date: Fri, 24 Mar 2023 10:21:08 +0300
Subject: [PATCH 246/256] fix

---
 src/Model/EloquentModel.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Model/EloquentModel.php b/src/Model/EloquentModel.php
index 497e4e81d..f07a83f20 100644
--- a/src/Model/EloquentModel.php
+++ b/src/Model/EloquentModel.php
@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Robbo\Presenter\PresentableInterface;
+use Anomaly\Streams\Platform\Stream\StreamModel;
 
 /**
  * Class EloquentModel
@@ -657,6 +658,10 @@ public function toArray()
             }
         }
 
+       if ($this instanceof StreamModel) {
+            return $attributes;
+        }
+
         return array_merge($attributes, $this->relationsToArray());
     }
 

From 77fca672470ff26953d842e0373d840e3caa9116 Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Tue, 4 Jul 2023 23:36:39 +0300
Subject: [PATCH 247/256] Update UrlGenerator.php

---
 src/Routing/UrlGenerator.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php
index 3ff5f2f9e..7a34ca09c 100644
--- a/src/Routing/UrlGenerator.php
+++ b/src/Routing/UrlGenerator.php
@@ -35,9 +35,10 @@ public function __construct(RouteCollection $routes, Request $request)
         parent::__construct(app('router')->getRoutes(), $request);
 
         $this->parser = app(Engine::class);
-
+        $this->forceRootUrl(config('app.url'));
+        
         if (defined('LOCALE')) {
-            $this->forceRootUrl($request->root() . '/' . LOCALE);
+            $this->forceRootUrl(config('app.url') . '/' . LOCALE);
         }
     }
 

From d611955334ac358c161a3698662684f08d2407ab Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Tue, 4 Jul 2023 23:43:57 +0300
Subject: [PATCH 248/256] Update UrlGenerator.php

---
 src/Routing/UrlGenerator.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php
index 7a34ca09c..4338aea0b 100644
--- a/src/Routing/UrlGenerator.php
+++ b/src/Routing/UrlGenerator.php
@@ -35,11 +35,13 @@ public function __construct(RouteCollection $routes, Request $request)
         parent::__construct(app('router')->getRoutes(), $request);
 
         $this->parser = app(Engine::class);
-        $this->forceRootUrl(config('app.url'));
-        
+        $forcedRoot = config('app.url');
+
         if (defined('LOCALE')) {
-            $this->forceRootUrl(config('app.url') . '/' . LOCALE);
+            $forcedRoot.='/'.LOCALE;
         }
+
+        $this->forceRootUrl($forcedRoot);
     }
 
     /**

From a79751210b8295017246fed97ef346b312318d17 Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Wed, 5 Jul 2023 09:48:09 +0300
Subject: [PATCH 249/256] Update UrlGenerator.php

---
 src/Routing/UrlGenerator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php
index 4338aea0b..5bd4ed132 100644
--- a/src/Routing/UrlGenerator.php
+++ b/src/Routing/UrlGenerator.php
@@ -35,7 +35,7 @@ public function __construct(RouteCollection $routes, Request $request)
         parent::__construct(app('router')->getRoutes(), $request);
 
         $this->parser = app(Engine::class);
-        $forcedRoot = config('app.url');
+        $forcedRoot = env('APP_URL',$request->root());
 
         if (defined('LOCALE')) {
             $forcedRoot.='/'.LOCALE;

From d63eecce5b8d342395abb506fdf6b6211a602407 Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Fri, 3 Nov 2023 16:37:16 +0300
Subject: [PATCH 250/256] Translatable Field Improvements

If no translation can be found in the default language, it will bring the first one it finds.
---
 src/Model/Traits/Translatable.php | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
index e1bbf6d71..a2a850e81 100644
--- a/src/Model/Traits/Translatable.php
+++ b/src/Model/Traits/Translatable.php
@@ -176,15 +176,15 @@ public function getTranslation($locale = null, $withFallback = true)
 
         // Default to the current locale.
         $locale = $locale ?: app()->getLocale();
-
         /**
          * If we have a desired locale and
          * it exists then just use that locale.
          */
         if ($translation = $this->getTranslationByLocaleKey($locale)) {
-            return $translation;
+            if (!empty($translation->getAttribute('name'))) {
+                return $translation;
+            }
         }
-
         /**
          * If we don't have a locale or it does not exist
          * then go ahead and try using a fallback in using
@@ -193,9 +193,10 @@ public function getTranslation($locale = null, $withFallback = true)
         if ($withFallback
             && $translation = $this->getTranslationByLocaleKey($this->getDefaultLocale())
         ) {
-            return $translation;
+            if (!empty($translation->getAttribute('name'))) {
+                return $translation;
+            }
         }
-
         /**
          * If we still don't have a translation then
          * try looking up the FALLBACK translation.
@@ -205,7 +206,22 @@ public function getTranslation($locale = null, $withFallback = true)
             && $this->getTranslationByLocaleKey($this->getFallbackLocale())
             && $translation = $this->getTranslationByLocaleKey($this->getFallbackLocale())
         ) {
-            return $translation;
+            if (!empty($translation->getAttribute('name'))) {
+                return $translation;
+            }
+        }
+
+        /**
+         * If we still don't have a translation then
+         * try looking up first translation any exist.
+         */
+
+        if ($withFallback) {
+            foreach ($this->getTranslations() as $translation) {
+                if (!empty($translation->getAttribute('name'))) {
+                    return $translation;
+                }
+            }
         }
 
         return null;

From 5f9be5a3cc8ec1c6b32a13dce63acad88b52a1e5 Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Fri, 3 Nov 2023 19:11:03 +0300
Subject: [PATCH 251/256] Hot fix

---
 src/Model/Traits/Translatable.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
index a2a850e81..cbcf05e3f 100644
--- a/src/Model/Traits/Translatable.php
+++ b/src/Model/Traits/Translatable.php
@@ -181,7 +181,7 @@ public function getTranslation($locale = null, $withFallback = true)
          * it exists then just use that locale.
          */
         if ($translation = $this->getTranslationByLocaleKey($locale)) {
-            if (!empty($translation->getAttribute('name'))) {
+            if ($this->checkTranslation($translation)) {
                 return $translation;
             }
         }
@@ -193,7 +193,7 @@ public function getTranslation($locale = null, $withFallback = true)
         if ($withFallback
             && $translation = $this->getTranslationByLocaleKey($this->getDefaultLocale())
         ) {
-            if (!empty($translation->getAttribute('name'))) {
+            if ($this->checkTranslation($translation)) {
                 return $translation;
             }
         }
@@ -206,7 +206,7 @@ public function getTranslation($locale = null, $withFallback = true)
             && $this->getTranslationByLocaleKey($this->getFallbackLocale())
             && $translation = $this->getTranslationByLocaleKey($this->getFallbackLocale())
         ) {
-            if (!empty($translation->getAttribute('name'))) {
+            if ($this->checkTranslation($translation)) {
                 return $translation;
             }
         }
@@ -218,7 +218,7 @@ public function getTranslation($locale = null, $withFallback = true)
 
         if ($withFallback) {
             foreach ($this->getTranslations() as $translation) {
-                if (!empty($translation->getAttribute('name'))) {
+                if ($this->checkTranslation($translation)) {
                     return $translation;
                 }
             }

From 760505641df6c49f6bf93640ffa98596c90a3bdf Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Fri, 3 Nov 2023 19:15:29 +0300
Subject: [PATCH 252/256] Hot Fix

---
 src/Model/Traits/Translatable.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
index cbcf05e3f..9609f4fdf 100644
--- a/src/Model/Traits/Translatable.php
+++ b/src/Model/Traits/Translatable.php
@@ -135,6 +135,18 @@ public function translateOrNew($locale)
         return $this->getTranslationOrNew($locale);
     }
 
+    /*
+     * Check Transaction Validity
+     */
+    public function checkTranslation($translation)
+    {
+        if (!empty($translation->getAttribute('name')) || !empty($translation->getAttribute('title'))) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Get related translations.
      *

From b5ed9b39fb368713818ab82bc27ce579f14b8b08 Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Fri, 3 Nov 2023 19:16:46 +0300
Subject: [PATCH 253/256] Update Translatable.php

---
 src/Model/Traits/Translatable.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
index 9609f4fdf..c3398d80c 100644
--- a/src/Model/Traits/Translatable.php
+++ b/src/Model/Traits/Translatable.php
@@ -146,6 +146,18 @@ public function checkTranslation($translation)
 
         return false;
     }
+    
+   /**
+     * Check Transaction Null
+     */
+    public function checkTranslation($translation)
+    {
+        if (!empty($translation->getAttribute('name')) || !empty($translation->getAttribute('title'))) {
+            return true;
+        }
+
+        return false;
+    }
 
     /**
      * Get related translations.

From 6dc5010d3631e51d9d01265d933d10ffb766606b Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Fri, 3 Nov 2023 19:18:24 +0300
Subject: [PATCH 254/256] hotfix

---
 src/Model/Traits/Translatable.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
index c3398d80c..a56f849b0 100644
--- a/src/Model/Traits/Translatable.php
+++ b/src/Model/Traits/Translatable.php
@@ -136,19 +136,7 @@ public function translateOrNew($locale)
     }
 
     /*
-     * Check Transaction Validity
-     */
-    public function checkTranslation($translation)
-    {
-        if (!empty($translation->getAttribute('name')) || !empty($translation->getAttribute('title'))) {
-            return true;
-        }
-
-        return false;
-    }
-    
-   /**
-     * Check Transaction Null
+     * Check Transaction Is Valid
      */
     public function checkTranslation($translation)
     {

From 6b9d8728356968d7baca7e981729ff734a9c5b1b Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Mon, 6 Nov 2023 12:30:21 +0300
Subject: [PATCH 255/256] lang check fix

---
 src/Model/Traits/Translatable.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Model/Traits/Translatable.php b/src/Model/Traits/Translatable.php
index a56f849b0..db3c1b416 100644
--- a/src/Model/Traits/Translatable.php
+++ b/src/Model/Traits/Translatable.php
@@ -140,11 +140,9 @@ public function translateOrNew($locale)
      */
     public function checkTranslation($translation)
     {
-        if (!empty($translation->getAttribute('name')) || !empty($translation->getAttribute('title'))) {
+        if ($translation || (!empty($translation->name) || !empty($translation->title))) {
             return true;
         }
-
-        return false;
     }
 
     /**
@@ -179,8 +177,8 @@ public function translations()
     /**
      * Get a translation.
      *
-     * @param  null $locale
-     * @param  bool|null $withFallback
+     * @param null $locale
+     * @param bool|null $withFallback
      * @return EloquentModel|null
      */
     public function getTranslation($locale = null, $withFallback = true)
@@ -452,9 +450,9 @@ public function getLocaleKey()
     /**
      * Return if the entry is trashed or not.
      *
+     * @return bool
      * @todo is this really used/needed?
      *
-     * @return bool
      */
     public function trashed()
     {

From faa111be624f934e39d6168faac1536abb6a46d4 Mon Sep 17 00:00:00 2001
From: emrullahardc <emrullahardc@gmail.com>
Date: Fri, 15 Dec 2023 22:51:45 +0300
Subject: [PATCH 256/256] lang-fix

---
 src/Model/EloquentQueryBuilder.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/Model/EloquentQueryBuilder.php b/src/Model/EloquentQueryBuilder.php
index 0decd3ef9..08b23c3f4 100644
--- a/src/Model/EloquentQueryBuilder.php
+++ b/src/Model/EloquentQueryBuilder.php
@@ -384,18 +384,6 @@ function ($column) use ($model) {
          */
         $this->query->groupBy([$model->getTableName() . '.id']);
 
-        /**
-         * Grab either what matches or null because
-         * that should cover every parent record.
-         */
-        $this->query->where(
-            function (\Illuminate\Database\Query\Builder $query) use ($model, $locale) {
-                $query->where($model->getTranslationsTableName() . '.locale', $locale ?: config('app.locale'));//active language
-                $query->orWhere($model->getTranslationsTableName() . '.locale',setting_value('streams::default_locale'));//or default setting language
-                $query->orWhere($model->getTranslationsTableName() . '.locale','en');//or default module language
-            }
-        );
-
         return $this;
     }