Merge branch 'main' into dependabot/composer/wire-elements/modal-3.0.2

Author: mckenziearts

.dockerignore

@@ -4,8 +4,9 @@ node_modules
 # Laravel
 .mcp.json
 .env.example
+.env.testing
 phpstan.neon
-phpunit.xml
+phpunit.*.xml
 rector.php
 pint.json
 tests

.env.example

@@ -2,16 +2,29 @@ APP_NAME="LaravelCameroun"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
+APP_DOMAIN=laravelcm.local
 APP_URL=http://laravelcm.local
+ASSET_URL=https://laravelcm.local
 APP_LOCALE=fr
+APP_FALLBACK_LOCALE=fr
 APP_PORT=8080
 APP_SERVICE=laravelcm
-FILAMENT_PATH=cp
 
 LOG_CHANNEL=stack
 LOG_STACK=single,nightwatch
 LOG_LEVEL=debug
 
+RAY_HOST=ray@buggregator
+RAY_PORT=8000
+SENTRY_LARAVEL_DSN=http://sentry@buggregator:8000/1
+SENTRY_TRACES_SAMPLE_RATE=1.0
+VAR_DUMPER_FORMAT=server
+VAR_DUMPER_SERVER=tcp://buggregator:9912
+INSPECTOR_URL=http://inspector@buggregator:8000
+INSPECTOR_API_KEY=test
+INSPECTOR_INGESTION_KEY=1test
+INSPECTOR_ENABLE=true
+
 DB_CONNECTION=pgsql
 DB_HOST=pgsql
 DB_PORT=5432
@@ -20,10 +33,16 @@ DB_USERNAME=sail
 DB_PASSWORD=password
 
 BROADCAST_DRIVER=log
-CACHE_DRIVER=file
+MEDIA_DISK=media
+FILESYSTEM_DISK=${MEDIA_DISK}
+FILAMENT_FILESYSTEM_DISK=${MEDIA_DISK}
+FILAMENT_PATH=cpanel
+
 QUEUE_CONNECTION=database
+BROADCAST_CONNECTION=log
+CACHE_DRIVER=file
 SESSION_DRIVER=database
-SESSION_LIFETIME=120
+SESSION_LIFETIME=1400
 
 MEMCACHED_HOST=127.0.0.1
 
@@ -41,10 +60,13 @@ MAIL_FROM_ADDRESS=no-reply@laravel.cm
 MAIL_FROM_NAME="${APP_NAME}"
 MAIL_SUPPORT=mail-support@laravel.cm
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
+AWS_ACCESS_KEY_ID=sail
+AWS_SECRET_ACCESS_KEY=password
 AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
+AWS_BUCKET=laravelcm
+AWS_ENDPOINT="http://minio:9000"
+AWS_URL="http://localhost:9000/laravelcm"
+AWS_USE_PATH_STYLE_ENDPOINT=true
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
@@ -57,39 +79,27 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 GITHUB_REDIRECT=${APP_URL}/auth/github/callback
-
+GITHUB_FINE_GRAINED_TOKEN=
 MARKDOWNX_GIPHY_API_KEY=
 TORCHLIGHT_TOKEN=
 TORCHLIGHT_THEME=moonlight-ii
-UNSPLASH_ACCESS_KEY=
-
 TELEGRAM_BOT_TOKEN=
 TELEGRAM_CHANNEL=
-
-MEDIA_DISK=media
-FILAMENT_FILESYSTEM_DISK=${MEDIA_DISK}
-
-NOTCHPAY_PUBLIC_KEY=
-
 TWITTER_CONSUMER_KEY=your-consumer-key
 TWITTER_CONSUMER_SECRET=your-consumer-secret
 TWITTER_ACCESS_TOKEN=your-accesss_token
 TWITTER_ACCESS_SECRET=your-access-token-secret
-
-GOOGLE_RECAPTCHA_SITE_KEY=your-recaptcha-site-key
-GOOGLE_RECAPTCHA_SECRET_KEY=your-secret-key
-
-GITHUB_FINE_GRAINED_TOKEN=
+UNSPLASH_ACCESS_KEY=
+NOTCHPAY_PUBLIC_KEY=
+NIGHTWATCH_TOKEN=
+NIGHTWATCH_REQUEST_SAMPLE_RATE=0.1
 
 SCOUT_DRIVER=typesense
 TYPESENSE_HOST=typesense
 TYPESENSE_PORT=8108
 TYPESENSE_PROTOCOL=http
 TYPESENSE_API_KEY=xyz
 
-NIGHTWATCH_TOKEN=
-NIGHTWATCH_REQUEST_SAMPLE_RATE=0.1
-
 # SSH Tunnel Configuration for Database Migration
 SSH_TUNNEL_USER=
 SSH_TUNNEL_HOSTNAME=

.env.testing

@@ -0,0 +1,34 @@
+APP_NAME="LaravelCameroun"
+APP_ENV=testing
+APP_KEY=base64:NXoQgjw2ZlOxnGbo5ZRhYgTdM6xLYsgYElNAgcTQJkE=
+APP_DEBUG=false
+APP_DOMAIN=laravelcm.test
+APP_URL=http://laravelcm.test
+ASSET_URL=http://laravelcm.test
+APP_LOCALE=fr
+APP_FALLBACK_LOCALE=fr
+
+LOG_CHANNEL=stack
+LOG_STACK=single
+LOG_LEVEL=error
+
+DB_CONNECTION=pgsql
+DB_HOST=pgsql
+DB_PORT=5432
+DB_DATABASE=testing
+DB_USERNAME=sail
+DB_PASSWORD=password
+
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+QUEUE_CONNECTION=sync
+
+MAIL_MAILER=array
+
+TELESCOPE_ENABLED=false
+RAY_ENABLED=false
+SENTRY_LARAVEL_DSN=
+INSPECTOR_ENABLE=false
+
+BCRYPT_ROUNDS=4
+VIEW_COMPILED_PATH=/tmp/views

