Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x] fix for actions #390

Open
wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+11 −92
Open

[6.x] fix for actions #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77e0422
fix: for actions
joelbutcher Dec 16, 2024
c6d2afa
attempt #1
joelbutcher Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"paragonie/constant_time_encoding": "^2.7"
},
"require-dev": {
"laravel/breeze": "^2.0",
"laravel/jetstream": "^5.0",
"laravel/sanctum": "^4.0",
"livewire/livewire": "^3.3.5",
Expand Down
89 changes: 0 additions & 89 deletions src/HasProfilePhoto.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion stubs/jetstream/app/Models/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected function casts(): array
/**
* Get the URL to the user's profile photo.
*/
public function profilePhotoUrl(): Attribute
protected function profilePhotoUrl(): Attribute
{
return filter_var($this->profile_photo_path, FILTER_VALIDATE_URL)
? Attribute::get(fn () => $this->profile_photo_path)
Expand Down
2 changes: 1 addition & 1 deletion stubs/jetstream/app/Models/UserWithTeams.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class User extends Authenticatable
/**
* Get the URL to the user's profile photo.
*/
public function profilePhotoUrl(): Attribute
protected function profilePhotoUrl(): Attribute
{
return filter_var($this->profile_photo_path, FILTER_VALIDATE_URL)
? Attribute::get(fn () => $this->profile_photo_path)
Expand Down
8 changes: 8 additions & 0 deletions tests/Feature/RouteCachingTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
use Illuminate\Contracts\Console\Kernel;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Session;
use Laravel\Fortify\Features;
use Laravel\Socialite\Facades\Socialite;
use Laravel\Socialite\Two\GithubProvider;
use Laravel\Socialite\Two\User as SocialiteUser;
Expand All @@ -19,6 +21,12 @@
uses(RefreshDatabase::class);

beforeEach(function () {
if (Features::enabled(Features::resetPasswords())) {
$features = array_flip($this->app['config']->get('fortify.features'));
unset($features[Features::resetPasswords()]);
$this->app['config']->set('fortify.features', array_flip($features));
}

$files = (new Filesystem());
$files->cleanDirectory($this->app->basePath('routes'));
if($files->exists($this->app->bootstrapPath(join_paths('cache', 'routes-v7.php')))) {
Expand Down
1 change: 1 addition & 0 deletions tests/OrchestraTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ protected function defineEnvironment($app): void
{
$app['config']->set('app.debug', true);
$app['config']->set('database.default', 'testing');
$app['config']->set('cache.default', 'file');

$app['config']->set('services.github', [
'client_id' => 'github-client-id',
Expand Down
Loading