Skip to content

Commit 15dea2b

Browse files
committed
Merge branch '2.x' into 3.x
2 parents dd7d3de + 3a4844a commit 15dea2b

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.github/workflows/fix-php-code-style-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212
with:
1313
ref: ${{ github.head_ref }}
1414

.github/workflows/phpstan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: phpstan
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2

.github/workflows/update-changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v6
1414
with:
1515
ref: 1.x
1616

resources/views/quantity.blade.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
66
$hasInlineLabel = $hasInlineLabel();
77
$extraAlpineAttributes = $getExtraAlpineAttributes();
8+
$extraAttributeBag = $getExtraAttributeBag();
89
$id = $getId();
910
$isDisabled = $isDisabled();
1011
$getMaxValue = $getMaxValue();
@@ -98,6 +99,10 @@
9899
:suffix-icon="$suffixIcon"
99100
:suffix-icon-color="$getSuffixIconColor()"
100101
:valid="! $errors->has($getStatePath)"
102+
:attributes="
103+
\Filament\Support\prepare_inherited_attributes($extraAttributeBag)
104+
->class(['fi-fo-text-input'])
105+
"
101106
>
102107
<div class="w-full flex justify-between items-center gap-x-5">
103108
<div class="grow">

0 commit comments

Comments
 (0)