Completed
Pull Request — ft/fragments (#440)
by Ben
19:55 queued 12:00
created
src/Management/Assistants/UrlAssistant.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 
70 70
         // Push update to homepage setting value
71 71
         // TODO: we should just fetch the homepages and push that instead...
72
-        UrlRecord::getByModel($this->manager->existingModel())->reject(function ($record) {
72
+        UrlRecord::getByModel($this->manager->existingModel())->reject(function($record) {
73 73
             return ($record->isRedirect() || !$record->isHomepage());
74
-        })->each(function ($record) {
74
+        })->each(function($record) {
75 75
             app(ChangeHomepage::class)->onUrlChanged($record);
76 76
         });
77 77
     }
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
     private function validateModel()
85 85
     {
86 86
         if (!$this->manager->existingModel() instanceof ProvidesUrl) {
87
-            throw new \Exception('UrlAssistant requires the model interfaced by ' . ProvidesUrl::class . '.');
87
+            throw new \Exception('UrlAssistant requires the model interfaced by '.ProvidesUrl::class.'.');
88 88
         }
89 89
     }
90 90
 }
Please login to merge, or discard this patch.
src/Relations/AvailableChildren.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
     public function onlyModules(): Collection
38 38
     {
39
-        return $this->collection()->reject(function ($item) {
39
+        return $this->collection()->reject(function($item) {
40 40
             if ($item instanceof Page || $item instanceof StoredSetReference) {
41 41
                 return true;
42 42
             }
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
     public function onlyPages(): Collection
47 47
     {
48
-        return $this->collection()->filter(function ($item) {
48
+        return $this->collection()->filter(function($item) {
49 49
             if ($item instanceof Page) {
50 50
                 return true;
51 51
             }
@@ -75,12 +75,12 @@  discard block
 block discarded – undo
75 75
 
76 76
         // Merging the results of all the pages and all the modules, then filter by the config
77 77
         // This prevents us from having duplicates and also reduces the query load.
78
-        $collection = $collection->filter(function ($page) use ($available_children_types) {
78
+        $collection = $collection->filter(function($page) use ($available_children_types) {
79 79
             return in_array(get_class($page), $available_children_types);
80 80
         });
81 81
 
82 82
         // Filter out our already loaded pages and modules
83
-        $remaining_children_types = collect($available_children_types)->reject(function ($type) {
83
+        $remaining_children_types = collect($available_children_types)->reject(function($type) {
84 84
             return (new $type() instanceof Page || new $type() instanceof Module);
85 85
         });
86 86
 
@@ -92,12 +92,12 @@  discard block
 block discarded – undo
92 92
         }
93 93
 
94 94
         // Remove duplicate models
95
-        $collection = $collection->unique(function ($model) {
95
+        $collection = $collection->unique(function($model) {
96 96
             return (new FlatReference(get_class($model), $model->id))->get();
97 97
         });
98 98
 
99 99
         // Filter out our parent
100
-        return $this->collection = $collection->reject(function ($item) {
100
+        return $this->collection = $collection->reject(function($item) {
101 101
             if ($item instanceof $this->parent) {
102 102
                 return $item->id == $this->parent->id;
103 103
             }
Please login to merge, or discard this patch.
src/Settings/SettingFieldsManager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@
 block discarded – undo
51 51
 
52 52
     public function editFields(): Fields
53 53
     {
54
-        return $this->fields()->map(function (Field $field) {
55
-            return $field->valueResolver(function ($model = null, $locale = null, $field) {
54
+        return $this->fields()->map(function(Field $field) {
55
+            return $field->valueResolver(function($model = null, $locale = null, $field) {
56 56
                 return $this->settings->get($field->getKey(), $locale);
57 57
             });
58 58
         });
Please login to merge, or discard this patch.
src/Fragments/HasFragments.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
         ], $fragment->getValues());
25 25
 
26 26
         if ($fragment->hasModelId()) {
27
-            $model =FragmentModel::find($fragment->getModelId());
27
+            $model = FragmentModel::find($fragment->getModelId());
28 28
             $model->update($values);
29 29
 
30 30
             return $model->id;
Please login to merge, or discard this patch.
src/Fragments/FragmentField.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -63,22 +63,22 @@
 block discarded – undo
63 63
                 ->setModelIdInputName($this->name . '[' . $k . '][modelId]')
64 64
                 ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) {
65 65
                     return $field->name($this->name . '.' . $k . '.' . $field->getName())
66
-                                 ->localizedFormat(':name.:locale')
67
-                                 ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) {
68
-                                     if (isset($field->value)) {
69
-                                         return $field->value;
70
-                                     }
71
-
72
-                                     if ($field instanceof MediaField) {
73
-                                         if (!$fragment->hasModelId()) {
74
-                                             return [];
75
-                                         }
76
-
77
-                                         return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale);
78
-                                     }
79
-
80
-                                     return $fragment->getValue($field->getColumn(), $locale);
81
-                                 });
66
+                                    ->localizedFormat(':name.:locale')
67
+                                    ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) {
68
+                                        if (isset($field->value)) {
69
+                                            return $field->value;
70
+                                        }
71
+
72
+                                        if ($field instanceof MediaField) {
73
+                                            if (!$fragment->hasModelId()) {
74
+                                                return [];
75
+                                            }
76
+
77
+                                            return $field->getMedia(FragmentModel::find($fragment->getModelId()), $locale);
78
+                                        }
79
+
80
+                                        return $fragment->getValue($field->getColumn(), $locale);
81
+                                    });
82 82
                 }));
83 83
         }
84 84
 
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,11 +48,11 @@  discard block
 block discarded – undo
48 48
         // Model is auto-injected by Manager::editFields() method.
49 49
         if (($this->model)) {
50 50
             if (!method_exists($this->model, 'getFragments')) {
51
-                throw new \RuntimeException(get_class($this->model) . ' is missing the ' . HasFragments::class . ' trait.');
51
+                throw new \RuntimeException(get_class($this->model).' is missing the '.HasFragments::class.' trait.');
52 52
             }
53 53
 
54 54
             if (count($modelFragments = $this->model->getFragments($this->getKey())) > 0) {
55
-                $fragments = $modelFragments->map(function (FragmentModel $fragmentModel) {
55
+                $fragments = $modelFragments->map(function(FragmentModel $fragmentModel) {
56 56
                     return Fragment::fromModel($fragmentModel);
57 57
                 })->all();
58 58
             }
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 
61 61
         foreach ($fragments as $k => $fragment) {
62 62
             $fragments[$k] = $fragments[$k]
63
-                ->setModelIdInputName($this->name . '[' . $k . '][modelId]')
64
-                ->setFields($this->fields->clone()->map(function (Field $field) use ($k, $fragment) {
65
-                    return $field->name($this->name . '.' . $k . '.' . $field->getName())
63
+                ->setModelIdInputName($this->name.'['.$k.'][modelId]')
64
+                ->setFields($this->fields->clone()->map(function(Field $field) use ($k, $fragment) {
65
+                    return $field->name($this->name.'.'.$k.'.'.$field->getName())
66 66
                                  ->localizedFormat(':name.:locale')
67
-                                 ->valueResolver(function ($model = null, $locale = null, $field) use ($fragment) {
67
+                                 ->valueResolver(function($model = null, $locale = null, $field) use ($fragment) {
68 68
                                      if (isset($field->value)) {
69 69
                                          return $field->value;
70 70
                                      }
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
         }
111 111
 
112 112
         // Take the fields from the first fragment as a starting point for duplication
113
-        return array_map(function (\Thinktomorrow\Chief\Fields\Types\Field $field) {
114
-            return $field->valueResolver(function ($model = null, $locale = null, $field) {
113
+        return array_map(function(\Thinktomorrow\Chief\Fields\Types\Field $field) {
114
+            return $field->valueResolver(function($model = null, $locale = null, $field) {
115 115
                 if ($field instanceof \Thinktomorrow\Chief\Fields\Types\MediaField) {
116 116
                     return [];
117 117
                 }
Please login to merge, or discard this patch.
src/Fragments/Fragment.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
     public static function fromModel(FragmentModel $fragmentModel): self
36 36
     {
37
-        return new static($fragmentModel->key, $fragmentModel->values->all(), new Fields(), (int) $fragmentModel->id);
37
+        return new static($fragmentModel->key, $fragmentModel->values->all(), new Fields(), (int)$fragmentModel->id);
38 38
     }
39 39
 
40 40
     public static function fromNew(string $key, array $values): self
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         $modelId = $payload['modelId'];
57 57
         unset($payload['modelId']);
58 58
 
59
-        return new static($key, $payload, new Fields(), (int) $modelId);
59
+        return new static($key, $payload, new Fields(), (int)$modelId);
60 60
     }
61 61
 
62 62
     public function setFields(Fields $fields): self
Please login to merge, or discard this patch.
src/Fragments/ManagesFragments.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,15 +13,15 @@
 block discarded – undo
13 13
     public function saveFragmentFields(FragmentField $fragmentField, Request $request)
14 14
     {
15 15
         $payload = $request->input($fragmentField->getDottedName(), []);
16
-        $imagePayload = $request->input('images.' . $fragmentField->getDottedName(), []);
16
+        $imagePayload = $request->input('images.'.$fragmentField->getDottedName(), []);
17 17
 
18 18
         // Compose Fragment instances for each payload entry
19
-        $fragments = array_map(function ($fragmentPayload) use ($fragmentField) {
19
+        $fragments = array_map(function($fragmentPayload) use ($fragmentField) {
20 20
             return Fragment::fromRequestPayload($fragmentField->getKey(), $fragmentPayload); // (new Fragment($field->getKey(), $fragmentPayload));
21 21
         }, $payload);
22 22
 
23 23
         // remove all dead fragments
24
-        $this->existingModel()->removeAllFragments($fragmentField->getKey(), array_map(function (Fragment $fragment) {
24
+        $this->existingModel()->removeAllFragments($fragmentField->getKey(), array_map(function(Fragment $fragment) {
25 25
             return $fragment->hasModelId() ? $fragment->getModelId() : null;
26 26
         }, $fragments));
27 27
 
Please login to merge, or discard this patch.
src/DynamicAttributes/DynamicAttributes.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
         $value = is_null($value) ? [] : (is_array($value) ? $value : json_decode($value, true));
24 24
 
25
-        return new static((array) $value);
25
+        return new static((array)$value);
26 26
     }
27 27
 
28 28
     public function has(string $key): bool
Please login to merge, or discard this patch.
src/Fields/Types/ImageField.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     {
21 21
         return (new static(new FieldType(FieldType::IMAGE), $key))
22 22
             ->locales([config('app.fallback_locale', 'nl')])
23
-            ->valueResolver(function ($model = null, $locale = null, ImageField $field) {
23
+            ->valueResolver(function($model = null, $locale = null, ImageField $field) {
24 24
                 return $field->getMedia($model, $locale);
25 25
             });
26 26
     }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         $images = [];
40 40
         $locale = $locale ?? app()->getLocale();
41 41
 
42
-        $assets = $model->assetRelation->where('pivot.type', $this->getKey())->filter(function ($asset) use ($locale) {
42
+        $assets = $model->assetRelation->where('pivot.type', $this->getKey())->filter(function($asset) use ($locale) {
43 43
             return $asset->pivot->locale == $locale;
44 44
         })->sortBy('pivot.order');
45 45
 
Please login to merge, or discard this patch.