diff --git a/.php_cs.dist b/.php_cs.dist
index a1c34588f8..568722c566 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -28,6 +28,7 @@ return PhpCsFixer\Config::create()
         'hash_to_slash_comment' => true,
         'heredoc_to_nowdoc' => true,
         'include' => true,
+        'linebreak_after_opening_tag' => true,
         'lowercase_cast' => true,
         'lowercase_constants' => true,
         'lowercase_keywords' => true,
diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index f1b4d4144d..56f2dc5d74 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -166,6 +166,7 @@ class AccountGatewayController extends BaseController
 
     /**
      * Stores new account.
+     *
      * @param mixed $accountGatewayPublicId
      */
     public function save($accountGatewayPublicId = false)
diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php
index a6c2b068d4..928fe68b8c 100644
--- a/app/Http/Controllers/ClientApiController.php
+++ b/app/Http/Controllers/ClientApiController.php
@@ -124,6 +124,7 @@ class ClientApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdateClientRequest $request, $publicId)
diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php
index 169fcd43be..07bbcb995f 100644
--- a/app/Http/Controllers/ExpenseApiController.php
+++ b/app/Http/Controllers/ExpenseApiController.php
@@ -103,6 +103,7 @@ class ExpenseApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdateExpenseRequest $request, $publicId)
diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php
index f53ec553c5..d310f6f9ee 100644
--- a/app/Http/Controllers/InvoiceApiController.php
+++ b/app/Http/Controllers/InvoiceApiController.php
@@ -325,6 +325,7 @@ class InvoiceApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdateInvoiceAPIRequest $request, $publicId)
diff --git a/app/Http/Controllers/PaymentApiController.php b/app/Http/Controllers/PaymentApiController.php
index 446b55d35c..207177e174 100644
--- a/app/Http/Controllers/PaymentApiController.php
+++ b/app/Http/Controllers/PaymentApiController.php
@@ -71,6 +71,7 @@ class PaymentApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdatePaymentRequest $request, $publicId)
diff --git a/app/Http/Controllers/ProductApiController.php b/app/Http/Controllers/ProductApiController.php
index 6097f1a49d..9dc5915d90 100644
--- a/app/Http/Controllers/ProductApiController.php
+++ b/app/Http/Controllers/ProductApiController.php
@@ -107,6 +107,7 @@ class ProductApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdateProductRequest $request, $publicId)
diff --git a/app/Http/Controllers/TaxRateApiController.php b/app/Http/Controllers/TaxRateApiController.php
index f57f74200a..cebab115f8 100644
--- a/app/Http/Controllers/TaxRateApiController.php
+++ b/app/Http/Controllers/TaxRateApiController.php
@@ -104,6 +104,7 @@ class TaxRateApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdateTaxRateRequest $request, $publicId)
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 2ac481074b..70f1780d4f 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -151,6 +151,7 @@ class UserController extends BaseController
 
     /**
      * Stores new account.
+     *
      * @param mixed $userPublicId
      */
     public function save($userPublicId = false)
diff --git a/app/Http/Controllers/VendorApiController.php b/app/Http/Controllers/VendorApiController.php
index 392f1721f0..f7227a97af 100644
--- a/app/Http/Controllers/VendorApiController.php
+++ b/app/Http/Controllers/VendorApiController.php
@@ -109,6 +109,7 @@ class VendorApiController extends BaseAPIController
      *     description="an ""unexpected"" error"
      *   )
      * )
+     *
      * @param mixed $publicId
      */
     public function update(UpdateVendorRequest $request, $publicId)
diff --git a/app/Includes/parsecsv.lib.php b/app/Includes/parsecsv.lib.php
index 232452ec35..5c45a847d8 100644
--- a/app/Includes/parsecsv.lib.php
+++ b/app/Includes/parsecsv.lib.php
@@ -789,11 +789,12 @@ class parseCSV
      * Check if passed info might be delimiter
      *  - only used by find_delimiter().
      *
+     * @param mixed $char
+     * @param mixed $array
+     * @param mixed $depth
+     * @param mixed $preferred
+     *
      * @return special string used for delimiter selection, or false
-     * @param  mixed   $char
-     * @param  mixed   $array
-     * @param  mixed   $depth
-     * @param  mixed   $preferred
      */
     public function _check_count($char, $array, $depth, $preferred)
     {