Skip to content

Commit d65fa36

Browse files
authored
Merge pull request #234 from yajra/laravel-12
feat: Laravel 12 support
2 parents 76cb7a4 + 919437a commit d65fa36

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
"require": {
2020
"php": "^8.2",
2121
"ext-json": "*",
22-
"yajra/laravel-datatables-oracle": "^11.0"
22+
"yajra/laravel-datatables-oracle": "^12.0"
2323
},
2424
"require-dev": {
25-
"larastan/larastan": "^2.9.1",
26-
"orchestra/testbench": "^9",
27-
"laravel/pint": "^1.14",
28-
"rector/rector": "^1.0",
25+
"larastan/larastan": "^3.1",
26+
"orchestra/testbench": "^10",
27+
"laravel/pint": "^1.21",
28+
"rector/rector": "^2.0",
2929
"livewire/livewire": "^3.4"
3030
},
3131
"suggest": {
@@ -43,7 +43,7 @@
4343
},
4444
"extra": {
4545
"branch-alias": {
46-
"dev-master": "11.0-dev"
46+
"dev-master": "12.x-dev"
4747
},
4848
"laravel": {
4949
"providers": [

phpstan.neon.dist

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ parameters:
1010

1111
ignoreErrors:
1212
- '#Unsafe usage of new static\(\).#'
13-
- identifier: missingType.generics
14-
- identifier: missingType.iterableValue
13+
- identifier: missingType.generics
14+
- identifier: missingType.iterableValue
15+
- identifier: binaryOp.invalid
16+
- identifier: return.type
17+
- identifier: argument.type
1518

1619
excludePaths:
1720
- ./src/Html/Fluent.php

src/Html/Button.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,12 @@ public function addClass(string $class): static
271271
{
272272
if (! isset($this->attributes['className'])) {
273273
$this->attributes['className'] = $class;
274-
} else {
275-
$this->attributes['className'] .= " $class";
274+
275+
return $this;
276276
}
277277

278+
$this->attributes['className'] = $this->attributes['className']." $class";
279+
278280
return $this;
279281
}
280282

src/Html/Column.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public function parseRender(mixed $value): ?string
503503
return $value($parameters);
504504
} elseif ($this->isBuiltInRenderFunction($value)) {
505505
return $value;
506-
} elseif (strlen((string) $value) < 256 && $view->exists($value)) {
506+
} elseif (is_string($value) && strlen($value) < 256 && $view->exists($value)) {
507507
return $view->make($value)->with($parameters)->render();
508508
}
509509

0 commit comments

Comments
 (0)