Merge branch 'hotfix/8.6.1'

waynestate · Dec 7, 2023 · 64771a4 · 64771a4
2 parents f96faad + f9613bf
commit 64771a4
Show file tree

Hide file tree

Showing 18 changed files with 1,761 additions and 1,570 deletions.
diff --git a/app/Console/Commands/BaseFeature.php b/app/Console/Commands/BaseFeature.php
@@ -91,7 +91,7 @@ public function menu()
 
         $menu[101]['submenu'][999]['submenu'][$item['menu_item_id']] = $item;
 
-        Storage::disk('base')->put('styleguide/menu.json', json_encode($menu, JSON_UNESCAPED_UNICODE|JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
+        Storage::disk('base')->put('styleguide/menu.json', json_encode($menu, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
     }
 
     public function page()

diff --git a/app/Http/Middleware/Data.php b/app/Http/Middleware/Data.php
@@ -128,7 +128,7 @@ public function getPathFromRequest(Request $request): string
         // Check the route uri and trim off all parts that are route parameters.
         $path = collect(explode('/', $uri))
             ->filter(function ($item) {
-                if (! strstr($item, '{')) {
+                if (!strstr($item, '{')) {
                     return $item;
                 }
             })

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -26,7 +26,7 @@ public function boot(): void
             $params = explode(',', $expression);
 
             // We have three parameters that are optional so we need to set them as blank strings if they weren't passed in
-            for ($i=0; $i <= 2; $i++) {
+            for ($i = 0; $i <= 2; $i++) {
                 if (empty($params[$i])) {
                     $params[$i] = "''";
                 }
@@ -45,7 +45,7 @@ public function boot(): void
             }
 
             // We have three parameters that are optional so we need to set them as blank strings if they weren't passed in
-            for ($i=0; $i <= 2; $i++) {
+            for ($i = 0; $i <= 2; $i++) {
                 if (empty($params[$i])) {
                     $params[$i] = "''";
                 }

diff --git a/app/Repositories/ArticleRepository.php b/app/Repositories/ArticleRepository.php
@@ -26,7 +26,7 @@ public function __construct(News $newsApi, Repository $cache)
     /**
      * {@inheritdoc}
      */
-    public function listing($application_ids, $limit=5, $page=1, $topics=[])
+    public function listing($application_ids, $limit = 5, $page = 1, $topics = [])
     {
         if (empty($application_ids)) {
             return ['articles' => []];
@@ -128,11 +128,11 @@ public function setPaging($meta, $page)
             $meta['next_page_url'] = null;
             $meta['prev_page_url'] = ($meta['total'] < $meta['per_page']) ? null : url()->current().'?page=2';
         } elseif ($page == $meta['last_page']) {
-            $meta['next_page_url'] = url()->current().'?page='.($page-1);
+            $meta['next_page_url'] = url()->current().'?page='.($page - 1);
             $meta['prev_page_url'] = null;
         } else {
-            $meta['next_page_url'] = url()->current().(($page-1 == 1) ? '' : '?page='.($page-1));
-            $meta['prev_page_url'] = url()->current().'?page='.($page+1);
+            $meta['next_page_url'] = url()->current().(($page - 1 == 1) ? '' : '?page='.($page - 1));
+            $meta['prev_page_url'] = url()->current().'?page='.($page + 1);
         }
 
         return $meta;

diff --git a/app/Repositories/MenuRepository.php b/app/Repositories/MenuRepository.php
@@ -247,7 +247,7 @@ public function getBreadcrumbs($menu, $siteTitle = null, $subsiteFolder = null)
                 $rel_subsiteFolder = '/'.rtrim($subsiteFolder, '/');
 
                 // Add the subsite path if it doesn't exist in the breadcrumbs
-                if (! collect($breadcrumbs)->contains('relative_url', $rel_subsiteFolder)) {
+                if (!collect($breadcrumbs)->contains('relative_url', $rel_subsiteFolder)) {
                     $subsite_crumb = [
                         'display_name' => $siteTitle,
                         'relative_url' => $rel_subsiteFolder,

diff --git a/app/Repositories/ProfileRepository.php b/app/Repositories/ProfileRepository.php
@@ -233,7 +233,7 @@ public function getProfile(int $site_id, string $accessid): array
         });
 
         if (!empty($profiles['error'])) {
-            return ['profile'=> []];
+            return ['profile' => []];
         }
 
         if (!empty($profiles['profiles'][$site_id]['data']['Youtube Videos'])) {

diff --git a/app/Repositories/PromoRepository.php b/app/Repositories/PromoRepository.php
@@ -82,7 +82,7 @@ public function getRequestData(array $data)
         })->toArray();
 
         // If there is an accordion custom page field then inject it into the group reference
-        if (!empty($data['data']['accordion_promo_group_id']) && ! array_key_exists($data['data']['accordion_promo_group_id'], $group_reference)) {
+        if (!empty($data['data']['accordion_promo_group_id']) && !array_key_exists($data['data']['accordion_promo_group_id'], $group_reference)) {
             $group_reference[$data['data']['accordion_promo_group_id']] = 'accordion_page';
         }