thinktomorrow / chief

src/Managers/Assistants/CrudAssistant.php

Braces +9 added lines, -3 removed lines

@@ -39,7 +39,9 @@ 
 
     public function canCrudAssistant(string $action, $model = null): bool
     {
-        if(!in_array($action, ['index', 'create', 'store', 'edit', 'update', 'delete'])) return false;
+        if(!in_array($action, ['index', 'create', 'store', 'edit', 'update', 'delete'])) {
+            return false;
+        }
 
         try {
 
@@ -58,9 +60,13 @@ 
             return false;
         }
 
-        if(in_array($action, ['index', 'create', 'store'])) return true;
+        if(in_array($action, ['index', 'create', 'store'])) {
+            return true;
+        }
 
-        if(!$model || !$model instanceof StatefulContract) return true;
+        if(!$model || !$model instanceof StatefulContract) {
+            return true;
+        }
 
         // Model cannot be in deleted state for editing purposes.
         if(in_array($action, ['edit', 'update'])) {

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
 
     public function canCrudAssistant(string $action, $model = null): bool
     {
-        if(!in_array($action, ['index', 'create', 'store', 'edit', 'update', 'delete'])) return false;
+        if (!in_array($action, ['index', 'create', 'store', 'edit', 'update', 'delete'])) return false;
 
         try {
 
@@ -56,12 +56,12 @@ 
             return false;
         }
 
-        if(in_array($action, ['index', 'create', 'store'])) return true;
+        if (in_array($action, ['index', 'create', 'store'])) return true;
 
-        if(!$model || !$model instanceof StatefulContract) return true;
+        if (!$model || !$model instanceof StatefulContract) return true;
 
         // Model cannot be in deleted state for editing purposes.
-        if(in_array($action, ['edit', 'update'])) {
+        if (in_array($action, ['edit', 'update'])) {
             return !($model->stateOf(PageState::KEY) == PageState::DELETED);
         }
 
@@ -99,14 +99,14 @@ 
         // Default sorted by publish date
         $modelClass = $this->managedModelClass();
         if (Schema::hasColumn((new $modelClass)->getTable(), 'published_at')) {
-            $filters = $filters->add(HiddenFilter::make('publish', function ($query) {
+            $filters = $filters->add(HiddenFilter::make('publish', function($query) {
                 return $query->orderBy('published_at', 'DESC');
             }));
         }
 
         // if model has no timestamps, updated_at doesn't exist
         if ((new $modelClass)->timestamps) {
-            $filters = $filters->add(HiddenFilter::make('updated', function ($query) {
+            $filters = $filters->add(HiddenFilter::make('updated', function($query) {
                 return $query->orderBy('updated_at', 'DESC');
             }));
         }
@@ -140,7 +140,7 @@ 
         $model->saveFields($model->fields()->notTagged('edit'), $request->all(), $request->allFiles());
 
         return redirect()->to($this->route('edit', $model))
-            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "' . $model->adminLabel('title') . '" is toegevoegd');
+            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "'.$model->adminLabel('title').'" is toegevoegd');
     }
 
     public function edit(Request $request, $id)
@@ -167,7 +167,7 @@ 
         $model->saveFields($model->fields()->notTagged('create'), $request->all(), $request->allFiles());
 
         return redirect()->to($this->route('index'))
-            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  <a href="' . $this->route('edit', $model) . '">' . $model->adminLabel('title') . '</a> is aangepast');
+            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  <a href="'.$this->route('edit', $model).'">'.$model->adminLabel('title').'</a> is aangepast');
     }
 
     public function delete(Request $request, $id)
@@ -177,12 +177,12 @@ 
         $this->guard('delete', $model);
 
         if ($request->get('deleteconfirmation') !== 'DELETE') {
-            return redirect()->back()->with('messages.warning', $model->adminLabel('title') . ' is niet verwijderd.');
+            return redirect()->back()->with('messages.warning', $model->adminLabel('title').' is niet verwijderd.');
         }
 
         app(DeleteModel::class)->handle($model);
 
         return redirect()->to($this->route('index'))
-            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "' . $model->adminLabel('title') . '" is verwijderd.');
+            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "'.$model->adminLabel('title').'" is verwijderd.');
     }
 }

src/ManagedModels/Fields/Fields.php

Spacing +13 added lines, -13 removed lines

@@ -40,8 +40,8 @@ 
 
     public function find(string $key): Field
     {
-        if(!isset($this->fields[$key])) {
-            throw new \InvalidArgumentException('No field found by key ' . $key);
+        if (!isset($this->fields[$key])) {
+            throw new \InvalidArgumentException('No field found by key '.$key);
         }
 
         return $this->fields[$key];
@@ -108,7 +108,7 @@ 
                 continue;
             }
 
-            $method = 'get' . ucfirst($key);
+            $method = 'get'.ucfirst($key);
 
             // Reject from list if value does not match expected one
             if ($value && $value == $field->$method()) {
@@ -124,23 +124,23 @@ 
 
     public function render(): string
     {
-        return array_reduce($this->fields, function (string $carry, Field $field) {
-            return $carry . $field->render();
+        return array_reduce($this->fields, function(string $carry, Field $field) {
+            return $carry.$field->render();
         }, '');
     }
 
     public function keyed($key): Fields
     {
-        $keys = (array) $key;
+        $keys = (array)$key;
 
-        return new static(array_filter($this->fields, function (Field $field) use ($keys) {
+        return new static(array_filter($this->fields, function(Field $field) use ($keys) {
             return in_array($field->getKey(), $keys);
         }));
     }
 
     public function tagged($tag): Fields
     {
-        return new static(array_filter($this->fields, function (Field $field) use ($tag) {
+        return new static(array_filter($this->fields, function(Field $field) use ($tag) {
             return $field->tagged($tag);
         }));
     }
@@ -148,14 +148,14 @@ 
     public function notTagged($tag): Fields
     {
         // TODO: to test this...
-        return new static(array_filter($this->fields, function (Field $field) use ($tag) {
+        return new static(array_filter($this->fields, function(Field $field) use ($tag) {
             return !$field->tagged($tag);
         }));
     }
 
     public function untagged(): Fields
     {
-        return new static(array_filter($this->fields, function (Field $field) {
+        return new static(array_filter($this->fields, function(Field $field) {
             return $field->untagged();
         }));
     }
@@ -197,7 +197,7 @@ 
     public function offsetGet($offset)
     {
         if (!isset($this->fields[$offset])) {
-            throw new \RuntimeException('No field found by key [' . $offset . ']');
+            throw new \RuntimeException('No field found by key ['.$offset.']');
         }
 
         return $this->fields[$offset];
@@ -206,7 +206,7 @@ 
     public function offsetSet($offset, $value)
     {
         if (!$value instanceof Field) {
-            throw new \InvalidArgumentException('Passed value must be of type ' . Field::class);
+            throw new \InvalidArgumentException('Passed value must be of type '.Field::class);
         }
 
         $this->fields[$offset] = $value;
@@ -236,7 +236,7 @@ 
 
     private function validateFields(array $fields)
     {
-        array_map(function (Field $field) {
+        array_map(function(Field $field) {
         }, $fields);
     }
 

src/ManagedModels/Duplication/PageDuplicator.php

Spacing +2 added lines, -2 removed lines

@@ -53,13 +53,13 @@
 
             if ($child instanceof Module && $child->isPageSpecific()) {
                 $duplicatedChild = $child::create([
-                    'slug'           => $targetModel->title ? $targetModel->title . '-' . $child->slug : $child->slug . '-copy',
+                    'slug'           => $targetModel->title ? $targetModel->title.'-'.$child->slug : $child->slug.'-copy',
                     'owner_id'        => $targetModel->id,
                     'owner_type' => $targetModel->getMorphClass()
                 ]);
 
                 $this->moduleTemplateApplicator->handle($child, $duplicatedChild);
-            } else {
+            }else {
                 $duplicatedChild = $child;
             }
 

src/ManagedModels/Application/DuplicateContext.php

Spacing +2 added lines, -2 removed lines

@@ -22,12 +22,12 @@
 
     public function handle($sourceModel, $targetModel): void
     {
-        if(!$sourceModel instanceof FragmentsOwner || !$context = ContextModel::ownedBy($sourceModel)) return;
+        if (!$sourceModel instanceof FragmentsOwner || !$context = ContextModel::ownedBy($sourceModel)) return;
 
         $copiedContext = ContextModel::createForOwner($targetModel);
 
         /** @var FragmentModel $fragment */
-        foreach($context->fragments as $fragment) {
+        foreach ($context->fragments as $fragment) {
             $copiedFragment = $fragment->replicate(['context_id']);
             $copiedFragment->id = $this->fragmentRepository->nextId();
             $copiedFragment->context_id = $copiedContext->id;

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 
     public function handle($sourceModel, $targetModel): void
     {
-        if(!$sourceModel instanceof FragmentsOwner || !$context = ContextModel::ownedBy($sourceModel)) return;
+        if(!$sourceModel instanceof FragmentsOwner || !$context = ContextModel::ownedBy($sourceModel)) {
+            return;
+        }
 
         $copiedContext = ContextModel::createForOwner($targetModel);
 

src/Managers/Assistants/FragmentAssistant.php

Spacing +7 added lines, -7 removed lines

@@ -31,18 +31,18 @@ 
 
     public function routeFragmentAssistant(string $action, $model = null, ...$parameters): ?string
     {
-        if(!in_array($action, ['fragment-edit','fragment-update','fragment-delete','fragment-create','fragment-store'])) {
+        if (!in_array($action, ['fragment-edit', 'fragment-update', 'fragment-delete', 'fragment-create', 'fragment-store'])) {
             return null;
         }
 
         $modelKey = $this->managedModelClass()::managedModelKey();
 
-        if(in_array($action, ['fragment-create', 'fragment-store'])) {
+        if (in_array($action, ['fragment-create', 'fragment-store'])) {
             if (!$model || !$model instanceof FragmentsOwner) {
                 throw new \Exception('Fragment route definition for '.$action.' requires the owning Model as second argument.');
             }
 
-            return route('chief.' . $modelKey . '.' . $action, array_merge([
+            return route('chief.'.$modelKey.'.'.$action, array_merge([
                 $model::managedModelKey(),
                 $model->modelReference()->id(),
             ], $parameters));
@@ -52,12 +52,12 @@ 
             throw new \Exception('Fragment route definition for '.$action.' requires the fragment model as second argument.');
         }
 
-        return route('chief.' . $modelKey . '.' . $action, $model->fragmentModel()->id);
+        return route('chief.'.$modelKey.'.'.$action, $model->fragmentModel()->id);
     }
 
     public function canFragmentAssistant(string $action, $model = null): bool
     {
-        return in_array($action, ['fragment-edit','fragment-update','fragment-delete','fragment-create','fragment-store']);
+        return in_array($action, ['fragment-edit', 'fragment-update', 'fragment-delete', 'fragment-create', 'fragment-store']);
     }
 
     public function fragmentCreate(Request $request, string $ownerKey, $ownerId)
@@ -144,13 +144,13 @@ 
         $model = $this->managedModelClass()::findOrFail($id);
 
         if ($request->get('deleteconfirmation') !== 'DELETE') {
-            return redirect()->back()->with('messages.warning', $model->adminLabel('title') . ' is niet verwijderd.');
+            return redirect()->back()->with('messages.warning', $model->adminLabel('title').' is niet verwijderd.');
         }
 
         app(DeleteModel::class)->handle($model);
 
         return redirect()->to($this->route('index'))
-            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "' . $model->adminLabel('title') . '" is verwijderd.');
+            ->with('messages.success', '<i class="fa fa-fw fa-check-circle"></i>  "'.$model->adminLabel('title').'" is verwijderd.');
     }
 
     private function owner(string $ownerKey, $ownerId): FragmentsOwner

src/Shared/ModelReferences/ModelReference.php

Spacing +6 added lines, -6 removed lines

@@ -24,16 +24,16 @@ 
     public static function fromString(string $reference): self
     {
         if (false == strpos($reference, '@')) {
-            throw new \InvalidArgumentException('Invalid reference composition. A model reference should consist of schema <class>@<id>. [' . $reference . '] was passed instead.');
+            throw new \InvalidArgumentException('Invalid reference composition. A model reference should consist of schema <class>@<id>. ['.$reference.'] was passed instead.');
         }
 
         list($className, $id) = explode('@', $reference);
 
-        if("" === $id) {
-            throw new \InvalidArgumentException('Missing id on model reference. [' . $reference . '] was passed.');
+        if ("" === $id) {
+            throw new \InvalidArgumentException('Missing id on model reference. ['.$reference.'] was passed.');
         }
 
-        return new static($className, (int) $id);
+        return new static($className, (int)$id);
     }
 
     /**
@@ -45,7 +45,7 @@ 
     {
         $className = $this->className();
 
-        if($this->id == 0) {
+        if ($this->id == 0) {
             return new $className($attributes);
         }
 
@@ -67,7 +67,7 @@ 
 
     public function get(): string
     {
-        return $this->className . '@' . $this->id;
+        return $this->className.'@'.$this->id;
     }
 
     public function equals($other): bool

src/Shared/Helpers/Form.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
      */
     public static function foreachTrans(array $translations, \Closure $callback)
     {
-        foreach($translations as $locale => $trans){
-            foreach($trans as $key => $value){
+        foreach ($translations as $locale => $trans) {
+            foreach ($trans as $key => $value) {
                 call_user_func($callback, $locale, $key, $value);
             }
         }

src/ManagedModels/Application/DeleteModel.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
             // so the user has a small window of recovery
 
             if($model instanceof HasAsset) {
-                 $this->detachAsset->detachAll($model);
+                    $this->detachAsset->detachAll($model);
             }
             // TODO: soft-delete the context of this model... (=fragments)
 //            Relation::deleteRelationsOf($model->getMorphClass(), $model->id);

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             // TODO: schedule for deletion instead of instantly deleting all relations and stuff...
             // so the user has a small window of recovery
 
-            if($model instanceof HasAsset) {
+            if ($model instanceof HasAsset) {
                  $this->detachAsset->detachAll($model);
             }
             // TODO: soft-delete the context of this model... (=fragments)

src/ManagedModels/Assistants/SavingFields.php

Spacing +12 added lines, -12 removed lines

@@ -26,12 +26,12 @@ 
      */
     public function saveFields(Fields $fields, array $input, array $files): void
     {
-        foreach($fields as $field){
-            if($this->detectCustomSaveMethod($field)) {
+        foreach ($fields as $field) {
+            if ($this->detectCustomSaveMethod($field)) {
                 continue;
             }
 
-            if(!$field->isLocalized())
+            if (!$field->isLocalized())
             {
                 // Set standard non-localized attribute on the model
                 ($customSetMethod = $this->detectCustomSetMethod($field))
@@ -44,11 +44,11 @@ 
             // Dynamic localized values or standard translated
             // For standard translations we set value with the colon notation, e.g. title:en
             Form::foreachTrans(data_get($input, 'trans', []), function($locale, $key, $value) use($field){
-                if($key !== $field->getColumn()) return;
+                if ($key !== $field->getColumn()) return;
 
-                if($this->isFieldForDynamicValue($field)) {
+                if ($this->isFieldForDynamicValue($field)) {
                     $this->setDynamic($key, $value, $locale);
-                } else {
+                }else {
                     $this->{$field->getColumn().':'.$locale} = $value;
                 }
             });
@@ -57,8 +57,8 @@ 
         $this->save();
 
         // Custom save methods
-        foreach($fields as $field){
-            if($customSaveMethod = $this->detectCustomSaveMethod($field)) {
+        foreach ($fields as $field) {
+            if ($customSaveMethod = $this->detectCustomSaveMethod($field)) {
                 $this->$customSaveMethod($field, $input, $files);
             }
         }
@@ -71,8 +71,8 @@ 
 
     private function detectCustomSaveMethod(Field $field): ?string
     {
-        $saveMethodByKey = 'save' . ucfirst(Str::camel($field->getKey())) . 'Field';
-        $saveMethodByType = 'save' . ucfirst(Str::camel($field->getType()->get())) . 'Fields';
+        $saveMethodByKey = 'save'.ucfirst(Str::camel($field->getKey())).'Field';
+        $saveMethodByType = 'save'.ucfirst(Str::camel($field->getType()->get())).'Fields';
 
         foreach ([$saveMethodByKey, $saveMethodByType] as $saveMethod) {
             if (method_exists($this, $saveMethod)) {
@@ -85,7 +85,7 @@ 
 
     private function detectCustomSetMethod(Field $field): ?string
     {
-        $methodName = 'set' . ucfirst(Str::camel($field->getKey())) . 'Field';
+        $methodName = 'set'.ucfirst(Str::camel($field->getKey())).'Field';
 
         return (method_exists($this, $methodName)) ? $methodName : null;
     }
@@ -107,6 +107,6 @@ 
 
     private function saveImageFields(ImageField $field, array $input)
     {
-        app(ImageFieldHandler::class)->handle($this, $field, data_get($input, 'images.' . $field->getName(), []), $input);
+        app(ImageFieldHandler::class)->handle($this, $field, data_get($input, 'images.'.$field->getName(), []), $input);
     }
 }

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
             // Dynamic localized values or standard translated
             // For standard translations we set value with the colon notation, e.g. title:en
             Form::foreachTrans(data_get($input, 'trans', []), function($locale, $key, $value) use($field){
-                if($key !== $field->getColumn()) return;
+                if($key !== $field->getColumn()) {
+                    return;
+                }
 
                 if($this->isFieldForDynamicValue($field)) {
                     $this->setDynamic($key, $value, $locale);