@@ -40,11 +40,11 @@ |
||
40 | 40 | |
41 | 41 | public static function notAllowedAction($action, string $managerKey) |
42 | 42 | { |
43 | - return new self('Not allowed to ' . $action . ' a model. ' . ucfirst($action) . ' route is not allowed by the ' . $managerKey . ' manager.'); |
|
43 | + return new self('Not allowed to '.$action.' a model. '.ucfirst($action).' route is not allowed by the '.$managerKey.' manager.'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public static function notAllowedPermission($permission, string $managerKey) |
47 | 47 | { |
48 | - return new self('Not allowed permission for ' . $permission . ' on a model as managed by the ' . $managerKey . ' manager.'); |
|
48 | + return new self('Not allowed permission for '.$permission.' on a model as managed by the '.$managerKey.' manager.'); |
|
49 | 49 | } |
50 | 50 | } |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | |
26 | 26 | public function routeFragmentsAssistant(string $action, $model = null, ...$parameters): ?string |
27 | 27 | { |
28 | - if(!in_array($action, ['fragments-index','fragments-reorder'])) return null; |
|
28 | + if (!in_array($action, ['fragments-index', 'fragments-reorder'])) return null; |
|
29 | 29 | |
30 | 30 | return $this->generateRoute($action, $model, ...$parameters); |
31 | 31 | } |
32 | 32 | |
33 | 33 | public function canFragmentsAssistant(string $action, $model = null): bool |
34 | 34 | { |
35 | - return in_array($action, ['fragments-index','fragments-reorder']); |
|
35 | + return in_array($action, ['fragments-index', 'fragments-reorder']); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function fragmentsIndex(Request $request, $id) |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | $model = $modelClass::findOrFail($id); |
44 | 44 | |
45 | 45 | // Current fragments |
46 | - $fragments = app(FragmentRepository::class)->getByOwner($model)->map(function(Fragmentable $model){ |
|
46 | + $fragments = app(FragmentRepository::class)->getByOwner($model)->map(function(Fragmentable $model) { |
|
47 | 47 | return [ |
48 | 48 | 'model' => $model, |
49 | 49 | 'manager' => app(Registry::class)->manager($model::managedModelKey()), |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | }); |
52 | 52 | |
53 | 53 | // Available fragments |
54 | - $allowedFragments = array_map(function($fragmentableClass){ |
|
54 | + $allowedFragments = array_map(function($fragmentableClass) { |
|
55 | 55 | $modelClass = app(Registry::class)->modelClass($fragmentableClass::managedModelKey()); |
56 | 56 | return [ |
57 | 57 | 'manager' => app(Registry::class)->manager($fragmentableClass::managedModelKey()), |
@@ -25,7 +25,9 @@ |
||
25 | 25 | |
26 | 26 | public function routeFragmentsAssistant(string $action, $model = null, ...$parameters): ?string |
27 | 27 | { |
28 | - if(!in_array($action, ['fragments-index','fragments-reorder'])) return null; |
|
28 | + if(!in_array($action, ['fragments-index','fragments-reorder'])) { |
|
29 | + return null; |
|
30 | + } |
|
29 | 31 | |
30 | 32 | return $this->generateRoute($action, $model, ...$parameters); |
31 | 33 | } |
@@ -34,7 +34,7 @@ discard block |
||
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 |
||
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 |
@@ -13,15 +13,15 @@ |
||
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 |
@@ -63,22 +63,22 @@ |
||
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 |
@@ -48,11 +48,11 @@ discard block |
||
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 |
||
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 |
||
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\ManagedModels\Fields\Types\Field $field) { |
|
114 | - return $field->valueResolver(function ($model = null, $locale = null, $field) { |
|
113 | + return array_map(function(\Thinktomorrow\Chief\ManagedModels\Fields\Types\Field $field) { |
|
114 | + return $field->valueResolver(function($model = null, $locale = null, $field) { |
|
115 | 115 | if ($field instanceof \Thinktomorrow\Chief\ManagedModels\Fields\Types\MediaField) { |
116 | 116 | return []; |
117 | 117 | } |
@@ -24,7 +24,7 @@ |
||
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; |
@@ -33,12 +33,12 @@ discard block |
||
33 | 33 | // TODO: how to assign for pagebuilder?? with tag, via the chief relations config or is this default |
34 | 34 | $moduleManagerClasses = $this->registry->tagged('module')->get(); |
35 | 35 | trap('working on it'); |
36 | - $managers = collect(array_map(function($moduleManagerClass){ |
|
36 | + $managers = collect(array_map(function($moduleManagerClass) { |
|
37 | 37 | return app($moduleManagerClass); |
38 | 38 | }, $moduleManagerClasses)); |
39 | 39 | |
40 | 40 | return $managers |
41 | - ->reject(function($manager){ return !$manager->can('create'); }) |
|
41 | + ->reject(function($manager) { return !$manager->can('create'); }) |
|
42 | 42 | ->map(function($manager) { |
43 | 43 | return [ |
44 | 44 | 'label' => $manager->adminLabel('page_title'), |
@@ -53,13 +53,13 @@ discard block |
||
53 | 53 | // Get the modules that are set to be shareable. |
54 | 54 | $moduleManagerClasses = $this->shareableModules(); |
55 | 55 | |
56 | - $managers = collect(array_map(function($moduleManagerClass){ |
|
56 | + $managers = collect(array_map(function($moduleManagerClass) { |
|
57 | 57 | return app($moduleManagerClass); |
58 | 58 | }, $moduleManagerClasses)); |
59 | 59 | |
60 | 60 | return $managers |
61 | - ->reject(function($manager){ return !$manager->can('create-shared'); }) |
|
62 | - ->map(function($manager){ |
|
61 | + ->reject(function($manager) { return !$manager->can('create-shared'); }) |
|
62 | + ->map(function($manager) { |
|
63 | 63 | return [ |
64 | 64 | 'label' => $manager->adminLabel('page_title'), |
65 | 65 | 'value' => $manager->route('create-shared') |
@@ -29,7 +29,7 @@ |
||
29 | 29 | */ |
30 | 30 | public function create(FragmentsOwner $owner, Fragmentable $fragmentable, int $order, array $data = []): FragmentModel |
31 | 31 | { |
32 | - if(!$context = ContextModel::ownedBy($owner)) { |
|
32 | + if (!$context = ContextModel::ownedBy($owner)) { |
|
33 | 33 | $context = ContextModel::createForOwner($owner); |
34 | 34 | } |
35 | 35 |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | public function render(Collection $fragmentables, FragmentsOwner $owner, $viewData = []): string |
16 | 16 | { |
17 | 17 | // Validate each entry as a valid fragment object. |
18 | - $fragmentables->each(function(Fragmentable $fragmentable){}); |
|
18 | + $fragmentables->each(function(Fragmentable $fragmentable) {}); |
|
19 | 19 | |
20 | 20 | // Init new loop object |
21 | 21 | $this->loopsStack = []; $this->addLoop($fragmentables); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $this->incrementLoopIndices(); |
25 | 25 | $loop = $this->getLastLoop(); |
26 | 26 | |
27 | - return $carry . $fragmentable->renderFragment($owner, $loop, $fragmentables, $viewData); |
|
27 | + return $carry.$fragmentable->renderFragment($owner, $loop, $fragmentables, $viewData); |
|
28 | 28 | }, ''); |
29 | 29 | } |
30 | 30 | } |