Apply Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-12 coding style as a base with some minor additions. You may customize the code style applied by configuring [Pint](https://laravel.com/docs/pint), [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer), or [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) for your project root. For more information on customizing the code style applied by Shift, [watch this short video](https://laravelshift.com/videos/shift-code-style).
This commit is contained in:
@@ -88,9 +88,9 @@ class SettingsController extends Controller
|
||||
public function save($key, $value)
|
||||
{
|
||||
CommonSettings::create([
|
||||
'option_name' => 'storage',
|
||||
'option_name' => 'storage',
|
||||
'optional_field' => $key,
|
||||
'option_value' => $value,
|
||||
'option_value' => $value,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -124,10 +124,10 @@ class SettingsController extends Controller
|
||||
|
||||
public function activate()
|
||||
{
|
||||
if (!\Schema::hasColumn('ticket_attachment', 'driver')) {
|
||||
if (! \Schema::hasColumn('ticket_attachment', 'driver')) {
|
||||
$path = 'app'.DIRECTORY_SEPARATOR.'FaveoStorage'.DIRECTORY_SEPARATOR.'database'.DIRECTORY_SEPARATOR.'migrations';
|
||||
Artisan::call('migrate', [
|
||||
'--path' => $path,
|
||||
'--path' => $path,
|
||||
'--force' => true,
|
||||
]);
|
||||
}
|
||||
|
@@ -12,17 +12,29 @@ use Storage;
|
||||
class StorageController extends Controller
|
||||
{
|
||||
protected $default;
|
||||
|
||||
protected $driver;
|
||||
|
||||
protected $root;
|
||||
|
||||
protected $s3_key;
|
||||
|
||||
protected $s3_region;
|
||||
|
||||
protected $s3_secret;
|
||||
|
||||
protected $s3_bucket;
|
||||
|
||||
protected $rackspace_key;
|
||||
|
||||
protected $rackspace_region;
|
||||
|
||||
protected $rackspace_username;
|
||||
|
||||
protected $rackspace_container;
|
||||
|
||||
protected $rackspace_endpoint;
|
||||
|
||||
protected $rackspace_url_type;
|
||||
|
||||
public function __construct()
|
||||
@@ -148,8 +160,8 @@ class StorageController extends Controller
|
||||
{
|
||||
return [
|
||||
'default' => $this->default,
|
||||
'cloud' => 's3',
|
||||
'disks' => $this->disks(),
|
||||
'cloud' => 's3',
|
||||
'disks' => $this->disks(),
|
||||
];
|
||||
}
|
||||
|
||||
@@ -158,23 +170,23 @@ class StorageController extends Controller
|
||||
return [
|
||||
'local' => [
|
||||
'driver' => 'local',
|
||||
'root' => $this->root.'/attachments',
|
||||
'root' => $this->root.'/attachments',
|
||||
],
|
||||
's3' => [
|
||||
'driver' => 's3',
|
||||
'key' => $this->s3_key,
|
||||
'key' => $this->s3_key,
|
||||
'secret' => $this->s3_secret,
|
||||
'region' => $this->s3_region,
|
||||
'bucket' => $this->s3_bucket,
|
||||
],
|
||||
'rackspace' => [
|
||||
'driver' => 'rackspace',
|
||||
'username' => $this->rackspace_username,
|
||||
'key' => $this->rackspace_key,
|
||||
'driver' => 'rackspace',
|
||||
'username' => $this->rackspace_username,
|
||||
'key' => $this->rackspace_key,
|
||||
'container' => $this->rackspace_container,
|
||||
'endpoint' => $this->rackspace_endpoint,
|
||||
'region' => $this->rackspace_region,
|
||||
'url_type' => $this->rackspace_url_type,
|
||||
'endpoint' => $this->rackspace_endpoint,
|
||||
'region' => $this->rackspace_region,
|
||||
'url_type' => $this->rackspace_url_type,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
@@ -2,15 +2,15 @@
|
||||
|
||||
return [
|
||||
'settings' => 'Settings',
|
||||
'storage' => 'Storage',
|
||||
'default' => 'Default',
|
||||
'root' => 'Root',
|
||||
'region' => 'Region',
|
||||
'key' => 'Key',
|
||||
'secret' => 'Secret',
|
||||
'bucket' => 'Bucket',
|
||||
'storage' => 'Storage',
|
||||
'default' => 'Default',
|
||||
'root' => 'Root',
|
||||
'region' => 'Region',
|
||||
'key' => 'Key',
|
||||
'secret' => 'Secret',
|
||||
'bucket' => 'Bucket',
|
||||
'username' => 'Username',
|
||||
'container'=> 'Container',
|
||||
'container' => 'Container',
|
||||
'endpoint' => 'End Point',
|
||||
'url_type' => 'Url Type',
|
||||
];
|
||||
|
@@ -5,8 +5,8 @@
|
||||
echo $controller->settingsIcon();
|
||||
});
|
||||
|
||||
Route::group(['middleware'=>['web']], function () {
|
||||
Route::get('storage', ['as'=>'storage', 'uses'=>'App\FaveoStorage\Controllers\SettingsController@settings']);
|
||||
Route::post('storage', ['as'=>'post.storage', 'uses'=>'App\FaveoStorage\Controllers\SettingsController@postSettings']);
|
||||
Route::get('attachment', ['as'=>'attach', 'uses'=>'App\FaveoStorage\Controllers\SettingsController@attachment']);
|
||||
Route::group(['middleware' => ['web']], function () {
|
||||
Route::get('storage', ['as' => 'storage', 'uses' => 'App\FaveoStorage\Controllers\SettingsController@settings']);
|
||||
Route::post('storage', ['as' => 'post.storage', 'uses' => 'App\FaveoStorage\Controllers\SettingsController@postSettings']);
|
||||
Route::get('attachment', ['as' => 'attach', 'uses' => 'App\FaveoStorage\Controllers\SettingsController@attachment']);
|
||||
});
|
||||
|
Reference in New Issue
Block a user