Automated formatting changes

Admin/Install/Admin.install.php

@@ -12,8 +12,5 @@
  */
 declare(strict_types=1);
 
-use Modules\Billing\Controller\ApiController;
-use Modules\Billing\Models\SettingsEnum;
-
 return [
 ];

Admin/Installer.php

@@ -22,7 +22,6 @@ use Modules\Billing\Models\BillTypeMapper;
 use Modules\Media\Models\NullCollection;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
-use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Localization\ISO639x1Enum;
 use phpOMS\Module\InstallerAbstract;
 use phpOMS\Module\ModuleInfo;

Controller/ApiController.php

@@ -69,7 +69,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiBillUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiBillUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!empty($val = $this->validateBillUpdate($request))) {
             $response->set($request->uri->__toString(), new FormValidation($val));
@@ -94,7 +94,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    private function validateBillUpdate(RequestAbstract $request): array
+    private function validateBillUpdate(RequestAbstract $request) : array
     {
         $val = [];
         if (($val['bill'] = empty($request->getData('bill')))) {
@@ -115,7 +115,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function updateBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null): Bill
+    public function updateBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : Bill
     {
         /** @var Bill $bill */
         $bill = BillMapper::get()->where('id', (int) $request->getData('bill'))->execute();
@@ -136,7 +136,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiBillCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiBillCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!empty($val = $this->validateBillCreate($request))) {
             $response->set($request->uri->__toString(), new FormValidation($val));
@@ -166,7 +166,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function createBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null): Bill
+    public function createBillFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : Bill
     {
         $account = null;
         if ($request->getData('client') !== null) {
@@ -218,7 +218,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    private function validateBillCreate(RequestAbstract $request): array
+    private function validateBillCreate(RequestAbstract $request) : array
     {
         $val = [];
         if (($val['client/supplier'] = (empty($request->getData('client'))
@@ -243,7 +243,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiMediaAddToBill(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiMediaAddToBill(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!empty($val = $this->validateMediaAddToBill($request))) {
             $response->set($request->uri->__toString(), new FormValidation($val));
@@ -313,7 +313,7 @@ final class ApiController extends Controller
 
         $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to bill.', [
             'upload' => $uploaded,
-            'media' => $mediaFiles
+            'media'  => $mediaFiles,
         ]);
     }
 
@@ -326,7 +326,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    private function createBillDir(Bill $bill): string
+    private function createBillDir(Bill $bill) : string
     {
         return '/Modules/Billing/Bills/'
             . $bill->createdAt->format('Y') . '/'
@@ -344,7 +344,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    private function validateMediaAddToBill(RequestAbstract $request): array
+    private function validateMediaAddToBill(RequestAbstract $request) : array
     {
         $val = [];
         if (($val['media'] = (empty($request->getData('media')) && empty($request->getFiles())))
@@ -369,7 +369,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiBillElementCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiBillElementCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!empty($val = $this->validateBillElementCreate($request))) {
             $response->set($request->uri->__toString(), new FormValidation($val));
@@ -400,7 +400,7 @@ final class ApiController extends Controller
      * @since 1.0.0
      * @todo in the database the customer localized version should be stored because this is the version which went out
      */
-    public function createBillElementFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null): BillElement
+    public function createBillElementFromRequest(RequestAbstract $request, ResponseAbstract $response, $data = null) : BillElement
     {
         $element       = new BillElement();
         $element->bill = (int) $request->getData('bill');
@@ -443,7 +443,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function updateBillWithBillElement(Bill $bill, BillElement $element, int $type = 1): Bill
+    public function updateBillWithBillElement(Bill $bill, BillElement $element, int $type = 1) : Bill
     {
         if ($type === 1) {
             $bill->netSales->add($element->totalSalesPriceNet);
@@ -462,7 +462,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    private function validateBillElementCreate(RequestAbstract $request): array
+    private function validateBillElementCreate(RequestAbstract $request) : array
     {
         $val = [];
         if (($val['bill'] = empty($request->getData('bill')))) {
@@ -485,7 +485,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiBillPdfArchiveCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiBillPdfArchiveCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         Autoloader::addPath(__DIR__ . '/../../../Resources/');
 
@@ -569,7 +569,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiBillPdfCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiBillPdfCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
     }
 
@@ -586,7 +586,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiNoteCreate(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiNoteCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         if (!empty($val = $this->validateNoteCreate($request))) {
             $response->set('bill_note_create', new FormValidation($val));
@@ -618,7 +618,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    private function validateNoteCreate(RequestAbstract $request): array
+    private function validateNoteCreate(RequestAbstract $request) : array
     {
         $val = [];
         if (($val['id'] = empty($request->getData('id')))) {
@@ -641,7 +641,7 @@ final class ApiController extends Controller
      *
      * @since 1.0.0
      */
-    public function apiSupplierBillUpload(RequestAbstract $request, ResponseAbstract $response, $data = null): void
+    public function apiSupplierBillUpload(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
     {
         $originalType = (int) ($request->getData('type') ?? $this->app->appSettings->get(
             names: SettingsEnum::ORIGINAL_MEDIA_TYPE,

Models/Bill.php

@@ -17,12 +17,12 @@ namespace Modules\Billing\Models;
 use Modules\Admin\Models\Account;
 use Modules\Admin\Models\NullAccount;
 use Modules\ClientManagement\Models\Client;
+use Modules\Editor\Models\EditorDoc;
 use Modules\Media\Models\Media;
+use Modules\Media\Models\NullMedia;
 use Modules\SupplierManagement\Models\Supplier;
 use phpOMS\Localization\ISO4217CharEnum;
 use phpOMS\Localization\Money;
-use Modules\Editor\Models\EditorDoc;
-use Modules\Media\Models\NullMedia;
 
 /**
  * Bill class.

Models/BillMapper.php

@@ -16,10 +16,10 @@ namespace Modules\Billing\Models;
 
 use Modules\Admin\Models\AccountMapper;
 use Modules\ClientManagement\Models\ClientMapper;
+use Modules\Editor\Models\EditorDocMapper;
 use Modules\Media\Models\MediaMapper;
 use Modules\SupplierManagement\Models\SupplierMapper;
 use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
-use Modules\Editor\Models\EditorDocMapper;
 
 /**
  * Mapper class.

Models/PurchaseBillMapper.php

@@ -227,7 +227,6 @@ final class PurchaseBillMapper extends BillMapper
      */
     public static function getItemTopSuppliers(int $id, \DateTime $start, \DateTime $end, int $limit = 10) : array
     {
-
         $query = SupplierMapper::getQuery();
         $query->selectAs('SUM(billing_bill_element_total_netpurchaseprice)', 'net_purchase')
             ->leftJoin(self::TABLE, self::TABLE . '_d1')

Models/SalesBillMapper.php

@@ -227,7 +227,6 @@ final class SalesBillMapper extends BillMapper
      */
     public static function getItemTopClients(int $id, \DateTime $start, \DateTime $end, int $limit = 10) : array
     {
-
         $query = ClientMapper::getQuery();
         $query->selectAs('SUM(billing_bill_element_total_netsalesprice)', 'net_sales')
             ->leftJoin(self::TABLE, self::TABLE . '_d1')