diff --git a/packages/builder/tests/ArchTest.php b/packages/builder/tests/ArchTest.php index beacffff4..f76321f56 100644 --- a/packages/builder/tests/ArchTest.php +++ b/packages/builder/tests/ArchTest.php @@ -1,4 +1,5 @@ expect('Moox\Builder') ->toUseStrictTypes() diff --git a/packages/core/src/Http/Controllers/Api/ModelController.php b/packages/core/src/Http/Controllers/Api/ModelController.php index f37370902..29ca99250 100644 --- a/packages/core/src/Http/Controllers/Api/ModelController.php +++ b/packages/core/src/Http/Controllers/Api/ModelController.php @@ -12,10 +12,10 @@ public function index() $available_models = []; foreach ($packages as $package) { - $namespace = str_replace(' ', '\\', $package['package']) . '\\Models\\'; + $namespace = str_replace(' ', '\\', $package['package']).'\\Models\\'; foreach ($package['models'] as $model => $api) { - $fullModelName = $namespace . $model; + $fullModelName = $namespace.$model; if (class_exists($fullModelName)) { $available_models[] = $fullModelName; } diff --git a/packages/core/src/Http/SharedHosting/Scheduler.php b/packages/core/src/Http/SharedHosting/Scheduler.php index c1b55046f..ce97f831e 100644 --- a/packages/core/src/Http/SharedHosting/Scheduler.php +++ b/packages/core/src/Http/SharedHosting/Scheduler.php @@ -26,9 +26,9 @@ public function __invoke() return 'Scheduler run was successful'; } else { - activity()->log('Ran Scheduler with output: ' . $output); + activity()->log('Ran Scheduler with output: '.$output); - return 'Scheduler ran with output: ' . $output; + return 'Scheduler ran with output: '.$output; } } } diff --git a/packages/expiry/src/Http/Controllers/Api/ExpiryController.php b/packages/expiry/src/Http/Controllers/Api/ExpiryController.php index c84aa1cc2..347365cbc 100644 --- a/packages/expiry/src/Http/Controllers/Api/ExpiryController.php +++ b/packages/expiry/src/Http/Controllers/Api/ExpiryController.php @@ -3,8 +3,8 @@ namespace Moox\Expiry\Http\Controllers\Api; use Illuminate\Http\Request; -use Moox\Expiry\Models\Expiry; use Illuminate\Routing\Controller; +use Moox\Expiry\Models\Expiry; class ExpiryController extends Controller { diff --git a/packages/jobs/src/Http/SharedHosting/QueueWorker.php b/packages/jobs/src/Http/SharedHosting/QueueWorker.php index 0fa0b6d31..ce998e6ae 100644 --- a/packages/jobs/src/Http/SharedHosting/QueueWorker.php +++ b/packages/jobs/src/Http/SharedHosting/QueueWorker.php @@ -26,16 +26,16 @@ public function __invoke() $timeout = request('timeout'); } - $output = Artisan::call('queue:work --once --timeout=' . $timeout); + $output = Artisan::call('queue:work --once --timeout='.$timeout); if ($output == 0) { activity()->log('Queue worker ran successfully'); return 'Queue worker run was successful'; } else { - activity()->log('Ran queue worker with output: ' . $output); + activity()->log('Ran queue worker with output: '.$output); - return 'Queue worker ran with output: ' . $output; + return 'Queue worker ran with output: '.$output; } } } diff --git a/packages/login-link/src/Http/Controllers/LoginLinkController.php b/packages/login-link/src/Http/Controllers/LoginLinkController.php index 21af33c45..98cfc15a1 100644 --- a/packages/login-link/src/Http/Controllers/LoginLinkController.php +++ b/packages/login-link/src/Http/Controllers/LoginLinkController.php @@ -3,15 +3,15 @@ namespace Moox\LoginLink\Http\Controllers; use App\Models\User; -use Illuminate\Support\Str; +use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Http\Request; use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Mail; -use Moox\LoginLink\Models\LoginLink; use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\Mail; +use Illuminate\Support\Str; use Moox\LoginLink\Mail\LoginLinkEmail; -use Illuminate\Contracts\Encryption\DecryptException; +use Moox\LoginLink\Models\LoginLink; class LoginLinkController extends Controller { @@ -72,7 +72,7 @@ public function authenticate($userId, $token) $loginLink->update(['used_at' => now()]); - $userModel = Config::get('login-link.user_models.' . $userType, User::class); + $userModel = Config::get('login-link.user_models.'.$userType, User::class); $user = $userModel::findOrFail($userId); Auth::login($user); diff --git a/packages/press/src/Commands/InstallWordPress.php b/packages/press/src/Commands/InstallWordPress.php index e10607850..3e02f4f5f 100644 --- a/packages/press/src/Commands/InstallWordPress.php +++ b/packages/press/src/Commands/InstallWordPress.php @@ -163,7 +163,7 @@ public function prepareComposer(): void { info('Preparing composer.json file...'); - $composerSource = __DIR__ . '/../../wordpress/composer.json'; + $composerSource = __DIR__.'/../../wordpress/composer.json'; $composerDestination = public_path('composer.json'); if (File::exists($composerDestination)) { @@ -214,8 +214,8 @@ public function prepareWpConfig(): void info("WordPress directory already exists at {$fullWpPath}."); } - $wpConfigSource = __DIR__ . '/../../wordpress/wp-config.php'; - $wpConfigDestination = $fullWpPath . '/wp-config.php'; + $wpConfigSource = __DIR__.'/../../wordpress/wp-config.php'; + $wpConfigDestination = $fullWpPath.'/wp-config.php'; if (File::exists($wpConfigDestination)) { $overwrite = $this->ask('The wp-config.php file already exists in the WordPress directory. Do you want to overwrite it? (yes/no)', 'no'); @@ -283,22 +283,22 @@ public function useOrInstallWpCli(): void $this->info('Moving wp-cli.phar to a user directory in your PATH...'); // Determine a directory that is in the user's PATH and doesn't require admin rights - $targetDir = getenv('APPDATA') . '\Composer\vendor\bin'; + $targetDir = getenv('APPDATA').'\Composer\vendor\bin'; if (! file_exists($targetDir)) { mkdir($targetDir, 0755, true); } - $targetPath = $targetDir . '\wp.bat'; + $targetPath = $targetDir.'\wp.bat'; // Create a .bat file that runs the .phar $batContent = "@ECHO OFF\r\nphp \"%~dp0wp-cli.phar\" %*"; file_put_contents($targetPath, $batContent); - if (! @rename(base_path('wp-cli.phar'), $targetDir . '\wp-cli.phar')) { - $this->error('Failed to move wp-cli.phar to ' . $targetDir); + if (! @rename(base_path('wp-cli.phar'), $targetDir.'\wp-cli.phar')) { + $this->error('Failed to move wp-cli.phar to '.$targetDir); exit(1); } else { - $this->info('wp-cli installed successfully in ' . $targetDir); + $this->info('wp-cli installed successfully in '.$targetDir); } } else { $this->info('Moving wp-cli.phar to /usr/local/bin/wp...'); @@ -327,12 +327,12 @@ public function wpInstall(): void $env = $this->getDotenv(); $wpPath = base_path(trim($env['WP_PATH'], '/')); - if (! File::exists($wpPath . '/wp-config.php')) { + if (! File::exists($wpPath.'/wp-config.php')) { alert('wp-config.php not found! Please ensure the file is created and configured.'); exit(1); } - $siteUrl = $env['APP_URL'] . $env['WP_SLUG']; + $siteUrl = $env['APP_URL'].$env['WP_SLUG']; $defaultSiteTitle = $env['APP_NAME']; $siteTitle = $this->ask('Please enter the site title', $defaultSiteTitle); $adminUser = 'sysadm'; @@ -346,11 +346,11 @@ public function wpInstall(): void 'wp', 'core', 'install', - '--url=' . $siteUrl, - '--title=' . $siteTitle, - '--admin_user=' . $adminUser, - '--admin_password=' . $adminPassword, - '--admin_email=' . $adminEmail, + '--url='.$siteUrl, + '--title='.$siteTitle, + '--admin_user='.$adminUser, + '--admin_password='.$adminPassword, + '--admin_email='.$adminEmail, ]; foreach ($env as $key => $value) { @@ -419,10 +419,10 @@ public function pressPluginInstall(): void $wpPath = env('WP_PATH', '/public/wp'); $fullWpPath = base_path(trim($wpPath, '/')); - $pluginsPath = $fullWpPath . '/wp-content/plugins'; + $pluginsPath = $fullWpPath.'/wp-content/plugins'; - $pluginSource = __DIR__ . '/../../wordpress/plugins/moox-press'; - $pluginDestination = $pluginsPath . '/moox-press'; + $pluginSource = __DIR__.'/../../wordpress/plugins/moox-press'; + $pluginDestination = $pluginsPath.'/moox-press'; if (! File::exists($pluginSource)) { alert('The Moox Press plugin source directory does not exist.'); @@ -474,7 +474,7 @@ protected function generateSecurePassword(): string $uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; $numbers = '0123456789'; $special = '!@#$%^&*()'; - $all = $lowercase . $uppercase . $numbers . $special; + $all = $lowercase.$uppercase.$numbers.$special; $password = ''; $password .= $lowercase[random_int(0, strlen($lowercase) - 1)]; @@ -486,8 +486,6 @@ protected function generateSecurePassword(): string $password .= $all[random_int(0, strlen($all) - 1)]; } - - return str_shuffle($password); } } diff --git a/packages/sync/src/Http/Controllers/Api/PlatformController.php b/packages/sync/src/Http/Controllers/Api/PlatformController.php index 0ff8b41c3..ba1f1ff0f 100644 --- a/packages/sync/src/Http/Controllers/Api/PlatformController.php +++ b/packages/sync/src/Http/Controllers/Api/PlatformController.php @@ -3,10 +3,10 @@ namespace Moox\Sync\Http\Controllers\Api; use Illuminate\Http\Request; -use Moox\Sync\Models\Platform; use Illuminate\Routing\Controller; -use Moox\Sync\Http\Resources\SyncResource; use Moox\Sync\Http\Resources\PlatformResource; +use Moox\Sync\Http\Resources\SyncResource; +use Moox\Sync\Models\Platform; class PlatformController extends Controller { diff --git a/packages/sync/src/Http/Controllers/Api/PlatformSyncController.php b/packages/sync/src/Http/Controllers/Api/PlatformSyncController.php index b7b9c8508..3f6121e54 100644 --- a/packages/sync/src/Http/Controllers/Api/PlatformSyncController.php +++ b/packages/sync/src/Http/Controllers/Api/PlatformSyncController.php @@ -2,9 +2,9 @@ namespace Moox\Sync\Http\Controllers\Api; -use Moox\Sync\Models\Sync; use Illuminate\Routing\Controller; use Moox\Sync\Http\Resources\SyncResource; +use Moox\Sync\Models\Sync; class PlatformSyncController extends Controller { diff --git a/packages/sync/src/Http/Controllers/Api/SyncController.php b/packages/sync/src/Http/Controllers/Api/SyncController.php index 4646192a2..d780dc89f 100644 --- a/packages/sync/src/Http/Controllers/Api/SyncController.php +++ b/packages/sync/src/Http/Controllers/Api/SyncController.php @@ -2,8 +2,8 @@ namespace Moox\Sync\Http\Controllers\Api; -use Illuminate\Routing\Controller; use Illuminate\Http\Request; +use Illuminate\Routing\Controller; use Moox\Sync\Http\Resources\SyncResource; use Moox\Sync\Models\Sync; diff --git a/packages/sync/src/Http/Controllers/FileSyncController.php b/packages/sync/src/Http/Controllers/FileSyncController.php index 56e06f416..7a010a79b 100644 --- a/packages/sync/src/Http/Controllers/FileSyncController.php +++ b/packages/sync/src/Http/Controllers/FileSyncController.php @@ -2,8 +2,8 @@ namespace Moox\Sync\Http\Controllers; -use Illuminate\Routing\Controller; use Illuminate\Http\Request; +use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator; use Moox\Core\Traits\LogLevel; diff --git a/packages/sync/src/Http/Controllers/SyncResponseController.php b/packages/sync/src/Http/Controllers/SyncResponseController.php index 62e607b93..fcd54169f 100644 --- a/packages/sync/src/Http/Controllers/SyncResponseController.php +++ b/packages/sync/src/Http/Controllers/SyncResponseController.php @@ -2,8 +2,8 @@ namespace Moox\Sync\Http\Controllers; -use Illuminate\Routing\Controller; use Illuminate\Http\Request; +use Illuminate\Routing\Controller; use Moox\Core\Traits\LogLevel; use Moox\Sync\Jobs\FileSyncJob; use Moox\Sync\Models\Platform; diff --git a/packages/sync/src/Http/Controllers/SyncWebhookController.php b/packages/sync/src/Http/Controllers/SyncWebhookController.php index f79518bed..37d830df6 100644 --- a/packages/sync/src/Http/Controllers/SyncWebhookController.php +++ b/packages/sync/src/Http/Controllers/SyncWebhookController.php @@ -2,14 +2,14 @@ namespace Moox\Sync\Http\Controllers; -use Moox\Sync\Jobs\SyncJob; use Illuminate\Http\Request; -use Moox\Core\Traits\LogLevel; -use Moox\Sync\Models\Platform; -use Moox\Sync\Jobs\FileSyncJob; use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Storage; +use Moox\Core\Traits\LogLevel; +use Moox\Sync\Jobs\FileSyncJob; +use Moox\Sync\Jobs\SyncJob; +use Moox\Sync\Models\Platform; class SyncWebhookController extends Controller { diff --git a/packages/user/src/Commands/InstallCommand.php b/packages/user/src/Commands/InstallCommand.php index 69426991b..34b2b70cb 100644 --- a/packages/user/src/Commands/InstallCommand.php +++ b/packages/user/src/Commands/InstallCommand.php @@ -44,7 +44,7 @@ public function handle() if ($panelsToregister != null) { if (is_array($panelsToregister)) { foreach ($panelsToregister as $panelprovider) { - $this->registerPlugins($providerPath . '/' . $panelprovider); + $this->registerPlugins($providerPath.'/'.$panelprovider); } } else { $this->registerPlugins($panelsToregister); @@ -140,7 +140,7 @@ public function customizeFilament(): void if (isset($translations['nav']['group'])) { $translations['nav']['group'] = 'Moox User'; $outputPath = $file->getPathname(); - $content = "info("Updated {$file->getFilename()} in {$localePath}"); } @@ -171,11 +171,11 @@ public function registerPlugins(string $providerPath): void $newPlugins = ''; foreach ($pluginsToAdd as $plugin) { - $searchPlugin = '/' . $plugin . '/'; + $searchPlugin = '/'.$plugin.'/'; if (preg_match($searchPlugin, $content)) { warning("$plugin already registered."); } else { - $newPlugins .= $intend . $namespace . '\\' . $plugin . $function . "\n"; + $newPlugins .= $intend.$namespace.'\\'.$plugin.$function."\n"; } } @@ -190,7 +190,7 @@ public function registerPlugins(string $providerPath): void $pluginsSection = " ->plugins([\n$newPlugins\n ]);"; $placeholderPattern = '/(\->authMiddleware\(\[.*?\]\))\s*\;/s'; - $replacement = "$1\n" . $pluginsSection; + $replacement = "$1\n".$pluginsSection; $newContent = preg_replace($placeholderPattern, $replacement, $content, 1); } @@ -217,7 +217,7 @@ public function getPanelProviderPath(): string|array ); } if (count($providers) == 1) { - $providerPath .= '/' . $providers[0]->getBasename(); + $providerPath .= '/'.$providers[0]->getBasename(); } return $providerPath; diff --git a/tests/ArchTest.php b/tests/ArchTest.php index f9fa52f37..50889278c 100644 --- a/tests/ArchTest.php +++ b/tests/ArchTest.php @@ -1,4 +1,5 @@ expect('App') ->not->toUse(['die', 'dd', 'dump']); @@ -8,7 +9,6 @@ ->toOnlyBeUsedIn('App') ->ignoring('App\Models\User'); - arch() ->expect('App\Models') ->toBeClasses() @@ -20,5 +20,5 @@ ->expect('App\Http') ->toOnlyBeUsedIn('App\Http'); -#arch()->preset()->php(); -#arch()->preset()->security()->ignoring('md5'); +//arch()->preset()->php(); +//arch()->preset()->security()->ignoring('md5'); diff --git a/tests/Pest.php b/tests/Pest.php index e932135e3..4e4d0b325 100644 --- a/tests/Pest.php +++ b/tests/Pest.php @@ -1,6 +1,5 @@