Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion app-modules/docs/phpstan.ignore.neon
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
parameters:
ignoreErrors: []
ignoreErrors:
-
message: '#^Parameter \#3 \$callback of method Illuminate\\Contracts\\Cache\\Repository::remember\(\) expects#'
identifier: argument.type
count: 1
path: src/Documentation.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\File;
use Ramsey\Uuid\Uuid;

/**
Expand Down Expand Up @@ -162,7 +163,7 @@ function makeOrphan(string $username, ?string $createdAt = '2025-08-10 00:00:00'

Artisan::call('discord:merge-duplicate-profiles', ['--pairs-file' => $path]);

@unlink($path);
File::delete($path);

$orphan->refresh();
$identity->refresh();
Expand Down Expand Up @@ -196,7 +197,7 @@ function makeOrphan(string $username, ?string $createdAt = '2025-08-10 00:00:00'

Artisan::call('discord:merge-duplicate-profiles', ['--pairs-file' => $path]);

@unlink($path);
File::delete($path);

expect(User::query()->find($newUser->id))->toBeNull()
->and(User::query()->find($orphan->id))->not->toBeNull();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@

final class IngestEventRequest extends FormRequest
{
public function authorize(): bool
{
return true;
}

/**
* @return array<string, array<int, string>>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ public static function table(Table $table): Table
->getTitleFromRecordUsing(function (DiscordChannel $record): string {
$parent = $record->parent;

return $parent === null
? __('panel-admin::discord.channels.groups.uncategorized')
: $parent->name;
return $parent->name ?? __('panel-admin::discord.channels.groups.uncategorized');
})
// O relacionamento parent é self-referential; a ordenação padrão do
// Group gera subquery sem alias e colide com a tabela externa.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function enableBotAccount(): void
test('as outras fontes aparecem separadas da conta da Twitch', function (): void {
$mainSource = dashboardTwitchSource($this->user);
$otherSource = StreamerSource::factory()->create(['streamer_id' => $mainSource->streamer_id]);
$otherSource->identity->update(['connected_at' => now(), 'disconnected_at' => null]);
$otherSource->identity->update(['connected_at' => now()->subHour(), 'disconnected_at' => null]);

livewire(StreamDashboardPage::class)
->assertViewHas('otherSources', fn ($sources): bool => $sources->count() === 1 && $sources->first()->is($otherSource));
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/CommunityReport.php
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ private function reportDiscordScrapeCorrelation(): void
],
);

if ($notInDiscord->count() > 0) {
if ($notInDiscord->isNotEmpty()) {
warning($notInDiscord->count().' platform users are not in the Discord server (may have left).');
}

Expand Down
46 changes: 23 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"php": "^8.4",
"bacon/bacon-qr-code": "^2.0.8",
"calebporzio/sushi": "^2.5.4",
"dedoc/scramble": "^0.13.47",
"filament/filament": "^5.9.0",
"filament/spatie-laravel-media-library-plugin": "^5.9.0",
"guzzlehttp/guzzle": "^7.15.5",
"dedoc/scramble": "^0.13.53",
"filament/filament": "^5.11.1",
"filament/spatie-laravel-media-library-plugin": "^5.11.1",
"guzzlehttp/guzzle": "^7.16.1",
"he4rt/activity": "^1.0.0",
"he4rt/bot-discord": "^1.0.0",
"he4rt/community": "^1.0.0",
Expand All @@ -41,50 +41,50 @@
"he4rt/profile": "^1.0.0",
"he4rt/squads": "^1.0.0",
"he4rt/streaming": "^1.0.0",
"inertiajs/inertia-laravel": "^3.5",
"inertiajs/inertia-laravel": "^3.7.0",
"internachi/modular": "^3.0.2",
"laracord/framework": "dev-next#e7b64d6",
"laravel/framework": "^13.34.0",
"laravel/framework": "^13.40.0",
"laravel/head": "^0.2.2",
"laravel/nightwatch": "^1.30.2",
"laravel/nightwatch": "^1.30.6",
"laravel/reverb": "^1.12",
"laravel/sanctum": "^4.3.3",
"laravel/telescope": "^5.25.0",
"laravel/telescope": "^5.27.0",
"laravel/tinker": "^3.0.2",
"league/flysystem-sftp-v3": "^3.36.0",
"livewire/flux": "^2.20.1",
"livewire/flux": "^2.21.0",
"marvinlabs/laravel-discord-logger": "^1.4.4",
"matomo/device-detector": "^6.5.2",
"monicahq/laravel-cloudflare": "^4.1",
"owenvoke/blade-fontawesome": "^3.3.1",
"phiki/phiki": "^2.2.1",
"php-open-source-saver/jwt-auth": "^2.9.3",
"php-open-source-saver/jwt-auth": "^2.10.0",
"ryangjchandler/commonmark-blade-block": "^1.1.1",
"saloonphp/saloon": "^4.5.0",
"spatie/laravel-backup": "^10.3.3",
"spatie/laravel-medialibrary": "^11.23.8",
"spatie/laravel-permission": "^8.3.0",
"symfony/dom-crawler": "^8.1.5",
"symfony/yaml": "^8.1.8"
"saloonphp/saloon": "^4.5.2",
"spatie/laravel-backup": "^10.4.0",
"spatie/laravel-medialibrary": "^11.23.12",
"spatie/laravel-permission": "^8.5.0",
"symfony/dom-crawler": "^8.1.10",
"symfony/yaml": "^8.1.11"
},
"require-dev": {
"driftingly/rector-laravel": "^2.6.2",
"driftingly/rector-laravel": "^2.7.3",
"fakerphp/faker": "^1.24.1",
"fruitcake/laravel-debugbar": "^4.4.4",
"larastan/larastan": "^3.12.2",
"laravel/boost": "^2.10.1",
"fruitcake/laravel-debugbar": "^4.4.5",
"larastan/larastan": "^3.14.0",
"laravel/boost": "^2.10.4",
"laravel/pail": "^1.2.7",
"laravel/pao": "^1.1.5",
"laravel/pint": "^1.32.1",
"mockery/mockery": "^1.6.15",
"nunomaduro/collision": "^8.9.5",
"pestphp/pest": "^5.3.0",
"pestphp/pest": "^5.3.5",
"pestphp/pest-plugin-faker": "^5.0.0",
"pestphp/pest-plugin-laravel": "^5.0.1",
"pestphp/pest-plugin-livewire": "^5.0.0",
"pestphp/pest-plugin-rector": "^5.0.4",
"pestphp/pest-plugin-rector": "^5.0.6",
"phpstan/extension-installer": "^1.4.3",
"rector/rector": "^2.6.7"
"rector/rector": "^2.8.4"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading