Skip to content

Commit

Permalink
Merge branch 'laravel:5.x' into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
pushpak1300 authored Dec 11, 2024
2 parents 0815731 + 7bf5437 commit ea30291
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.2, 8.3]
php: [8.2, 8.3, 8.4]
laravel: [11]

name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
Expand All @@ -40,7 +40,7 @@ jobs:
composer update --prefer-dist --no-interaction --no-progress
- name: Execute tests
run: vendor/bin/phpunit
run: vendor/bin/phpunit --display-deprecations --fail-on-deprecation

stub-tests:
runs-on: ubuntu-22.04
Expand All @@ -49,7 +49,7 @@ jobs:
fail-fast: true
matrix:
stack: [inertia, livewire]
laravel: [11]
laravel: ['11.x-dev']

name: Test Stubs - Laravel ${{ matrix.laravel }} - ${{ matrix.stack }}

Expand Down
2 changes: 2 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
php:
preset: laravel
enabled:
- nullable_type_declarations
disabled:
- no_unused_imports
js:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v5.3.3...5.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v5.3.4...5.x)

## [v5.3.4](https://github.com/laravel/jetstream/compare/v5.3.3...v5.3.4) - 2024-12-10

* Update Profile Photo Accessor by [@husamAwadhi](https://github.com/husamAwadhi) in https://github.com/laravel/jetstream/pull/1550
* [5.x] Supports PHP 8.4 by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/jetstream/pull/1548

## [v5.3.3](https://github.com/laravel/jetstream/compare/v5.3.2...v5.3.3) - 2024-11-13

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"illuminate/console": "^11.0",
"illuminate/support": "^11.0",
"laravel/fortify": "^1.20",
"mobiledetect/mobiledetectlib": "^4.8",
"mobiledetect/mobiledetectlib": "^4.8.08",
"symfony/console": "^7.0"
},
"require-dev": {
Expand Down
2 changes: 1 addition & 1 deletion src/HasProfilePhoto.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function deleteProfilePhoto()
*
* @return \Illuminate\Database\Eloquent\Casts\Attribute
*/
public function profilePhotoUrl(): Attribute
protected function profilePhotoUrl(): Attribute
{
return Attribute::get(function (): string {
return $this->profile_photo_path
Expand Down

0 comments on commit ea30291

Please sign in to comment.