Completed
Pull Request — ft/fields-refactor (#231)
by Ben
110:28 queued 99:28
created
src/Filters/Filters.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
     {
38 38
         $requestInput = request()->all();
39 39
 
40
-        return array_reduce($this->all(), function ($carry, Filter $filter) use ($requestInput) {
41
-            return $carry . $filter->render($requestInput);
40
+        return array_reduce($this->all(), function($carry, Filter $filter) use ($requestInput) {
41
+            return $carry.$filter->render($requestInput);
42 42
         }, '');
43 43
     }
44 44
 
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 
55 55
     public function keys(): array
56 56
     {
57
-        return array_map(function (Filter $filter) {
57
+        return array_map(function(Filter $filter) {
58 58
             return $filter->key();
59 59
         }, $this->filters);
60 60
     }
61 61
 
62 62
     private function validateFilters(array $filters)
63 63
     {
64
-        array_map(function (Filter $filter) {
64
+        array_map(function(Filter $filter) {
65 65
         }, $filters);
66 66
     }
67 67
 
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 
87 87
     public function offsetSet($offset, $value)
88 88
     {
89
-        if (! $value instanceof Filter) {
90
-            throw new \InvalidArgumentException('Passed value must be of type ' . Filter::class);
89
+        if (!$value instanceof Filter) {
90
+            throw new \InvalidArgumentException('Passed value must be of type '.Filter::class);
91 91
         }
92 92
 
93 93
         $this->filters[$offset] = $value;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
     private function sanitizeFilters(array $filters)
107 107
     {
108
-        return array_map(function ($filter) {
108
+        return array_map(function($filter) {
109 109
             if (is_string($filter) && class_exists($filter)) {
110 110
                 return $filter::init();
111 111
             }
Please login to merge, or discard this patch.
src/Fields/Types/MediaField.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-declare(strict_types = 1);
2
+declare(strict_types=1);
3 3
 
4 4
 namespace Thinktomorrow\Chief\Fields\Types;
5 5
 
Please login to merge, or discard this patch.
src/Urls/UrlRecord.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,12 +112,12 @@
 block discarded – undo
112 112
             $builder->where('locale', $locale);
113 113
         }
114 114
 
115
-        if (! $includeRedirects) {
115
+        if (!$includeRedirects) {
116 116
             $builder->whereNull('redirect_id');
117 117
         }
118 118
 
119 119
         if ($ignoredModel) {
120
-            $builder->whereNotIn('id', function ($query) use ($ignoredModel) {
120
+            $builder->whereNotIn('id', function($query) use ($ignoredModel) {
121 121
                 $query->select('id')
122 122
                       ->from('chief_urls')
123 123
                       ->where('model_type', '=', $ignoredModel->getMorphClass())
Please login to merge, or discard this patch.
src/Fields/Types/Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types = 1);
3
+declare(strict_types=1);
4 4
 
5 5
 namespace Thinktomorrow\Chief\Fields\Types;
6 6
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
         }
143 143
 
144 144
         if (!in_array($name, ['label', 'key', 'description', 'column', 'name', 'prepend', 'append'])) {
145
-            throw new \InvalidArgumentException('Cannot set value by ['. $name .'].');
145
+            throw new \InvalidArgumentException('Cannot set value by ['.$name.'].');
146 146
         }
147 147
 
148 148
         $this->values[$name] = $arguments[0];
Please login to merge, or discard this patch.
src/Modules/Module.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
             return static::$managedModelKey;
68 68
         }
69 69
 
70
-        throw new \Exception('Missing required static property \'managedModelKey\' on ' . static::class. '.');
70
+        throw new \Exception('Missing required static property \'managedModelKey\' on '.static::class.'.');
71 71
     }
72 72
 
73 73
     /**
Please login to merge, or discard this patch.
src/Concerns/Viewable/ViewPath.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
      */
35 35
     public function get(): string
36 36
     {
37
-        $basePath = $this->viewBasePath ? $this->viewBasePath . '.' : '';
37
+        $basePath = $this->viewBasePath ? $this->viewBasePath.'.' : '';
38 38
         $guessedParentViewName = $this->parent ? $this->parent->viewKey() : '';
39 39
         $guessedViewName = $this->viewable->viewKey();
40 40
 
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
         }
54 54
 
55 55
         foreach ($viewPaths as $viewPath) {
56
-            if (! view()->exists($viewPath)) {
56
+            if (!view()->exists($viewPath)) {
57 57
                 continue;
58 58
             }
59 59
 
60 60
             return $viewPath;
61 61
         }
62 62
 
63
-        if (! view()->exists($basePath.'show')) {
63
+        if (!view()->exists($basePath.'show')) {
64 64
             throw new NotFoundView('Viewfile not found for ['.get_class($this->viewable).']. Make sure the default view ['.$basePath.'show] exists.');
65 65
         }
66 66
     }
Please login to merge, or discard this patch.
src/Common/Helpers/Memoize.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     {
38 38
         foreach ($parameters as $key => $value) {
39 39
             if ($value instanceof Model) {
40
-                $parameters[$key] = get_class($value) . '@' . $value->id;
40
+                $parameters[$key] = get_class($value).'@'.$value->id;
41 41
             }
42 42
         }
43 43
 
Please login to merge, or discard this patch.
src/Urls/Application/SaveUrlSlugs.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     private function saveRecord(string $locale, ?string $slug)
57 57
     {
58 58
         // Existing ones for this locale?
59
-        $nonRedirectsWithSameLocale = $this->existingRecords->filter(function ($record) use ($locale) {
59
+        $nonRedirectsWithSameLocale = $this->existingRecords->filter(function($record) use ($locale) {
60 60
             return (
61 61
                 $record->locale == $locale &&
62 62
                 !$record->isRedirect()
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 
66 66
         // If slug entry is left empty, all existing records will be deleted
67 67
         if (!$slug) {
68
-            $nonRedirectsWithSameLocale->each(function ($existingRecord) {
68
+            $nonRedirectsWithSameLocale->each(function($existingRecord) {
69 69
                 $existingRecord->delete();
70 70
             });
71 71
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         }
82 82
 
83 83
         // Only replace the existing records that differ from the current passed slugs
84
-        $nonRedirectsWithSameLocale->each(function ($existingRecord) use ($slug) {
84
+        $nonRedirectsWithSameLocale->each(function($existingRecord) use ($slug) {
85 85
             if ($existingRecord->slug != $slug) {
86 86
                 $existingRecord->replaceAndRedirect(['slug' => $slug]);
87 87
             }
@@ -126,12 +126,12 @@  discard block
 block discarded – undo
126 126
      */
127 127
     private function deleteIdenticalRedirects($existingRecords, $locale, $slug): void
128 128
     {
129
-        $existingRecords->filter(function ($record) use ($locale) {
129
+        $existingRecords->filter(function($record) use ($locale) {
130 130
             return (
131 131
                 $record->locale == $locale &&
132 132
                 $record->isRedirect()
133 133
             );
134
-        })->each(function ($existingRecord) use ($slug) {
134
+        })->each(function($existingRecord) use ($slug) {
135 135
             if ($existingRecord->slug == $slug) {
136 136
                 $existingRecord->delete();
137 137
             }
@@ -146,11 +146,11 @@  discard block
 block discarded – undo
146 146
 
147 147
         // The old homepage url should be removed since this is no longer in effect.
148 148
         // In case of any redirect to this old homepage, the last used redirect is now back in effect.
149
-        $existingRecords->reject(function ($existingRecord) {
149
+        $existingRecords->reject(function($existingRecord) {
150 150
             return (
151 151
                 $existingRecord->model_type == $this->model->getMorphClass() &&
152 152
                 $existingRecord->model_id == $this->model->id);
153
-        })->each(function ($existingRecord) {
153
+        })->each(function($existingRecord) {
154 154
 
155 155
             // TODO: if there is a redirect to this page, we'll take this one as the new url
156 156
             $existingRecord->delete();
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      */
165 165
     private function prependBaseUrlSegment(string $slug, $locale): string
166 166
     {
167
-        $slugWithBaseSegment = $this->model->baseUrlSegment($locale) . '/' . $slug;
167
+        $slugWithBaseSegment = $this->model->baseUrlSegment($locale).'/'.$slug;
168 168
         $slugWithBaseSegment = trim($slugWithBaseSegment, '/');
169 169
 
170 170
         // If slug with base segment is empty string, it means that the passed slug was probably a "/" character.
Please login to merge, or discard this patch.
src/Urls/UrlSlugField.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
             'baseUrlSegment' => $this->baseUrlSegment,
82 82
             'hint' => null, // Hint placeholder to show url hint when it already exists
83 83
             'is_homepage' => ($this->value() === '/'),
84
-            'show' => !!$this->value(),// show input field or not
84
+            'show' => !!$this->value(), // show input field or not
85 85
         ]);
86 86
     }
87 87
 }
Please login to merge, or discard this patch.