Skip to content

Commit d5e7273

Browse files
committed
style: apply php-cs-fixer formatting fixes
1 parent 06928e2 commit d5e7273

14 files changed

+51
-54
lines changed

.php-cs-fixer.cache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"php":"8.4.12","version":"3.89.2:v3.89.2#7569658f91e475ec93b99bd5964b059ad1336dcf","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"align_single_space"},"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"modifier_keywords":true,"new_with_parentheses":{"anonymous_class":true},"no_blank_lines_after_class_opening":true,"no_extra_blank_lines":{"tokens":["use"]},"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":true,"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_space_around_construct":{"constructs_followed_by_a_single_space":["abstract","as","case","catch","class","const_import","do","else","elseif","final","finally","for","foreach","function","function_import","if","insteadof","interface","namespace","new","private","protected","public","static","switch","trait","try","use","use_lambda","while"],"constructs_preceded_by_a_single_space":["as","else","elseif","use_lambda"]},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":{"only_dec_inc":true},"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":{"closure_fn_spacing":"one"},"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"after_heredoc":false,"attribute_placement":"ignore","on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"single_quote":true,"no_unused_imports":true},"hashes":{"src\\Console\\CleanupInactiveUsers.php":"db70dc8bf1b313e06eb58bb4aa7f41db","src\\Console\\PopulateUserIpHash.php":"518b1641dd9c0fe10e852f236eabbbc9","src\\Facades\\OnlineUsers.php":"3edbbe9835ba4838dff5b89d00b98bf2","src\\Middleware\\TrackUserActivity.php":"db99113a8c6a84743ec537fad90d49a9","src\\Models\\UserActivity.php":"5943e5fd2170df2dbc33e1357e573d6b","src\\OnlineUsers.php":"b9433006a885d6bdcc41f773e4a69158","src\\OnlineUsersServiceProvider.php":"01041e42919cfd0281f2c4ab136baac0","tests\\Feature\\AnonymizationIntegrationTest.php":"48e66063345b6cf827a6f6a1bf7dcc9d","tests\\Feature\\CleanupInactiveUsersCommandTest.php":"299e5355d2bbdc24469e0a663af9fd54","tests\\Feature\\TrackUserActivityMiddlewareTest.php":"dcaf2d5adce3016acdee03d603bf23b9","tests\\Unit\\CleanupInactiveUsersTest.php":"b4977de4c0ea386406ce8f9511fea338","tests\\Unit\\DropUserIpMigrationTest.php":"3bd1a5610ccb0ca32bf1f53a722256bf","tests\\Unit\\OnlineUsersTest.php":"67bbf61108207627737e8d6104c78c6c","tests\\Unit\\PopulateUserIpHashCommandTest.php":"4420abfbb77d2d6714c381f4fee6603f","tests\\Unit\\UserIpHashIndexTest.php":"f25bb20921dccd47791bc686835e3297"}}

.php-cs-fixer.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
$finder = Finder::create()
77
->in(__DIR__ . '/src')
88
->in(__DIR__ . '/tests')
9+
->exclude('Migrations')
910
->ignoreVCS(true)
1011
;
1112

@@ -22,8 +23,4 @@
2223
])->setFinder($finder)
2324
->setUsingCache(true)
2425
->setRiskyAllowed(true)
25-
->setCacheFile(__DIR__.'/.php-cs-fixer.cache')
26-
->setSkip([
27-
// Exclude migrations by default; adjust to your preference
28-
'src/Migrations' => true,
29-
]);
26+
->setCacheFile(__DIR__.'/.php-cs-fixer.cache');

src/Console/CleanupInactiveUsers.php

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

