Skip to content

Commit ed323a2

Browse files
jessarcherjessarcher
committed
Merge branch '3.x'
2 parents b73483d + 9ee902d commit ed323a2

16 files changed

+197
-37
lines changed

‎.github/workflows/pull-requests.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: pull requests
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
uneditable:
12+
uses: laravel/.github/.github/workflows/pull-requests.yml@main

‎.github/workflows/tests.yml

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
with:
3333
php-version: ${{ matrix.php }}
3434
extensions: dom, curl, libxml, mbstring, redis, zip
35+
ini-values: error_reporting=E_ALL
36+
tools: composer:v2
3537
coverage: none
3638

3739
- name: Install dependencies

‎.github/workflows/update-changelog.yml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: update changelog
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
update:
9+
uses: laravel/.github/.github/workflows/update-changelog.yml@main

‎CHANGELOG.md

+65-26
Original file line numberDiff line numberDiff line change
@@ -1,188 +1,227 @@
11
# Release Notes
22

3-
## [Unreleased](https://github.com/laravel/ui/compare/v3.4.1...master)
3+
## [Unreleased](https://github.com/laravel/ui/compare/v3.4.6...master)
44

5+
## [v3.4.6](https://github.com/laravel/ui/compare/v3.4.5...v3.4.6) - 2022-05-20
6+
7+
### Fixes
8+
9+
- Fixes AuthenticatesUsers always force remember me by @crynobone in https://github.com/laravel/ui/pull/227
10+
11+
## [v3.4.5](https://github.com/laravel/ui/compare/v3.4.4...v3.4.5) - 2022-02-22
12+
13+
### Changed
14+
15+
- Update 2014_10_12_100000_create_password_resets_table.php by @ashkanfekridev in https://github.com/laravel/ui/pull/223
16+
17+
## [v3.4.4](https://github.com/laravel/ui/compare/v3.4.3...v3.4.4) - 2022-02-15
18+
19+
### Fixed
20+
21+
- Update ConfirmsPasswords.php by @hannah-massey in https://github.com/laravel/ui/pull/222
22+
23+
## [v3.4.3](https://github.com/laravel/ui/compare/v3.4.2...v3.4.3) - 2022-02-08
24+
25+
### Changed
26+
27+
- Replace removeSpecialCharacters method with Str Helper Equivalent ([#219](https://github.com/laravel/ui/pull/219))
28+
29+
## [v3.4.2 (2021-12-25)](https://github.com/laravel/ui/compare/v3.4.1...v3.4.2)
30+
31+
### Fixed
32+
33+
- Update app.stub with correct Bootstrap 5 class ([#215](https://github.com/laravel/ui/pull/215))
34+
- Fix bug where special characters can be used when generating throttle key ([#216](https://github.com/laravel/ui/pull/216))
535

636
## [v3.4.1 (2021-12-22)](https://github.com/laravel/ui/compare/v3.4.0...v3.4.1)
737

838
### Fixed
9-
- Fix Bootstrap 5 text alignment ([#213](https://github.com/laravel/ui/pull/213))
1039

40+
- Fix Bootstrap 5 text alignment ([#213](https://github.com/laravel/ui/pull/213))
1141

1242
## [v3.4.0 (2021-11-30)](https://github.com/laravel/ui/compare/v3.3.3...v3.4.0)
1343

1444
### Changed
15-
- Update library to Boostrap 5 ([#212](https://github.com/laravel/ui/pull/212))
1645

46+
- Update library to Boostrap 5 ([#212](https://github.com/laravel/ui/pull/212))
1747

1848
## [v3.3.3 (2021-11-21)](https://github.com/laravel/ui/compare/v3.3.2...v3.3.3)
1949

2050
### Added
21-
- Laravel 9 Support ([08ea313](https://github.com/laravel/ui/commit/08ea313a35dfc89ff0cd9916ca0bcef9715d0ed6))
2251

52+
- Laravel 9 Support ([08ea313](https://github.com/laravel/ui/commit/08ea313a35dfc89ff0cd9916ca0bcef9715d0ed6))
2353

2454
## [v3.3.2 (2021-11-05)](https://github.com/laravel/ui/compare/v3.3.1...v3.3.2)
2555

2656
### Fixed
27-
- Fix session issue ([9fbdf77](https://github.com/laravel/ui/commit/9fbdf7751119aa6b5047607266a7c0f6e0e24905))
2857

58+
- Fix session issue ([9fbdf77](https://github.com/laravel/ui/commit/9fbdf7751119aa6b5047607266a7c0f6e0e24905))
2959

3060
## [v3.3.1 (2021-11-02)](https://github.com/laravel/ui/compare/v3.3.0...v3.3.1)
3161

3262
### Fixed
33-
- Set `password_confirmed_at` on login ([#208](https://github.com/laravel/ui/pull/208))
3463

64+
- Set `password_confirmed_at` on login ([#208](https://github.com/laravel/ui/pull/208))
3565

3666
## [v3.3.0 (2021-05-25)](https://github.com/laravel/ui/compare/v3.2.1...v3.3.0)
3767

3868
### Added
39-
- Use new Password::defaults() feature ([#204](https://github.com/laravel/ui/pull/204))
4069

70+
- Use new Password::defaults() feature ([#204](https://github.com/laravel/ui/pull/204))
4171

4272
## [v3.2.1 (2021-04-27)](https://github.com/laravel/ui/compare/v3.2.0...v3.2.1)
4373

4474
### Changed
75+
4576
- Use trans helper instead of Lang Facade ([#201](https://github.com/laravel/ui/pull/201))
4677
- Update NPM dependencies ([#203](https://github.com/laravel/ui/pull/203))
4778

48-
4979
## [v3.2.0 (2021-01-06)](https://github.com/laravel/ui/compare/v3.1.0...v3.2.0)
5080

5181
### Changed
52-
- Tweak stubs for Mix 6 ([#193](https://github.com/laravel/ui/pull/193))
5382

83+
- Tweak stubs for Mix 6 ([#193](https://github.com/laravel/ui/pull/193))
5484

5585
## [v3.1.0 (2020-11-03)](https://github.com/laravel/ui/compare/v3.0.0...v3.1.0)
5686

5787
### Added
88+
5889
- Added PHP 8 Support ([#178](https://github.com/laravel/ui/pull/178))
5990

6091
### Changed
92+
6193
- Add sourcemaps to webpack config ([#168](https://github.com/laravel/ui/pull/168))
6294

6395
### Fixed
64-
- Wrap login link in app.stub with a route check ([#177](https://github.com/laravel/ui/pull/177))
6596

97+
- Wrap login link in app.stub with a route check ([#177](https://github.com/laravel/ui/pull/177))
6698

6799
## [v3.0.0 (2020-09-11)](https://github.com/laravel/ui/compare/v2.4.0...v3.0.0)
68100

69101
### Added
102+
70103
- Laravel 8 support ([#155](https://github.com/laravel/ui/pull/155))
71104

72105
### Fixed
73-
- Fetch reset token explicitly ([#130](https://github.com/laravel/ui/pull/130))
74106

107+
- Fetch reset token explicitly ([#130](https://github.com/laravel/ui/pull/130))
75108

76109
## [v2.4.1 (2020-09-22)](https://github.com/laravel/ui/compare/v2.4.0...v2.4.1)
77110

78111
### Changed
79-
- Revert "Add namespace check to Auth routes" ([#160](https://github.com/laravel/ui/pull/160))
80112

113+
- Revert "Add namespace check to Auth routes" ([#160](https://github.com/laravel/ui/pull/160))
81114

82115
## [v2.4.0 (2020-09-11)](https://github.com/laravel/ui/compare/v2.3.0...v2.4.0)
83116

84117
### Removed
118+
85119
- Remove Laravel 8 support ([#154](https://github.com/laravel/ui/pull/154))
86120

87121
### Fixed
88-
- Fix Bootstrap preset ([#146](https://github.com/laravel/ui/pull/146))
89122

123+
- Fix Bootstrap preset ([#146](https://github.com/laravel/ui/pull/146))
90124

91125
## [v2.3.0 (2020-09-09)](https://github.com/laravel/ui/compare/v2.2.1...v2.3.0)
92126

93127
### Fixed
94-
- Add namespace check to Auth routes ([#143](https://github.com/laravel/ui/pull/143))
95128

129+
- Add namespace check to Auth routes ([#143](https://github.com/laravel/ui/pull/143))
96130

97131
## [v2.2.1 (2020-09-08)](https://github.com/laravel/ui/compare/v2.2.0...v2.2.1)
98132

99133
### Fixed
134+
100135
- Use proper json responses ([#139](https://github.com/laravel/ui/pull/139))
101136
- Ensure sass directory exists ([456daa3](https://github.com/laravel/ui/commit/456daa330a32483b0fa9794334e60af6b2db3bf6))
102137

103-
104138
## [v2.2.0 (2020-08-25)](https://github.com/laravel/ui/compare/v2.1.0...v2.2.0)
105139

106140
### Added
141+
107142
- Laravel 8 support ([4a0db5b](https://github.com/laravel/ui/commit/4a0db5b2e5d3c032b0f213e847008d39c8c7ce45))
108143

109144
### Fixed
110-
- Remove caret and replace `display: none` with `d-none` ([#135](https://github.com/laravel/ui/pull/135))
111145

146+
- Remove caret and replace `display: none` with `d-none` ([#135](https://github.com/laravel/ui/pull/135))
112147

113148
## [v2.1.0 (2020-06-30)](https://github.com/laravel/ui/compare/v2.0.3...v2.1.0)
114149

115150
### Added
151+
116152
- Allow for optional login and logout routes ([#113](https://github.com/laravel/ui/pull/113))
117153

118154
### Fixed
119-
- Missed localizable strings ([#105](https://github.com/laravel/ui/pull/105))
120155

156+
- Missed localizable strings ([#105](https://github.com/laravel/ui/pull/105))
121157

122158
## [v2.0.3 (2020-04-29)](https://github.com/laravel/ui/compare/v2.0.2...v2.0.3)
123159

124160
### Fixed
125-
- Fix confirm controller overwrite ([#100](https://github.com/laravel/ui/pull/100))
126161

162+
- Fix confirm controller overwrite ([#100](https://github.com/laravel/ui/pull/100))
127163

128164
## [v2.0.2 (2020-04-28)](https://github.com/laravel/ui/compare/v2.0.1...v2.0.2)
129165

130166
### Fixed
131-
- Confirm controller overwrite ([#95](https://github.com/laravel/ui/pull/95))
132167

168+
- Confirm controller overwrite ([#95](https://github.com/laravel/ui/pull/95))
133169

134170
## [v2.0.1 (2020-03-03)](https://github.com/laravel/ui/compare/v2.0.0...v2.0.1)
135171

136172
### Fixed
137-
- Make `auth` options empty by default ([47a0a1d](https://github.com/laravel/ui/commit/47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83))
138173

174+
- Make `auth` options empty by default ([47a0a1d](https://github.com/laravel/ui/commit/47a0a1dac76f5e73803c86e1f38b2c7e0ae7fa83))
139175

140176
## [v2.0.0 (2020-03-03)](https://github.com/laravel/ui/compare/v1.2.0...v2.0.0)
141177

142178
### Changed
143-
- The UI package now contains all auth scaffolding from the laravel skeleton
144179

180+
- The UI package now contains all auth scaffolding from the laravel skeleton
145181

146182
## [v1.2.0 (2020-02-18)](https://github.com/laravel/ui/compare/v1.1.2...v1.2.0)
147183

148184
### Changed
149-
- Use `sass-loader` v8 for Vue preset ([bb64fca](https://github.com/laravel/ui/commit/bb64fca681566ca94457d490a00f899516e75664))
150185

186+
- Use `sass-loader` v8 for Vue preset ([bb64fca](https://github.com/laravel/ui/commit/bb64fca681566ca94457d490a00f899516e75664))
151187

152188
## [v1.1.2 (2019-10-20)](https://github.com/laravel/ui/compare/v1.1.1...v1.1.2)
153189

154190
### Changed
155-
- Removed Laravel 7.0 support ([0287d4ee](https://github.com/laravel/ui/commit/0287d4eee80aad718bdf7f90117cfe720c493064))
156191

192+
- Removed Laravel 7.0 support ([0287d4ee](https://github.com/laravel/ui/commit/0287d4eee80aad718bdf7f90117cfe720c493064))
157193

158194
## [v1.1.1 (2019-10-11)](https://github.com/laravel/ui/compare/v1.1.0...v1.1.1)
159195

160196
### Changed
197+
161198
- Change the specified time until re-authentication ([#37](https://github.com/laravel/ui/pull/37))
162199

163200
### Fixed
164-
- Add `auth.passwords.confirm` to exported views ([#36](https://github.com/laravel/ui/pull/36))
165201

202+
- Add `auth.passwords.confirm` to exported views ([#36](https://github.com/laravel/ui/pull/36))
166203

167204
## [v1.1.0 (2019-10-08)](https://github.com/laravel/ui/compare/v1.0.1...v1.1.0)
168205

169206
### Added
207+
170208
- Add password confirmation screen ([#34](https://github.com/laravel/ui/pull/34))
171209

172210
### Changed
211+
173212
- Remove X-CSRF-TOKEN header from Axios instance ([#23](https://github.com/laravel/ui/pull/23))
174213

175214
### Fixed
215+
176216
- Replace tab to space ([#28](https://github.com/laravel/ui/pull/28))
177217
- Add missing semicolon to avoid unnecessary diff ([#32](https://github.com/laravel/ui/pull/32))
178218
- Update resolve-url-loader dependency constraint ([#33](https://github.com/laravel/ui/pull/33))
179219

180-
181220
## [v1.0.1 (2019-09-02)](https://github.com/laravel/ui/compare/v1.0.0...v1.0.1)
182221

183222
### Added
184-
- Add macro check on ui:auth command ([#16](https://github.com/laravel/ui/pull/16))
185223

224+
- Add macro check on ui:auth command ([#16](https://github.com/laravel/ui/pull/16))
186225

187226
## v1.0.0 (2019-08-13)
188227

‎auth-backend/AuthenticatesUsers.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected function validateLogin(Request $request)
8484
protected function attemptLogin(Request $request)
8585
{
8686
return $this->guard()->attempt(
87-
$this->credentials($request), $request->filled('remember')
87+
$this->credentials($request), $request->boolean('remember')
8888
);
8989
}
9090

‎auth-backend/ConfirmsPasswords.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected function resetPasswordConfirmationTimeout(Request $request)
5555
protected function rules()
5656
{
5757
return [
58-
'password' => 'required|password',
58+
'password' => 'required|current_password:web',
5959
];
6060
}
6161

‎auth-backend/ThrottlesLogins.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected function fireLockoutEvent(Request $request)
8989
*/
9090
protected function throttleKey(Request $request)
9191
{
92-
return Str::lower($request->input($this->username())).'|'.$request->ip();
92+
return Str::transliterate(Str::lower($request->input($this->username())).'|'.$request->ip());
9393
}
9494

9595
/**

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"php": "^7.3|^8.0",
1414
"illuminate/console": "^8.42|^9.0",
1515
"illuminate/filesystem": "^8.42|^9.0",
16-
"illuminate/support": "^8.42|^9.0",
16+
"illuminate/support": "^8.82|^9.0",
1717
"illuminate/validation": "^8.42|^9.0"
1818
},
1919
"require-dev": {

‎src/Auth/bootstrap-stubs/auth/login.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@csrf
1313

1414
<div class="row mb-3">
15-
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('E-Mail Address') }}</label>
15+
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
1616

1717
<div class="col-md-6">
1818
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>

‎src/Auth/bootstrap-stubs/auth/passwords/email.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@csrf
1919

2020
<div class="row mb-3">
21-
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('E-Mail Address') }}</label>
21+
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
2222

2323
<div class="col-md-6">
2424
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>

‎src/Auth/bootstrap-stubs/auth/passwords/reset.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<input type="hidden" name="token" value="{{ $token }}">
1515

1616
<div class="row mb-3">
17-
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('E-Mail Address') }}</label>
17+
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
1818

1919
<div class="col-md-6">
2020
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ $email ?? old('email') }}" required autocomplete="email" autofocus>

‎src/Auth/bootstrap-stubs/auth/register.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727

2828
<div class="row mb-3">
29-
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('E-Mail Address') }}</label>
29+
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
3030

3131
<div class="col-md-6">
3232
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">

‎src/Auth/bootstrap-stubs/layouts/app.stub

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
{{ Auth::user()->name }}
5555
</a>
5656

57-
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
57+
<div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
5858
<a class="dropdown-item" href="{{ route('logout') }}"
5959
onclick="event.preventDefault();
6060
document.getElementById('logout-form').submit();">

‎stubs/migrations/2014_10_12_100000_create_password_resets_table.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use Illuminate\Database\Schema\Blueprint;
55
use Illuminate\Support\Facades\Schema;
66

7-
class CreatePasswordResetsTable extends Migration
7+
return new class extends Migration
88
{
99
/**
1010
* Run the migrations.
@@ -29,4 +29,4 @@ public function down()
2929
{
3030
Schema::dropIfExists('password_resets');
3131
}
32-
}
32+
};

0 commit comments

Comments
 (0)