TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement PHP CS Fixer and a coding standard to follow (#471)

Browse Source 
* Create PHP CS Fixer config and add to CI workflow

* Run php cs fixer on project

* Add newline at end of file

* Update to use PHP CS Fixer v3

* Run v3 config on project

* Run seperate config in CI
This commit is contained in:
Mwikala Kangwa
2021-05-21 12:57:51 +01:00
committed by GitHub
parent 633cad9b89
commit 9e98a96d61
316 changed files with 4715 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/V1/Settings/CompanyController.php
View File

@ -2,11 +2,11 @@
namespace Crater\Http\Controllers\V1\Settings;
use Illuminate\Http\Request;
use Crater\Models\Company;
use Crater\Http\Requests\ProfileRequest;
use Crater\Http\Requests\CompanyRequest;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\CompanyRequest;
use Crater\Http\Requests\ProfileRequest;
use Crater\Models\Company;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class CompanyController extends Controller
@ -24,11 +24,11 @@ class CompanyController extends Controller
'addresses.country',
'company',
'company.address',
'company.address.country'
'company.address.country',
]);
return response()->json([
'user' => $user
'user' => $user,
]);
}
@ -47,7 +47,7 @@ class CompanyController extends Controller
return response()->json([
'user' => $user,
'success' => true
'success' => true,
]);
}
@ -66,7 +66,7 @@ class CompanyController extends Controller
return response()->json([
'company' => $company,
'success' => true
'success' => true,
]);
}
@ -93,7 +93,7 @@ class CompanyController extends Controller
}
return response()->json([
'success' => true
'success' => true,
]);
}
@ -121,7 +121,7 @@ class CompanyController extends Controller
return response()->json([
'user' => $user,
'success' => true
'success' => true,
]);
}
}

38
app/Http/Controllers/V1/Settings/DiskController.php
View File

@ -3,10 +3,10 @@
namespace Crater\Http\Controllers\V1\Settings;
use Crater\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Crater\Models\FileDisk;
use Crater\Http\Requests\DiskEnvironmentRequest;
use Crater\Models\FileDisk;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class DiskController extends Controller
{
@ -33,10 +33,10 @@ class DiskController extends Controller
*/
public function store(DiskEnvironmentRequest $request)
{
if(!FileDisk::validateCredentials($request->credentials, $request->driver)) {
if (! FileDisk::validateCredentials($request->credentials, $request->driver)) {
return response()->json([
'success' => false,
'error' => 'invalid_credentials'
'error' => 'invalid_credentials',
]);
}
@ -44,7 +44,7 @@ class DiskController extends Controller
return response()->json([
'success' => true,
'disk' => $disk
'disk' => $disk,
]);
}
@ -59,22 +59,22 @@ class DiskController extends Controller
$credentials = $request->credentials;
$driver = $request->driver;
if($credentials && $driver && $disk->type !== 'SYSTEM') {
if(!FileDisk::validateCredentials($credentials, $driver)) {
if ($credentials && $driver && $disk->type !== 'SYSTEM') {
if (! FileDisk::validateCredentials($credentials, $driver)) {
return response()->json([
'success' => false,
'error' => 'invalid_credentials'
'error' => 'invalid_credentials',
]);
}
$disk->updateDisk($request);
} else if($request->set_as_default) {
} elseif ($request->set_as_default) {
$disk->setAsDefaultDisk();
}
return response()->json([
'success' => true,
'disk' => $disk
'disk' => $disk,
]);
}
@ -90,6 +90,7 @@ class DiskController extends Controller
$diskData = [
'root' => config('filesystems.disks.local.root'),
];
break;
@ -101,6 +102,7 @@ class DiskController extends Controller
'bucket' => '',
'root' => '',
];
break;
case 'doSpaces':
@ -112,6 +114,7 @@ class DiskController extends Controller
'endpoint' => '',
'root' => '',
];
break;
case 'dropbox':
@ -122,6 +125,7 @@ class DiskController extends Controller
'app' => '',
'root' => '',
];
break;
}
@ -140,14 +144,14 @@ class DiskController extends Controller
{
if ($disk->setAsDefault() && $disk->type === 'SYSTEM') {
return response()->json([
'success' => false
'success' => false,
]);
}
$disk->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
@ -160,19 +164,19 @@ class DiskController extends Controller
$drivers = [
[
'name' => 'Local',
'value' => 'local'
'value' => 'local',
],
[
'name' => 'Amazon S3',
'value' => 's3'
'value' => 's3',
],
[
'name' => 'Digital Ocean Spaces',
'value' => 'doSpaces'
'value' => 'doSpaces',
],
[
'name' => 'Dropbox',
'value' => 'dropbox'
'value' => 'dropbox',
],
];
@ -180,7 +184,7 @@ class DiskController extends Controller
return response()->json([
'drivers' => $drivers,
'default' => $default
'default' => $default,
]);
}
}