88
class CleanupInactiveUsers extends Command
99
{
10-
protected $signature = 'cleanup:inactive-users';
10+
protected $signature = 'cleanup:inactive-users';
1111
protected $description = 'Remove inactive users from the user_activities table.';
1212

1313
public function handle(): int

src/Console/PopulateUserIpHash.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
class PopulateUserIpHash extends Command
99
{
10-
protected $signature = 'online-users:populate-ip-hash {--batch=1000 : Number of records to process per batch} {--dry-run : Show how many records would be updated without making changes}';
10+
protected $signature = 'online-users:populate-ip-hash {--batch=1000 : Number of records to process per batch} {--dry-run : Show how many records would be updated without making changes}';
1111
protected $description = 'Populate the user_ip_hash column for existing user_activities using the configured salt and algorithm.';
1212

1313
public function handle(): int
1414
{
15-
$salt = config('online-users.ip_salt');
15+
$salt = config('online-users.ip_salt');
1616
$algorithm = config('online-users.hash_algorithm', 'sha256');
1717

1818
if (empty($salt)) {
@@ -48,7 +48,7 @@ public function handle(): int
4848

4949
$progress->finish();
5050
$this->info('');
51-
$this->info('Population complete.');
51+
$this->info('Population complete.');
5252

5353
return 0;
5454
}

src/Middleware/TrackUserActivity.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?php
2+
23
namespace Klevze\OnlineUsers\Middleware;
34

4-
use Klevze\OnlineUsers\Models\UserActivity;
55
use Closure;
66
use Illuminate\Http\Request;
7+
use Klevze\OnlineUsers\Models\UserActivity;
78

89
class TrackUserActivity
910
{
@@ -12,10 +13,10 @@ public function handle(Request $request, Closure $next): mixed
1213
$tracking = function_exists('config') ? config('online-users.tracking', 'ip') : 'ip';
1314

1415
// If we configure anonymization for IP tracking, apply hash via salt.
15-
$anonymize = function_exists('config') ? config('online-users.anonymize_ip', false) : false;
16-
$ipSalt = function_exists('config') ? config('online-users.ip_salt', null) : null;
16+
$anonymize = function_exists('config') ? config('online-users.anonymize_ip', false) : false;
17+
$ipSalt = function_exists('config') ? config('online-users.ip_salt', null) : null;
1718
$hashAlgorithm = function_exists('config') ? config('online-users.hash_algorithm', 'sha256') : 'sha256';
18-
$storeRaw = function_exists('config') ? config('online-users.store_raw_ip', false) : false;
19+
$storeRaw = function_exists('config') ? config('online-users.store_raw_ip', false) : false;
1920

2021
switch ($tracking) {
2122
case 'user_id':

src/OnlineUsersServiceProvider.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
namespace Klevze\OnlineUsers;
44

5-
use Illuminate\Support\ServiceProvider;
65
use Illuminate\Foundation\AliasLoader;
6+
use Illuminate\Support\ServiceProvider;
77

88
class OnlineUsersServiceProvider extends ServiceProvider
99
{
10-
1110
public function register()
1211
{
1312
// Merge package config
@@ -19,7 +18,7 @@ public function register()
1918
return new OnlineUsers();
2019
});
2120

22-
$this->app->booting(function() {
21+
$this->app->booting(function () {
2322
$loader = AliasLoader::getInstance();
2423
$loader->alias('OnlineUsers', 'Klevze\OnlineUsers\Facades\OnlineUsers');
2524

tests/Feature/AnonymizationIntegrationTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
namespace Klevze\OnlineUsers\Tests\Feature;
44

5-
use Orchestra\Testbench\TestCase;
65
use Klevze\OnlineUsers\Models\UserActivity;
7-
use Illuminate\Support\Facades\Auth;
6+
use Orchestra\Testbench\TestCase;
87

98
class AnonymizationIntegrationTest extends TestCase
109
{
@@ -17,9 +16,9 @@ protected function getEnvironmentSetUp($app)
1716
{
1817
$app['config']->set('database.default', 'sqlite');
1918
$app['config']->set('database.connections.sqlite', [
20-
'driver' => 'sqlite',
19+
'driver' => 'sqlite',
2120
'database' => ':memory:',
22-
'prefix' => '',
21+
'prefix' => '',
2322
]);
2423
}
2524

tests/Feature/CleanupInactiveUsersCommandTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace Klevze\OnlineUsers\Tests\Feature;
44

5-
use Orchestra\Testbench\TestCase;
5+
use Illuminate\Console\Scheduling\Schedule;
66
use Klevze\OnlineUsers\Models\UserActivity;
77
use Klevze\OnlineUsers\OnlineUsers as OnlineUsersService;
88
use Mockery;
9-
use Illuminate\Console\Scheduling\Schedule;
9+
use Orchestra\Testbench\TestCase;
1010

1111
class CleanupInactiveUsersCommandTest extends TestCase
1212
{
@@ -19,9 +19,9 @@ protected function getEnvironmentSetUp($app)
1919
{
2020
$app['config']->set('database.default', 'sqlite');
2121
$app['config']->set('database.connections.sqlite', [
22-
'driver' => 'sqlite',
22+
'driver' => 'sqlite',
2323
'database' => ':memory:',
24-
'prefix' => '',
24+
'prefix' => '',
2525
]);
2626
}
2727

@@ -37,12 +37,12 @@ public function test_command_cleans_inactive_users()
3737
{
3838
// Create recent and old records
3939
UserActivity::create([
40-
'user_ip' => '10.0.0.1',
40+
'user_ip' => '10.0.0.1',
4141
'last_activity' => now(),
4242
]);
4343

4444
UserActivity::create([
45-
'user_ip' => '10.0.0.2',
45+
'user_ip' => '10.0.0.2',
4646
'last_activity' => now()->subMinutes(10),
4747
]);
4848

@@ -72,11 +72,11 @@ public function test_schedule_run_executes_cleanup_command()
7272
{
7373
// Create a stale entry and a recent one
7474
UserActivity::create([
75-
'user_ip' => '10.0.0.1',
75+
'user_ip' => '10.0.0.1',
7676
'last_activity' => now()->subMinutes(10),
7777
]);
7878
UserActivity::create([
79-
'user_ip' => '10.0.0.2',
79+
'user_ip' => '10.0.0.2',
8080
'last_activity' => now(),
8181
]);
8282

tests/Feature/TrackUserActivityMiddlewareTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace Klevze\OnlineUsers\Tests\Feature;
44

5-
use Orchestra\Testbench\TestCase;
65
use Illuminate\Http\Request;
76
use Illuminate\Support\Facades\Auth;
87
use Klevze\OnlineUsers\Middleware\TrackUserActivity;
98
use Klevze\OnlineUsers\Models\UserActivity;
9+
use Orchestra\Testbench\TestCase;
1010

1111
class TrackUserActivityMiddlewareTest extends TestCase
1212
{
@@ -19,9 +19,9 @@ protected function getEnvironmentSetUp($app)
1919
{
2020
$app['config']->set('database.default', 'sqlite');
2121
$app['config']->set('database.connections.sqlite', [
22-
'driver' => 'sqlite',
22+
'driver' => 'sqlite',
2323
'database' => ':memory:',
24-
'prefix' => '',
24+
'prefix' => '',
2525
]);
2626
}
2727

tests/Unit/CleanupInactiveUsersTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Klevze\OnlineUsers\Tests\Unit;
44

5-
use Orchestra\Testbench\TestCase;
5+
use Carbon\Carbon;
66
use Klevze\OnlineUsers\Models\UserActivity;
77
use Klevze\OnlineUsers\OnlineUsers as OnlineUsersService;
8-
use Carbon\Carbon;
8+
use Orchestra\Testbench\TestCase;
99

1010
class CleanupInactiveUsersTest extends TestCase
1111
{
@@ -18,9 +18,9 @@ protected function getEnvironmentSetUp($app)
1818
{
1919
$app['config']->set('database.default', 'sqlite');
2020
$app['config']->set('database.connections.sqlite', [
21-
'driver' => 'sqlite',
21+
'driver' => 'sqlite',
2222
'database' => ':memory:',
23-
'prefix' => '',
23+
'prefix' => '',
2424
]);
2525
}
2626

@@ -43,13 +43,13 @@ public function test_cleanup_removes_old_records_but_not_recent_ones()
4343

4444
// Recent activity - should stay
4545
UserActivity::create([
46-
'user_ip' => '10.0.0.1',
46+
'user_ip' => '10.0.0.1',
4747
'last_activity' => $now,
4848
]);
4949

5050
// Old activity - should be cleaned up
5151
UserActivity::create([
52-
'user_ip' => '10.0.0.2',
52+
'user_ip' => '10.0.0.2',
5353
'last_activity' => $now->copy()->subMinutes(10),
5454
]);
5555

0 commit comments

Comments
 (0)