diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fbe015..ed62ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,69 +4,6 @@ ### UNRELEASED -### v11.8.1 (2025-02-19) +### v12.0.0 (2025-02-26) -- fix: add missing exportRender property #233 - -### v11.8.0 (2025-01-09) - -- feat: add Editor 2.4.0 tags field support #232 -- ci: static analysis - -### v11.7.0 (2024-11-29) - -- feat: clone the "working" Fluent class from laravel #230 -- Fixes #229 -- Closes yajra/laravel-datatables#3201 -- Fix: #231 - -### v11.6.2 (2024-11-18) - -- fix: checking of closure instance missing import #228 -- fix: yajra/laravel-datatables#3197 -- fix: #227 - -### v11.6.1 (2024-11-18) - -- Fix Marcoable trait usage together with Fluent helper #227 -- fix: yajra/laravel-datatables#3190 -- -### v11.6.0 (2024-08-31) - -- feat: add macro in editor builder #225 - -### v11.5.1 (2024-08-31) - -- fix: unauthorized columns being displayed by builder #223 -- fix: #222 - -### v11.5.0 (2024-08-31) - -- feat: enable macro on Button builder #224 - -### v11.4.0 (2024-05-31) - -- feat: add className method to Editor Field #220 - -### v11.3.0 (2024-05-18) - -- feat: Allow passing view and livewire components to layout builder #219 - -### v11.2.1 (2024-04-29) - -- fix: multiple config option of select2 #218 - -### v11.2.0 (2024-04-24) - -- feat: load layout from view using selector #217 - -### v11.1.0 (2024-04-24) - -- feat: layout builder #216 -- https://datatables.net/reference/option/layout - -### v11.0.0 (2024-03-14) - -- Add support for Laravel 11.x -- Fix editor scope compatibility with Fluent class scope -- Rename Editor `scope` method to `formScope` +- feat: Laravel 12 support #234 diff --git a/composer.json b/composer.json index 3182b14..784ffcb 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,13 @@ "require": { "php": "^8.2", "ext-json": "*", - "yajra/laravel-datatables-oracle": "^11.0" + "yajra/laravel-datatables-oracle": "^12.0" }, "require-dev": { - "larastan/larastan": "^2.9.1", - "orchestra/testbench": "^9", - "laravel/pint": "^1.14", - "rector/rector": "^1.0", + "larastan/larastan": "^3.1", + "orchestra/testbench": "^10", + "laravel/pint": "^1.21", + "rector/rector": "^2.0", "livewire/livewire": "^3.4" }, "suggest": { @@ -43,7 +43,7 @@ }, "extra": { "branch-alias": { - "dev-master": "11.0-dev" + "dev-master": "12.x-dev" }, "laravel": { "providers": [ diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 92b6e18..23d24cc 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -10,8 +10,11 @@ parameters: ignoreErrors: - '#Unsafe usage of new static\(\).#' - - identifier: missingType.generics - - identifier: missingType.iterableValue + - identifier: missingType.generics + - identifier: missingType.iterableValue + - identifier: binaryOp.invalid + - identifier: return.type + - identifier: argument.type excludePaths: - ./src/Html/Fluent.php diff --git a/src/Html/Button.php b/src/Html/Button.php index e25892f..0823962 100755 --- a/src/Html/Button.php +++ b/src/Html/Button.php @@ -271,10 +271,12 @@ public function addClass(string $class): static { if (! isset($this->attributes['className'])) { $this->attributes['className'] = $class; - } else { - $this->attributes['className'] .= " $class"; + + return $this; } + $this->attributes['className'] = $this->attributes['className']." $class"; + return $this; } diff --git a/src/Html/Column.php b/src/Html/Column.php index bfaa34b..fcebc04 100644 --- a/src/Html/Column.php +++ b/src/Html/Column.php @@ -503,7 +503,7 @@ public function parseRender(mixed $value): ?string return $value($parameters); } elseif ($this->isBuiltInRenderFunction($value)) { return $value; - } elseif (strlen((string) $value) < 256 && $view->exists($value)) { + } elseif (is_string($value) && strlen($value) < 256 && $view->exists($value)) { return $view->make($value)->with($parameters)->render(); }