@@ -24,9 +24,9 @@ |
||
| 24 | 24 | public static function getCurrentModule() |
| 25 | 25 | { |
| 26 | 26 | $modulePath = self::getModulePath(); |
| 27 | - return cache()->remember('crudbooster_modules_'.$modulePath, 2, function () use ($modulePath) { |
|
| 27 | + return cache()->remember('crudbooster_modules_'.$modulePath, 2, function() use ($modulePath) { |
|
| 28 | 28 | $module = app('CbModulesRegistery')->getModule($modulePath); |
| 29 | - return $module?: ModulesRepo::getByPath($modulePath); |
|
| 29 | + return $module ?: ModulesRepo::getByPath($modulePath); |
|
| 30 | 30 | }); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -15,11 +15,11 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | public static function findPK(string $table): string |
| 17 | 17 | { |
| 18 | - if (! $table) { |
|
| 18 | + if (!$table) { |
|
| 19 | 19 | return 'id'; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - return cache()->remember('CrudBooster_pk_'.$table, 10, function () use ($table) { |
|
| 22 | + return cache()->remember('CrudBooster_pk_'.$table, 10, function() use ($table) { |
|
| 23 | 23 | return self::findPKname($table) ?: 'id'; |
| 24 | 24 | }); |
| 25 | 25 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | private static function findPKname($table) |
| 32 | 32 | { |
| 33 | 33 | $pk = \DB::getDoctrineSchemaManager()->listTableDetails($table)->getPrimaryKey(); |
| 34 | - if(!$pk) { |
|
| 34 | + if (!$pk) { |
|
| 35 | 35 | throw new \Exception("The '$table' table does not have a primary key"); |
| 36 | 36 | } |
| 37 | 37 | $cols = $pk->getColumns(); |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | public static function isNullableColumn($table, $colName) |
| 47 | 47 | { |
| 48 | 48 | $colObj = \DB::getDoctrineSchemaManager()->listTableColumns($table)[$colName]; |
| 49 | - if (! $colObj) { |
|
| 49 | + if (!$colObj) { |
|
| 50 | 50 | return; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - return ! $colObj->getNotnull(); |
|
| 53 | + return !$colObj->getNotnull(); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | /** |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public static function isForeignKey($fieldName) |
| 80 | 80 | { |
| 81 | - return Cache::rememberForever('crudbooster_isForeignKey_'.$fieldName, function () use ($fieldName) { |
|
| 81 | + return Cache::rememberForever('crudbooster_isForeignKey_'.$fieldName, function() use ($fieldName) { |
|
| 82 | 82 | $table = self::getRelatedTableName($fieldName); |
| 83 | 83 | return ($table && Schema::hasTable($table)); |
| 84 | 84 | }); |
@@ -8,49 +8,49 @@ discard block |
||
| 8 | 8 | | --------------------------------------------------------------------------------------------------------------- |
| 9 | 9 | | |
| 10 | 10 | */ |
| 11 | -if (! function_exists('cbModulesNS')) { |
|
| 11 | +if (!function_exists('cbModulesNS')) { |
|
| 12 | 12 | function cbModulesNS(string $path = ''): string |
| 13 | 13 | { |
| 14 | 14 | return \crocodicstudio\crudbooster\helpers\CbStructure::cbModulesNS($path); |
| 15 | 15 | } |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | -if (! function_exists('cbStartMarker')) { |
|
| 18 | +if (!function_exists('cbStartMarker')) { |
|
| 19 | 19 | function cbStartMarker(string $section): string |
| 20 | 20 | { |
| 21 | 21 | return "# START $section DO NOT REMOVE THIS LINE"; |
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | -if (! function_exists('cbEndMarker')) { |
|
| 25 | +if (!function_exists('cbEndMarker')) { |
|
| 26 | 26 | function cbEndMarker(string $section): string |
| 27 | 27 | { |
| 28 | 28 | return "# END $section DO NOT REMOVE THIS LINE"; |
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | -if (! function_exists('cbAdminPath')) { |
|
| 32 | +if (!function_exists('cbAdminPath')) { |
|
| 33 | 33 | function cbAdminPath(): string |
| 34 | 34 | { |
| 35 | 35 | return cbConfig('ADMIN_PATH'); |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -if (! function_exists('ctrlNamespace')) { |
|
| 39 | +if (!function_exists('ctrlNamespace')) { |
|
| 40 | 40 | function ctrlNamespace(): string |
| 41 | 41 | { |
| 42 | 42 | return \crocodicstudio\crudbooster\helpers\CbStructure::ctrlNamespace(); |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | -if (! function_exists('cbControllersNS')) { |
|
| 46 | +if (!function_exists('cbControllersNS')) { |
|
| 47 | 47 | function cbControllersNS(): string |
| 48 | 48 | { |
| 49 | 49 | return \crocodicstudio\crudbooster\helpers\CbStructure::cbControllersNS(); |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | -if (! function_exists('is_checked')) { |
|
| 53 | +if (!function_exists('is_checked')) { |
|
| 54 | 54 | /** |
| 55 | 55 | * @param $format |
| 56 | 56 | * @param $value |
@@ -74,28 +74,28 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | -if (! function_exists('CbComponentsPath')) { |
|
| 77 | +if (!function_exists('CbComponentsPath')) { |
|
| 78 | 78 | function CbComponentsPath(string $type = ''): string |
| 79 | 79 | { |
| 80 | 80 | return \crocodicstudio\crudbooster\helpers\CbStructure::componentsPath($type); |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | -if (! function_exists('CbPublishedComponentsPath')) { |
|
| 84 | +if (!function_exists('CbPublishedComponentsPath')) { |
|
| 85 | 85 | function CbPublishedComponentsPath(string $type = ''): string |
| 86 | 86 | { |
| 87 | 87 | return \crocodicstudio\crudbooster\helpers\CbStructure::publishedComponentsPath($type); |
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | -if (! function_exists('controllers_dir')) { |
|
| 91 | +if (!function_exists('controllers_dir')) { |
|
| 92 | 92 | function controllers_dir(): string |
| 93 | 93 | { |
| 94 | 94 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllersDir(); |
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | -if (! function_exists('controller_path')) { |
|
| 98 | +if (!function_exists('controller_path')) { |
|
| 99 | 99 | function controller_path(string $controller): string |
| 100 | 100 | { |
| 101 | 101 | return \crocodicstudio\crudbooster\helpers\CbStructure::controllerPath($controller); |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | | $name = name of input |
| 110 | 110 | | |
| 111 | 111 | */ |
| 112 | -if (! function_exists('g')) { |
|
| 112 | +if (!function_exists('g')) { |
|
| 113 | 113 | function g($name) |
| 114 | 114 | { |
| 115 | 115 | return Request::get($name); |
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | -if (! function_exists('cbTrans')) { |
|
| 119 | +if (!function_exists('cbTrans')) { |
|
| 120 | 120 | /** |
| 121 | 121 | * Translate the given message. |
| 122 | 122 | * |
@@ -130,38 +130,38 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | -if (! function_exists('cbAsset')) { |
|
| 133 | +if (!function_exists('cbAsset')) { |
|
| 134 | 134 | function cbAsset($key) |
| 135 | 135 | { |
| 136 | 136 | return asset('vendor/crudbooster/assets/'.$key); |
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | -if (! function_exists('cbScript')) { |
|
| 140 | +if (!function_exists('cbScript')) { |
|
| 141 | 141 | function cbScript($key) |
| 142 | 142 | { |
| 143 | 143 | return '<script src="'.cbAsset($key).'" type="text/javascript"></script>'; |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | -if (! function_exists('cbStyleSheet')) { |
|
| 147 | +if (!function_exists('cbStyleSheet')) { |
|
| 148 | 148 | function cbStyleSheet($key) |
| 149 | 149 | { |
| 150 | 150 | return '<link rel="stylesheet" type="text/css" href="'.cbAsset($key).'"/>'; |
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | -if (! function_exists('cbConfig')) { |
|
| 154 | +if (!function_exists('cbConfig')) { |
|
| 155 | 155 | function cbConfig($key, $default = null) |
| 156 | 156 | { |
| 157 | 157 | return config('crudbooster.'.$key, $default); |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | -if (! function_exists('makeValidationForHTML')) { |
|
| 160 | +if (!function_exists('makeValidationForHTML')) { |
|
| 161 | 161 | function makeValidationForHTML($rules) |
| 162 | 162 | { |
| 163 | 163 | $validation = []; |
| 164 | - $validation_raw = is_string($rules)? explode('|', $rules) : $rules; |
|
| 164 | + $validation_raw = is_string($rules) ? explode('|', $rules) : $rules; |
|
| 165 | 165 | foreach ($validation_raw as $vr) { |
| 166 | 166 | $vr_a = explode(':', $vr); |
| 167 | 167 | if (isset($vr_a[1])) { |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | -if (! function_exists('findSelected')) { |
|
| 178 | +if (!function_exists('findSelected')) { |
|
| 179 | 179 | /** |
| 180 | 180 | * @param $rawvalue |
| 181 | 181 | * @param $form |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | */ |
| 185 | 185 | function findSelected($rawvalue, $form, $optionValue) |
| 186 | 186 | { |
| 187 | - if (! $rawvalue) { |
|
| 187 | + if (!$rawvalue) { |
|
| 188 | 188 | return ''; |
| 189 | 189 | } |
| 190 | 190 | $value = $rawvalue; |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | return $selected; |
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | -if (! function_exists('array_get_keys')) { |
|
| 209 | +if (!function_exists('array_get_keys')) { |
|
| 210 | 210 | |
| 211 | 211 | /** |
| 212 | 212 | * @param array $_array |
@@ -222,21 +222,21 @@ discard block |
||
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | -if (! function_exists('cbGetSetting')) { |
|
| 225 | +if (!function_exists('cbGetSetting')) { |
|
| 226 | 226 | function cbGetSetting($name) |
| 227 | 227 | { |
| 228 | 228 | return \crocodicstudio\crudbooster\Modules\SettingModule\SettingRepo::getSetting($name); |
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | -if (! function_exists('backWithMsg')) { |
|
| 232 | +if (!function_exists('backWithMsg')) { |
|
| 233 | 233 | function backWithMsg($msg, $type = 'success') |
| 234 | 234 | { |
| 235 | - sendAndTerminate(redirect()->back()->with(['message' => $msg, 'message_type' => $type,])); |
|
| 235 | + sendAndTerminate(redirect()->back()->with(['message' => $msg, 'message_type' => $type, ])); |
|
| 236 | 236 | } |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | -if (! function_exists('underField')) { |
|
| 239 | +if (!function_exists('underField')) { |
|
| 240 | 240 | function underField($help, $error) |
| 241 | 241 | { |
| 242 | 242 | $error = $error ? "<i class='fa fa-info-circle'></i> $error" : ''; |
@@ -244,21 +244,21 @@ discard block |
||
| 244 | 244 | return "<div class='text-danger'>$error</div><p class='help-block'>$help</p>"; |
| 245 | 245 | } |
| 246 | 246 | } |
| 247 | -if (! function_exists('cbIcon')) { |
|
| 247 | +if (!function_exists('cbIcon')) { |
|
| 248 | 248 | function cbIcon($icon) |
| 249 | 249 | { |
| 250 | 250 | return '<i class=\'fa fa-'.$icon.'\'></i>'; |
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | -if (! function_exists('YmdHis')) { |
|
| 254 | +if (!function_exists('YmdHis')) { |
|
| 255 | 255 | function YmdHis() |
| 256 | 256 | { |
| 257 | 257 | return date('Y-m-d H:i:s'); |
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | -if (! function_exists('cbUser')) { |
|
| 261 | +if (!function_exists('cbUser')) { |
|
| 262 | 262 | function cbUser() |
| 263 | 263 | { |
| 264 | 264 | return auth('cbAdmin')->user(); |
@@ -52,13 +52,13 @@ discard block |
||
| 52 | 52 | __DIR__.'/CBCoreModule/publieshed_files/readme.txt' => resource_path('views/vendor/crudbooster/type_components/readme.txt'), |
| 53 | 53 | ], 'cb_type_components'); |
| 54 | 54 | |
| 55 | - if (! file_exists(app_path('Http/Controllers/AdminUsersController.php'))) { |
|
| 55 | + if (!file_exists(app_path('Http/Controllers/AdminUsersController.php'))) { |
|
| 56 | 56 | $this->publishes([__DIR__.'/CBCoreModule/publieshed_files/AdminUsersController.php' => app_path('Http/Controllers/AdminUsersController.php')], 'cb_user_controller'); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | |
| 60 | 60 | $this->defineValidationRules(); |
| 61 | - $this->loadRoutesFrom( __DIR__.'/routes.php'); |
|
| 61 | + $this->loadRoutesFrom(__DIR__.'/routes.php'); |
|
| 62 | 62 | $this->registerUserModule(); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $this->mergeConfigFrom(__DIR__.'/CBCoreModule/configs/crudbooster.php', 'crudbooster'); |
| 73 | 73 | |
| 74 | - $this->app->singleton('crudbooster', function () { |
|
| 74 | + $this->app->singleton('crudbooster', function() { |
|
| 75 | 75 | return true; |
| 76 | 76 | }); |
| 77 | 77 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | private function defineValidationRules() |
| 93 | 93 | { |
| 94 | - \Validator::extend('alpha_spaces', function ($attribute, $value) { |
|
| 94 | + \Validator::extend('alpha_spaces', function($attribute, $value) { |
|
| 95 | 95 | // This will only accept alpha and spaces. |
| 96 | 96 | // If you want to accept hyphens use: /^[\pL\s-]+$/u. |
| 97 | 97 | return preg_match('/^[\pL\s]+$/u', $value); |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | private function defineAuthGuard() |
| 102 | 102 | { |
| 103 | - config()->offsetSet('auth.providers.cb_users', ['driver' => 'eloquent', 'model' => CbUser::class,]); |
|
| 103 | + config()->offsetSet('auth.providers.cb_users', ['driver' => 'eloquent', 'model' => CbUser::class, ]); |
|
| 104 | 104 | config()->offsetSet('auth.guards.cbAdmin', ['driver' => 'session', 'provider' => 'cb_users']); |
| 105 | 105 | } |
| 106 | 106 | |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | |
| 143 | 143 | private function registerUserModule() |
| 144 | 144 | { |
| 145 | - app('CbModulesRegistery')->addModule('users', (object)[ |
|
| 145 | + app('CbModulesRegistery')->addModule('users', (object) [ |
|
| 146 | 146 | 'name' => trans('crudbooster.Users_Management'), |
| 147 | 147 | 'icon' => 'fa fa-users', |
| 148 | 148 | 'path' => 'users', |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | public function boot() |
| 15 | 15 | { |
| 16 | 16 | $this->app['view']->addNamespace('CbModulesGen', __DIR__.'/views'); |
| 17 | - $this->loadRoutesFrom( __DIR__.'/module_generator_routes.php'); |
|
| 17 | + $this->loadRoutesFrom(__DIR__.'/module_generator_routes.php'); |
|
| 18 | 18 | $this->loadMigrationsFrom(__DIR__.'/migrations'); |
| 19 | 19 | $this->registerModule(); |
| 20 | 20 | } |
@@ -14,8 +14,8 @@ |
||
| 14 | 14 | public function boot() |
| 15 | 15 | { |
| 16 | 16 | $this->app['view']->addNamespace('CbSettings', __DIR__.'/views'); |
| 17 | - $this->loadRoutesFrom( __DIR__.'/settings_routes.php'); |
|
| 18 | - $this->loadMigrationsFrom(__DIR__ . '/migrations'); |
|
| 17 | + $this->loadRoutesFrom(__DIR__.'/settings_routes.php'); |
|
| 18 | + $this->loadMigrationsFrom(__DIR__.'/migrations'); |
|
| 19 | 19 | app('CbDynamicMenus')->addSuperAdminMenu('CbSettings::menu'); |
| 20 | 20 | $this->registerModule(); |
| 21 | 21 | } |