2
app/Http/Controllers/V1/Settings/GetCompanySettingsController.php
View File

@ -2,9 +2,9 @@
namespace Crater\Http\Controllers\V1\Settings;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\GetSettingsRequest;
use Crater\Models\CompanySetting;
class GetCompanySettingsController extends Controller
{

19
app/Http/Controllers/V1/Settings/MailConfigurationController.php
View File

@ -2,13 +2,13 @@
namespace Crater\Http\Controllers\V1\Settings;
use Crater\Models\Setting;
use Illuminate\Http\Request;
use Crater\Space\EnvironmentManager;
use Crater\Http\Requests\MailEnvironmentRequest;
use Illuminate\Http\JsonResponse;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\MailEnvironmentRequest;
use Crater\Mail\TestMail;
use Crater\Models\Setting;
use Crater\Space\EnvironmentManager;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Mail;
class MailConfigurationController extends Controller
@ -36,8 +36,7 @@ class MailConfigurationController extends Controller
$setting = Setting::getSetting('profile_complete');
$results = $this->environmentManager->saveMailVariables($request);
if ($setting !== 'COMPLETED')
{
if ($setting !== 'COMPLETED') {
Setting::setSetting('profile_complete', 4);
}
@ -77,7 +76,7 @@ class MailConfigurationController extends Controller
'mail',
'sendmail',
'mailgun',
'ses'
'ses',
];
return response()->json($drivers);
@ -88,13 +87,13 @@ class MailConfigurationController extends Controller
$this->validate($request, [
'to' => 'required|email',
'subject' => 'required',
'message' => 'required'
'message' => 'required',
]);
Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
return response()->json([
'success' => true
'success' => true,
]);
}
}

16
app/Http/Controllers/V1/Settings/TaxTypesController.php
View File

@ -2,10 +2,10 @@
namespace Crater\Http\Controllers\V1\Settings;
use Crater\Models\TaxType;
use Crater\Http\Requests\TaxTypeRequest;
use Illuminate\Http\Request;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\TaxTypeRequest;
use Crater\Models\TaxType;
use Illuminate\Http\Request;
class TaxTypesController extends Controller
{
@ -23,13 +23,13 @@ class TaxTypesController extends Controller
'tax_type_id',
'search',
'orderByField',
'orderBy'
'orderBy',
]))
->latest()
->paginateData($limit);
return response()->json([
'taxTypes' => $taxTypes
'taxTypes' => $taxTypes,
]);
}
@ -61,7 +61,7 @@ class TaxTypesController extends Controller
public function show(TaxType $taxType)
{
return response()->json([
'taxType' => $taxType
'taxType' => $taxType,
]);
}
@ -91,13 +91,13 @@ class TaxTypesController extends Controller
{
if ($taxType->taxes() && $taxType->taxes()->count() > 0) {
return response()->json([
'success' => false
'success' => false,
]);
}
$taxType->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
}

4
app/Http/Controllers/V1/Settings/UpdateCompanySettingsController.php
View File

@ -2,9 +2,9 @@
namespace Crater\Http\Controllers\V1\Settings;
use Crater\Models\CompanySetting;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\UpdateSettingsRequest;
use Crater\Models\CompanySetting;
class UpdateCompanySettingsController extends Controller
{
@ -19,7 +19,7 @@ class UpdateCompanySettingsController extends Controller
CompanySetting::setSettings($request->settings, $request->header('company'));
return response()->json([
'success' => true
'success' => true,
]);
}
}

2
app/Http/Controllers/V1/Settings/UpdateUserSettingsController.php
View File

@ -21,7 +21,7 @@ class UpdateUserSettingsController extends Controller
$user->setSettings($request->settings);
return response()->json([
'success' => true
'success' => true,
]);
}
}