Skip to content

Commit

Permalink
Refactor Igniter class to facade
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Poyigi <[email protected]>
  • Loading branch information
sampoyigi committed Dec 28, 2024
1 parent f792770 commit 8dca0ad
Show file tree
Hide file tree
Showing 46 changed files with 421 additions and 409 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"nunomaduro/collision": "^8.1",
"larastan/larastan": "^2.4.0",
"orchestra/testbench": "^9.0",
"pestphp/pest": "^2.34",
"pestphp/pest-plugin-laravel": "^2.3"
"pestphp/pest": "^3.7",
"pestphp/pest-plugin-laravel": "^3.0"
},
"replace": {
"kriswallsmith/assetic": "*",
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Classes/RouteRegistrar.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace Igniter\Admin\Classes;

use Igniter\Flame\Igniter;
use Igniter\Flame\Support\Facades\File;
use Igniter\Flame\Support\Facades\Igniter;
use Illuminate\Routing\Router;
use Illuminate\Support\Collection;
use Illuminate\Support\Str;
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Helpers/AdminHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Igniter\Admin\Helpers;

use Igniter\Flame\Exception\SystemException;
use Igniter\Flame\Igniter;
use Igniter\Flame\Support\Facades\Igniter;
use Igniter\Flame\Support\RouterHelper;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Redirect;
Expand Down
8 changes: 4 additions & 4 deletions src/Admin/Http/Actions/FormController.php
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ public function getFormContext(): ?string

protected function setFormTitle(?string $default = null)
{
$title = lang($this->getConfig('name'));
$title = lang($this->getConfig('name', 'igniter::admin.form.name'));
$lang = lang($this->getConfig($this->context.'[title]', $default));

$pageTitle = str_contains($lang, ':name')
Expand Down Expand Up @@ -417,9 +417,9 @@ protected function setModelAttributes(Model $model, mixed $saveData)
$singularTypes = ['belongsTo', 'hasOne', 'morphOne'];
foreach ($saveData as $attribute => $value) {
$isNested = ($attribute == 'pivot' || (
$model->hasRelation($attribute) &&
in_array($model->getRelationType($attribute), $singularTypes)
));
$model->hasRelation($attribute) &&
in_array($model->getRelationType($attribute), $singularTypes)
));

if ($isNested && is_array($value) && $model->{$attribute}) {
$this->setModelAttributes($model->{$attribute}, $value);
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Providers/FormServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Igniter\Admin\Classes\OnboardingSteps;
use Igniter\Admin\Classes\Widgets;
use Igniter\Flame\Igniter;
use Igniter\Flame\Support\Facades\Igniter;
use Illuminate\Support\ServiceProvider;

class FormServiceProvider extends ServiceProvider
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/Providers/MenuItemServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Igniter\Admin\Classes\MainMenuItem;
use Igniter\Admin\Classes\Navigation;
use Igniter\Admin\Facades\AdminMenu;
use Igniter\Flame\Igniter;
use Igniter\Flame\Support\Facades\Igniter;
use Illuminate\Support\ServiceProvider;

class MenuItemServiceProvider extends ServiceProvider
Expand Down
2 changes: 1 addition & 1 deletion src/Admin/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
namespace Igniter\Admin;

use Igniter\Admin\Helpers\AdminHelper;
use Igniter\Flame\Igniter;
use Igniter\Flame\Providers\AppServiceProvider;
use Igniter\Flame\Support\Facades\File;
use Igniter\Flame\Support\Facades\Igniter;
use Igniter\System\Libraries\Assets;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Foundation\AliasLoader;
Expand Down
8 changes: 4 additions & 4 deletions src/Admin/Traits/ValidatesForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Closure;
use Igniter\Admin\Widgets\Form;
use Igniter\Flame\Igniter;
use Igniter\Flame\Support\Facades\Igniter;
use Igniter\System\Helpers\ValidationHelper;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Support\Arr;
Expand Down Expand Up @@ -54,7 +54,7 @@ public function makeValidator(mixed $request, array $rules, array $messages = []
$customAttributes = Arr::get($parsed, 'attributes', $customAttributes);

$validator = validator()->make(
$request ?? [], $rules, $messages, $customAttributes
$request ?? [], $rules, $messages, $customAttributes,
);

if ($this->validateAfterCallback instanceof Closure) {
Expand Down Expand Up @@ -110,7 +110,7 @@ protected function validateFormWidget(Form $form, mixed $saveData): mixed
if ($rules = array_get($form->config, 'rules')) {
$validated = $this->validate($saveData, $rules,
array_get($form->config, 'validationMessages', []),
array_get($form->config, 'validationAttributes', [])
array_get($form->config, 'validationAttributes', []),
);
}

Expand All @@ -119,7 +119,7 @@ protected function validateFormWidget(Form $form, mixed $saveData): mixed
$validated = array_merge($validated,
$this->resolveFormRequest($requestClass, function($request) use ($saveData) {
$request->merge($saveData);
})->validated()
})->validated(),
);
}

Expand Down
Loading

0 comments on commit 8dca0ad

Please sign in to comment.