turahe / laravel-userstamps

src/Concerns/HasCustomUserStamps.php

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
     {
         $columns = $this->getUserstampColumns();
 
-        if (! isset($columns[$columnName])) {
+        if ( !isset($columns[$columnName]) ) {
             throw new \InvalidArgumentException("Userstamp column '{$columnName}' is not configured.");
         }
 
@@ -188,7 +188,7 @@ 
         $hidden = [];
 
         foreach ($columns as $columnType => $columnConfig) {
-            if (($columnConfig['hidden'] ?? false) === true) {
+            if ( ($columnConfig['hidden'] ?? false) === true ) {
                 $columnName = $columnConfig['name'] ?? $columnType;
                 $hidden[] = $columnName;
             }
@@ -206,7 +206,7 @@ 
         $casts = [];
 
         foreach ($columns as $columnType => $columnConfig) {
-            if (isset($columnConfig['cast'])) {
+            if ( isset($columnConfig['cast']) ) {
                 $columnName = $columnConfig['name'] ?? $columnType;
                 $casts[$columnName] = $columnConfig['cast'];
             }
@@ -224,7 +224,7 @@ 
         $rules = [];
 
         foreach ($columns as $columnType => $columnConfig) {
-            if (isset($columnConfig['validation'])) {
+            if ( isset($columnConfig['validation']) ) {
                 $columnName = $columnConfig['name'] ?? $columnType;
                 $rules[$columnName] = $columnConfig['validation'];
             }

src/Config/UserStampsConfigValidator.php

Spacing +37 added lines, -37 removed lines

@@ -39,12 +39,12 @@ 
         $config = Config::get('userstamps', []);
 
         // Check if we have the new enhanced configuration structure
-        if (isset($config['columns']) && is_array($config['columns'])) {
+        if ( isset($config['columns']) && is_array($config['columns']) ) {
             // New enhanced configuration - validate required fields
             $requiredFields = ['users_table', 'users_table_column_type', 'users_table_column_id_name', 'users_model'];
 
             foreach ($requiredFields as $field) {
-                if (! isset($config[$field])) {
+                if ( !isset($config[$field]) ) {
                     $errors[] = "Missing required configuration: {$field}";
                 }
             }
@@ -61,7 +61,7 @@ 
             ];
 
             foreach ($rules as $key => $rule) {
-                if (! isset($config[$key])) {
+                if ( !isset($config[$key]) ) {
                     $errors[] = "Missing required configuration: {$key}";
 
                     continue;
@@ -69,16 +69,16 @@ 
 
                 $validator = Validator::make([$key => $config[$key]], [$key => $rule]);
 
-                if ($validator->fails()) {
+                if ( $validator->fails() ) {
                     $errors[] = "Invalid configuration for {$key}: ".$validator->errors()->first($key);
                 }
             }
         }
 
         // Always validate users_table_column_type if present (regardless of structure)
-        if (isset($config['users_table_column_type'])) {
+        if ( isset($config['users_table_column_type']) ) {
             $validTypes = ['increments', 'bigIncrements', 'uuid', 'ulid', 'bigInteger', 'integer', 'string', 'text', 'char'];
-            if (! in_array($config['users_table_column_type'], $validTypes)) {
+            if ( !in_array($config['users_table_column_type'], $validTypes) ) {
                 $errors[] = "Invalid configuration for users_table_column_type: {$config['users_table_column_type']}";
             }
         }
@@ -95,14 +95,14 @@ 
         $columns = Config::get('userstamps.columns', []);
 
         // If no columns configuration is set, use defaults
-        if (empty($columns)) {
+        if ( empty($columns) ) {
             return $errors;
         }
 
         $requiredColumns = ['created_by', 'updated_by', 'deleted_by'];
 
         foreach ($requiredColumns as $columnType) {
-            if (! isset($columns[$columnType])) {
+            if ( !isset($columns[$columnType]) ) {
                 // Column not configured, skip validation
                 continue;
             }
@@ -123,31 +123,31 @@ 
         $errors = [];
 
         // Validate name field if present
-        if (isset($config['name'])) {
+        if ( isset($config['name']) ) {
             $name = $config['name'];
 
-            if (! is_string($name) || empty($name)) {
+            if ( !is_string($name) || empty($name) ) {
                 $errors[] = "Column name for {$columnType} must be a non-empty string";
             } else {
                 // Get max length from advanced config or use default
                 $maxLength = Config::get('userstamps.advanced.column_name_validation.max_length', 64);
-                if (strlen($name) > $maxLength) {
+                if ( strlen($name) > $maxLength ) {
                     $errors[] = "Column name for {$columnType} exceeds maximum length of {$maxLength} characters";
                 }
 
                 // Get pattern from advanced config or use default
                 $pattern = Config::get('userstamps.advanced.column_name_validation.pattern', '/^[a-zA-Z_][a-zA-Z0-9_]*$/');
-                if (! preg_match($pattern, $name)) {
+                if ( !preg_match($pattern, $name) ) {
                     $errors[] = "Column name for {$columnType} contains invalid characters";
                 }
             }
         }
 
         // Validate type field if present
-        if (isset($config['type'])) {
+        if ( isset($config['type']) ) {
             $validTypes = ['increments', 'bigIncrements', 'uuid', 'ulid', 'bigInteger', 'integer', 'string', 'text', 'char'];
 
-            if (! in_array($config['type'], $validTypes)) {
+            if ( !in_array($config['type'], $validTypes) ) {
                 $errors[] = "Invalid column type for {$columnType}: {$config['type']}. Valid types are: ".implode(', ', $validTypes);
             }
         }
@@ -155,22 +155,22 @@ 
         // Validate boolean fields
         $booleanFields = ['nullable', 'index', 'foreign_key'];
         foreach ($booleanFields as $field) {
-            if (isset($config[$field]) && ! is_bool($config[$field])) {
+            if ( isset($config[$field]) && !is_bool($config[$field]) ) {
                 $errors[] = "Field '{$field}' for {$columnType} must be a boolean";
             }
         }
 
         // Validate foreign key behavior
-        if (isset($config['on_delete'])) {
+        if ( isset($config['on_delete']) ) {
             $validOnDelete = ['cascade', 'set null', 'restrict', 'no action'];
-            if (! in_array($config['on_delete'], $validOnDelete)) {
+            if ( !in_array($config['on_delete'], $validOnDelete) ) {
                 $errors[] = "Invalid on_delete value for {$columnType}: {$config['on_delete']}. Valid values are: ".implode(', ', $validOnDelete);
             }
         }
 
-        if (isset($config['on_update'])) {
+        if ( isset($config['on_update']) ) {
             $validOnUpdate = ['cascade', 'set null', 'restrict', 'no action'];
-            if (! in_array($config['on_update'], $validOnUpdate)) {
+            if ( !in_array($config['on_update'], $validOnUpdate) ) {
                 $errors[] = "Invalid on_update value for {$columnType}: {$config['on_update']}. Valid values are: ".implode(', ', $validOnUpdate);
             }
         }
@@ -187,36 +187,36 @@ 
         $customTypes = Config::get('userstamps.custom_column_types', []);
 
         // If no custom column types are set, use defaults
-        if (empty($customTypes)) {
+        if ( empty($customTypes) ) {
             return $errors;
         }
 
         foreach ($customTypes as $typeName => $typeConfig) {
-            if (! is_array($typeConfig)) {
+            if ( !is_array($typeConfig) ) {
                 $errors[] = "Custom column type '{$typeName}' must be an array";
 
                 continue;
             }
 
-            if (! isset($typeConfig['method'])) {
+            if ( !isset($typeConfig['method']) ) {
                 $errors[] = "Custom column type '{$typeName}' is missing 'method' field";
 
                 continue;
             }
 
-            if (! is_string($typeConfig['method'])) {
+            if ( !is_string($typeConfig['method']) ) {
                 $errors[] = "Method for custom column type '{$typeName}' must be a string";
 
                 continue;
             }
 
-            if (! isset($typeConfig['parameters'])) {
+            if ( !isset($typeConfig['parameters']) ) {
                 $errors[] = "Custom column type '{$typeName}' is missing 'parameters' field";
 
                 continue;
             }
 
-            if (! is_array($typeConfig['parameters'])) {
+            if ( !is_array($typeConfig['parameters']) ) {
                 $errors[] = "Parameters for custom column type '{$typeName}' must be an array";
 
                 continue;
@@ -235,35 +235,35 @@ 
         $advanced = Config::get('userstamps.advanced', []);
 
         // If no advanced configuration is set, use defaults
-        if (empty($advanced)) {
+        if ( empty($advanced) ) {
             return $errors;
         }
 
         // Validate boolean fields
         $booleanFields = ['foreign_keys', 'indexes', 'comments', 'sqlite_compatibility'];
         foreach ($booleanFields as $field) {
-            if (isset($advanced[$field]) && ! is_bool($advanced[$field])) {
+            if ( isset($advanced[$field]) && !is_bool($advanced[$field]) ) {
                 $errors[] = "Advanced configuration field '{$field}' must be a boolean";
             }
         }
 
         // Validate foreign key behavior
-        if (isset($advanced['default_foreign_key_behavior'])) {
+        if ( isset($advanced['default_foreign_key_behavior']) ) {
             $behavior = $advanced['default_foreign_key_behavior'];
 
-            if (! is_array($behavior)) {
+            if ( !is_array($behavior) ) {
                 $errors[] = 'Default foreign key behavior must be an array';
             } else {
-                if (isset($behavior['on_delete'])) {
+                if ( isset($behavior['on_delete']) ) {
                     $validOnDelete = ['cascade', 'set null', 'restrict', 'no action'];
-                    if (! in_array($behavior['on_delete'], $validOnDelete)) {
+                    if ( !in_array($behavior['on_delete'], $validOnDelete) ) {
                         $errors[] = "Invalid default on_delete value: {$behavior['on_delete']}";
                     }
                 }
 
-                if (isset($behavior['on_update'])) {
+                if ( isset($behavior['on_update']) ) {
                     $validOnUpdate = ['cascade', 'set null', 'restrict', 'no action'];
-                    if (! in_array($behavior['on_update'], $validOnUpdate)) {
+                    if ( !in_array($behavior['on_update'], $validOnUpdate) ) {
                         $errors[] = "Invalid default on_update value: {$behavior['on_update']}";
                     }
                 }
@@ -271,17 +271,17 @@ 
         }
 
         // Validate column name validation
-        if (isset($advanced['column_name_validation'])) {
+        if ( isset($advanced['column_name_validation']) ) {
             $validation = $advanced['column_name_validation'];
 
-            if (! is_array($validation)) {
+            if ( !is_array($validation) ) {
                 $errors[] = 'Column name validation must be an array';
             } else {
-                if (isset($validation['pattern']) && ! is_string($validation['pattern'])) {
+                if ( isset($validation['pattern']) && !is_string($validation['pattern']) ) {
                     $errors[] = 'Column name validation pattern must be a string';
                 }
 
-                if (isset($validation['max_length']) && ! is_numeric($validation['max_length'])) {
+                if ( isset($validation['max_length']) && !is_numeric($validation['max_length']) ) {
                     $errors[] = 'Column name validation max_length must be a number';
                 }
             }

src/Database/Schema/Macros/UserStampsMacro.php

Indentation +3 added lines, -3 removed lines

@@ -144,8 +144,8 @@ 
             // Get the actual column name from config or use default
             // Support both old format (created_by_column) and new format (columns.created_by.name)
             $columnName = $config['name'] ??
-                         config("userstamps.{$columnType}_column") ??
-                         config("userstamps.columns.{$columnType}.name", $columnType);
+                            config("userstamps.{$columnType}_column") ??
+                            config("userstamps.columns.{$columnType}.name", $columnType);
 
             // For backward compatibility, also check the legacy column names
             if ($columnType === 'created_by') {
@@ -251,7 +251,7 @@ 
             foreach ($columns as $columnType) {
                 // Support both old format (created_by_column) and new format (columns.created_by.name)
                 $columnName = config("userstamps.{$columnType}_column") ??
-                             config("userstamps.columns.{$columnType}.name", $columnType);
+                                config("userstamps.columns.{$columnType}.name", $columnType);
 
                 // For backward compatibility, also check the legacy column names
                 if ($columnType === 'created_by') {

Spacing +32 added lines, -32 removed lines

@@ -37,7 +37,7 @@ 
 
     private function registerUserstamps()
     {
-        Blueprint::macro('userstamps', function ($options = []) {
+        Blueprint::macro('userstamps', function($options = []) {
             $config = $this->getUserstampsConfig('userstamps', $options);
 
             foreach (['created_by', 'updated_by'] as $columnType) {
@@ -50,7 +50,7 @@ 
 
     private function registerSoftUserstamps()
     {
-        Blueprint::macro('softUserstamps', function ($options = []) {
+        Blueprint::macro('softUserstamps', function($options = []) {
             $config = $this->getUserstampsConfig('softUserstamps', $options);
 
             $this->createUserstampColumn('deleted_by', $config['deleted_by']);
@@ -61,7 +61,7 @@ 
 
     private function registerCustomUserstamps()
     {
-        Blueprint::macro('customUserstamps', function ($columns = [], $options = []) {
+        Blueprint::macro('customUserstamps', function($columns = [], $options = []) {
             $config = $this->getUserstampsConfig('custom', $options);
 
             foreach ($columns as $columnName => $columnConfig) {
@@ -75,7 +75,7 @@ 
 
     private function registerDropUserstamps()
     {
-        Blueprint::macro('dropUserstamps', function ($options = []) {
+        Blueprint::macro('dropUserstamps', function($options = []) {
             $config = $this->getUserstampsConfig('dropUserstamps', $options);
             $columns = ['created_by', 'updated_by'];
 
@@ -87,7 +87,7 @@ 
 
     private function registerDropSoftUserstamps()
     {
-        Blueprint::macro('dropSoftUserstamps', function ($options = []) {
+        Blueprint::macro('dropSoftUserstamps', function($options = []) {
             $config = $this->getUserstampsConfig('dropSoftUserstamps', $options);
             $columns = ['deleted_by'];
 
@@ -102,7 +102,7 @@ 
      */
     private function registerHelperMethods()
     {
-        Blueprint::macro('getUserstampsConfig', function ($type, $options = []) {
+        Blueprint::macro('getUserstampsConfig', function($type, $options = []) {
             $baseConfig = config('userstamps.columns', []);
             $defaultConfig = [
                 'created_by' => $baseConfig['created_by'] ?? [],
@@ -129,9 +129,9 @@ 
             }
 
             // Merge with provided options
-            if (! empty($options)) {
+            if ( !empty($options) ) {
                 foreach ($options as $key => $value) {
-                    if (isset($defaultConfig[$key])) {
+                    if ( isset($defaultConfig[$key]) ) {
                         $defaultConfig[$key] = array_merge($defaultConfig[$key], $value);
                     }
                 }
@@ -140,7 +140,7 @@ 
             return $defaultConfig;
         });
 
-        Blueprint::macro('createUserstampColumn', function ($columnType, $config) {
+        Blueprint::macro('createUserstampColumn', function($columnType, $config) {
             // Get the actual column name from config or use default
             // Support both old format (created_by_column) and new format (columns.created_by.name)
             $columnName = $config['name'] ??
@@ -148,16 +148,16 @@ 
                          config("userstamps.columns.{$columnType}.name", $columnType);
 
             // For backward compatibility, also check the legacy column names
-            if ($columnType === 'created_by') {
+            if ( $columnType === 'created_by' ) {
                 $columnName = $config['name'] ?? config('userstamps.created_by_column', 'created_by');
-            } elseif ($columnType === 'updated_by') {
+            } elseif ( $columnType === 'updated_by' ) {
                 $columnName = $config['name'] ?? config('userstamps.updated_by_column', 'updated_by');
-            } elseif ($columnType === 'deleted_by') {
+            } elseif ( $columnType === 'deleted_by' ) {
                 $columnName = $config['name'] ?? config('userstamps.deleted_by_column', 'deleted_by');
             }
 
             // Ensure we have a valid column name
-            if (empty($columnName)) {
+            if ( empty($columnName) ) {
                 $columnName = $columnType;
             }
 
@@ -170,30 +170,30 @@ 
             $column = $this->createUserstampColumnByType($columnName, $columnTypeMethod, $config);
 
             // Add nullable if specified
-            if ($config['nullable'] ?? true) {
+            if ( $config['nullable'] ?? true ) {
                 $column->nullable();
             }
 
             // Add index if specified
-            if ($config['index'] ?? config('userstamps.advanced.indexes', true)) {
+            if ( $config['index'] ?? config('userstamps.advanced.indexes', true) ) {
                 $column->index();
             }
 
             // Add comment if enabled and specified
-            if (config('userstamps.advanced.comments', false) && isset($config['comment'])) {
+            if ( config('userstamps.advanced.comments', false) && isset($config['comment']) ) {
                 $column->comment($config['comment']);
             }
 
             // Add foreign key if specified
-            if ($config['foreign_key'] ?? config('userstamps.advanced.foreign_keys', true)) {
+            if ( $config['foreign_key'] ?? config('userstamps.advanced.foreign_keys', true) ) {
                 $this->addUserstampForeignKeyConstraint($columnName, $config);
             }
         });
 
-        Blueprint::macro('createUserstampColumnByType', function ($columnName, $type, $config) {
+        Blueprint::macro('createUserstampColumnByType', function($columnName, $type, $config) {
             $customTypes = config('userstamps.custom_column_types', []);
 
-            if (isset($customTypes[$type])) {
+            if ( isset($customTypes[$type]) ) {
                 $typeConfig = $customTypes[$type];
                 $method = $typeConfig['method'];
                 $parameters = array_merge([$columnName], $typeConfig['parameters'] ?? []);
@@ -205,7 +205,7 @@ 
             return $this->createDefaultUserstampColumn($columnName, $type);
         });
 
-        Blueprint::macro('createDefaultUserstampColumn', function ($columnName, $type) {
+        Blueprint::macro('createDefaultUserstampColumn', function($columnName, $type) {
             switch ($type) {
                 case 'bigIncrements':
                     return $this->unsignedBigInteger($columnName);
@@ -230,7 +230,7 @@ 
             }
         });
 
-        Blueprint::macro('addUserstampForeignKeyConstraint', function ($columnName, $config) {
+        Blueprint::macro('addUserstampForeignKeyConstraint', function($columnName, $config) {
             $onDelete = $config['on_delete'] ?? config('userstamps.advanced.default_foreign_key_behavior.on_delete', 'set null');
             $onUpdate = $config['on_update'] ?? config('userstamps.advanced.default_foreign_key_behavior.on_update', 'cascade');
 
@@ -241,10 +241,10 @@ 
                 ->onUpdate($onUpdate);
         });
 
-        Blueprint::macro('dropUserstampColumns', function ($columns, $config) {
+        Blueprint::macro('dropUserstampColumns', function($columns, $config) {
             // Check SQLite compatibility
-            if (config('userstamps.advanced.sqlite_compatibility', true) &&
-                DB::connection() instanceof SQLiteConnection) {
+            if ( config('userstamps.advanced.sqlite_compatibility', true) &&
+                DB::connection() instanceof SQLiteConnection ) {
                 return $this;
             }
 
@@ -254,16 +254,16 @@ 
                              config("userstamps.columns.{$columnType}.name", $columnType);
 
                 // For backward compatibility, also check the legacy column names
-                if ($columnType === 'created_by') {
+                if ( $columnType === 'created_by' ) {
                     $columnName = config('userstamps.created_by_column', 'created_by');
-                } elseif ($columnType === 'updated_by') {
+                } elseif ( $columnType === 'updated_by' ) {
                     $columnName = config('userstamps.updated_by_column', 'updated_by');
-                } elseif ($columnType === 'deleted_by') {
+                } elseif ( $columnType === 'deleted_by' ) {
                     $columnName = config('userstamps.deleted_by_column', 'deleted_by');
                 }
 
                 // Drop foreign key if enabled
-                if (config('userstamps.advanced.foreign_keys', true)) {
+                if ( config('userstamps.advanced.foreign_keys', true) ) {
                     try {
                         $this->dropForeign([$columnName]);
                     } catch (\Exception $e) {
@@ -280,18 +280,18 @@ 
             }
         });
 
-        Blueprint::macro('validateUserstampColumnName', function ($columnName) {
+        Blueprint::macro('validateUserstampColumnName', function($columnName) {
             $validation = config('userstamps.advanced.column_name_validation', []);
 
-            if (isset($validation['pattern'])) {
-                if (! preg_match($validation['pattern'], $columnName)) {
+            if ( isset($validation['pattern']) ) {
+                if ( !preg_match($validation['pattern'], $columnName) ) {
                     throw new \InvalidArgumentException(
                         "Column name '{$columnName}' does not match the required pattern."
                     );
                 }
             }
 
-            if (isset($validation['max_length']) && strlen($columnName) > $validation['max_length']) {
+            if ( isset($validation['max_length']) && strlen($columnName) > $validation['max_length'] ) {
                 throw new \InvalidArgumentException(
                     "Column name '{$columnName}' exceeds maximum length of {$validation['max_length']} characters."
                 );

src/Observers/UserStampObserver.php

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,7 @@ 
      */
     public function deleting(Model $model)
     {
-        if ($model->usingSoftDeletes()) {
+        if ( $model->usingSoftDeletes() ) {
             $model->{config('userstamps.deleted_by_column')} = $this->getUsersPrimaryValue();
             $model->{config('userstamps.updated_by_column')} = $this->getUsersPrimaryValue();
             $this->saveWithoutEventDispatching($model);
@@ -49,7 +49,7 @@ 
      */
     public function restoring(Model $model)
     {
-        if ($model->usingSoftDeletes()) {
+        if ( $model->usingSoftDeletes() ) {
             $model->{config('userstamps.deleted_by_column')} = null;
             $model->{config('userstamps.updated_by_column')} = $this->getUsersPrimaryValue();
             $this->saveWithoutEventDispatching($model);
@@ -80,11 +80,11 @@ 
      */
     private function getUsersPrimaryValue()
     {
-        if (! Auth::check()) {
+        if ( !Auth::check() ) {
             return null;
         }
 
-        if (config('userstamps.users_table_column_id_name') !== 'id') {
+        if ( config('userstamps.users_table_column_id_name') !== 'id' ) {
             return Auth::user()->{config('userstamps.users_table_column_id_name')};
         }