.github/actions/setup/action.yml

@@ -8,7 +8,7 @@ runs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: "8.4"
-        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, bcmath, soap, intl, gd, exif, iconv, imagick
+        extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, bcmath, soap, intl, gd, exif, iconv, imagick
         tools: composer:v2
         coverage: none
     - name: ℹ Setup Problem Matches

.github/workflows/tests.yml

@@ -15,6 +15,21 @@ jobs:
   pest:
     runs-on: ubuntu-22.04
 
+    services:
+      postgres:
+        image: postgres:17-alpine
+        env:
+          POSTGRES_PASSWORD: password
+          POSTGRES_USER: sail
+          POSTGRES_DB: testing
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
     steps:
       - name: 👀 Checkout
         uses: actions/checkout@v5
@@ -27,4 +42,4 @@ jobs:
       - name: 🧱 Build JS Dependencies
         run: yarn build
       - name: 🕵️‍♂️ Run Pest Tests
-        run: ./vendor/bin/pest
+        run: ./vendor/bin/pest --configuration=phpunit.ci.xml --parallel --processes=4 --bail

Dockerfile

@@ -8,10 +8,6 @@ FROM ghcr.io/yieldstudio/php:${PHP_VERSION}-frankenphp AS base
 
 ENV HEALTHCHECK_PATH="/up"
 
-## Uncomment if you need to install additional PHP extensions
-# USER root
-# RUN install-php-extensions bcmath gd
-
 ############################################
 # Development Image
 ############################################

app-modules/database-migration/src/Commands/ResetPostgresSequencesCommand.php

@@ -5,8 +5,8 @@
 namespace Laravelcm\DatabaseMigration\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Schema;
 
 final class ResetPostgresSequencesCommand extends Command
 {
@@ -25,35 +25,38 @@ public function handle(): int
         $this->info('🔄 Resetting PostgreSQL sequences...');
         $this->newLine();
 
-        $tables = collect(Schema::getTableListing())
-            ->filter(fn (string $table): bool => Schema::hasColumn($table, 'id'))
-            ->filter(fn (string $table): bool => $this->hasSequence($table));
+        $tablesWithSequences = $this->getTablesWithSequences();
 
-        if ($tables->isEmpty()) {
+        if ($tablesWithSequences->isEmpty()) {
             $this->warn('❌ No tables with sequences found');
 
             return Command::SUCCESS;
         }
 
-        $progressBar = $this->output->createProgressBar($tables->count());
+        $progressBar = $this->output->createProgressBar($tablesWithSequences->count());
         $progressBar->start();
 
         $resetCount = 0;
         $skipCount = 0;
 
-        foreach ($tables as $table) {
+        foreach ($tablesWithSequences as $sequenceInfo) {
             try {
-                $maxId = DB::table($table)->max('id') ?? 0;
+                $tableName = $sequenceInfo->table_name;
+                $sequenceName = $sequenceInfo->sequence_name;
+                $columnName = $sequenceInfo->column_name;
+
+                $maxId = DB::table($tableName)->max($columnName) ?? 0;
+                $nextVal = $maxId + 1;
 
                 if ($isDryRun) {
-                    $this->line("Would reset {$table}_id_seq to {$maxId}");
+                    $this->line("Would reset {$sequenceName} to {$nextVal} (max {$columnName}: {$maxId})");
                 } else {
-                    DB::statement("SELECT setval('{$table}_id_seq', COALESCE(MAX(id), 1)) FROM {$table};");
+                    DB::statement('SELECT setval(?, GREATEST(?, 1))', [$sequenceName, $nextVal]);
                 }
 
                 $resetCount++;
             } catch (\Exception $e) {
-                $this->line("⚠️  Skipped {$table}: {$e->getMessage()}");
+                $this->line("⚠️  Skipped {$sequenceInfo->table_name}: {$e->getMessage()}");
                 $skipCount++;
             }
 
@@ -72,14 +75,31 @@ public function handle(): int
         return Command::SUCCESS;
     }
 
-    private function hasSequence(string $table): bool
+    private function getTablesWithSequences(): Collection
     {
         try {
-            $result = DB::select("SELECT 1 FROM pg_class WHERE relname = '{$table}_id_seq' AND relkind = 'S'");
-
-            return ! empty($result);
-        } catch (\Exception) {
-            return false;
+            $result = DB::select("
+                SELECT
+                    t.relname AS table_name,
+                    a.attname AS column_name,
+                    s.relname AS sequence_name
+                FROM pg_class s
+                JOIN pg_depend d ON d.objid = s.oid
+                JOIN pg_class t ON d.refobjid = t.oid
+                JOIN pg_attribute a ON (d.refobjid, d.refobjsubid) = (a.attrelid, a.attnum)
+                JOIN pg_namespace n ON n.oid = s.relnamespace
+                WHERE s.relkind = 'S'
+                  AND d.deptype = 'a'
+                  AND t.relkind = 'r'
+                  AND n.nspname = 'public'
+                ORDER BY t.relname, a.attname
+            ");
+
+            return collect($result);
+        } catch (\Exception $e) {
+            $this->warn("Error querying sequences: {$e->getMessage()}");
+
+            return collect();
         }
     }
 }