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

* 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

View File

@ -2,8 +2,8 @@
namespace Crater\Http\Controllers\V1\Expense;
use Crater\Models\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Models\Expense;
class DownloadReceiptController extends Controller
{
@ -23,12 +23,13 @@ class DownloadReceiptController extends Controller
$imagePath = $media->getPath();
$response = \Response::download($imagePath, $media->file_name);
ob_end_clean();
return $response;
}
}
return response()->json([
'error' => 'receipt_not_found'
'error' => 'receipt_not_found',
]);
}
}

View File

@ -1,10 +1,11 @@
<?php
namespace Crater\Http\Controllers\V1\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\ExpenseCategoryRequest;
use Crater\Models\ExpenseCategory;
use Illuminate\Http\Request;
use Crater\Http\Requests\ExpenseCategoryRequest;
use Crater\Http\Controllers\Controller;
class ExpenseCategoriesController extends Controller
{
@ -20,13 +21,13 @@ class ExpenseCategoriesController extends Controller
$categories = ExpenseCategory::whereCompany($request->header('company'))
->applyFilters($request->only([
'category_id',
'search'
'search',
]))
->latest()
->paginateData($limit);
return response()->json([
'categories' => $categories
'categories' => $categories,
]);
}
@ -44,7 +45,7 @@ class ExpenseCategoriesController extends Controller
return response()->json([
'category' => $category,
'success' => true
'success' => true,
]);
}
@ -57,7 +58,7 @@ class ExpenseCategoriesController extends Controller
public function show(ExpenseCategory $category)
{
return response()->json([
'category' => $category
'category' => $category,
]);
}
@ -74,7 +75,7 @@ class ExpenseCategoriesController extends Controller
return response()->json([
'category' => $category,
'success' => true
'success' => true,
]);
}
@ -88,14 +89,14 @@ class ExpenseCategoriesController extends Controller
{
if ($category->expenses() && $category->expenses()->count() > 0) {
return response()->json([
'success' => false
'success' => false,
]);
}
$category->delete();
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -2,11 +2,11 @@
namespace Crater\Http\Controllers\V1\Expense;
use Crater\Models\Expense;
use Illuminate\Http\Request;
use Crater\Http\Requests\ExpenseRequest;
use Crater\Http\Controllers\Controller;
use Crater\Http\Requests\DeleteExpensesRequest;
use Crater\Http\Requests\ExpenseRequest;
use Crater\Models\Expense;
use Illuminate\Http\Request;
class ExpensesController extends Controller
{
@ -30,7 +30,7 @@ class ExpensesController extends Controller
'from_date',
'to_date',
'orderByField',
'orderBy'
'orderBy',
]))
->whereCompany($request->header('company'))
->select('expenses.*', 'expense_categories.name', 'users.name as user_name')
@ -38,7 +38,7 @@ class ExpensesController extends Controller
return response()->json([
'expenses' => $expenses,
'expenseTotalCount' => Expense::count()
'expenseTotalCount' => Expense::count(),
]);
}
@ -54,7 +54,7 @@ class ExpensesController extends Controller
return response()->json([
'expense' => $expense,
'success' => true
'success' => true,
]);
}
@ -69,7 +69,7 @@ class ExpensesController extends Controller
$expense->load('creator', 'fields.customField');
return response()->json([
'expense' => $expense
'expense' => $expense,
]);
}
@ -86,7 +86,7 @@ class ExpensesController extends Controller
return response()->json([
'expense' => $expense,
'success' => true
'success' => true,
]);
}
@ -95,7 +95,7 @@ class ExpensesController extends Controller
Expense::destroy($request->ids);
return response()->json([
'success' => true
'success' => true,
]);
}
}

View File

@ -2,8 +2,8 @@
namespace Crater\Http\Controllers\V1\Expense;
use Crater\Models\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Models\Expense;
class ShowReceiptController extends Controller
{
@ -15,7 +15,7 @@ class ShowReceiptController extends Controller
*/
public function __invoke(Expense $expense)
{
$imagePath = null;
$imagePath = null;
if ($expense) {
$media = $expense->getFirstMedia('receipts');
@ -23,18 +23,18 @@ class ShowReceiptController extends Controller
$imagePath = $media->getPath();
} else {
return response()->json([
'error' => 'receipt_does_not_exist'
'error' => 'receipt_does_not_exist',
]);
}
}
$type = \File::mimeType($imagePath);
$image = 'data:' . $type . ';base64,' . base64_encode(file_get_contents($imagePath));
$image = 'data:'.$type.';base64,'.base64_encode(file_get_contents($imagePath));
return response()->json([
'image' => $image,
'type' => $type
'type' => $type,
]);
}
}

View File

@ -2,8 +2,8 @@
namespace Crater\Http\Controllers\V1\Expense;
use Crater\Models\Expense;
use Crater\Http\Controllers\Controller;
use Crater\Models\Expense;
use Illuminate\Http\Request;
class UploadReceiptController extends Controller
@ -30,7 +30,7 @@ class UploadReceiptController extends Controller
}
return response()->json([
'success' => 'Expense receipts uploaded successfully'
'success' => 'Expense receipts uploaded successfully',
]);
}
}