laudeco / bbc-dolibarr-flightlog

Application/Damage/ViewModel/Damage.php

Spacing +2 added lines, -2 removed lines

@@ -59,12 +59,12 @@
      *
      * @return Damage
      */
-    public static function fromArray(array $properties){
+    public static function fromArray(array $properties) {
         $author = $properties['author_name'];
         $amount = $properties['amount'];
         $id = $properties['id'];
         $flightId = isset($properties['flight_id']) ? $properties['flight_id'] : null;
-        $invoiced = (bool)$properties['invoiced'];
+        $invoiced = (bool) $properties['invoiced'];
 
         return new self($author, $amount, $id, $invoiced, $flightId);
     }

Http/Web/templates/flight_damage/view.php

Spacing +5 added lines, -5 removed lines

@@ -14,20 +14,20 @@
         <td>Montant</td>
     </tr>
     <?php $total = 0; ?>
-    <?php foreach($damages as $currentDamage):?>
+    <?php foreach ($damages as $currentDamage):?>
         <?php $total += $currentDamage->getAmount(); ?>
         <tr>
-            <td><?php echo $currentDamage->getAuthorName();?></td>
-            <td><?php echo $currentDamage->getAmount();?>€</td>
+            <td><?php echo $currentDamage->getAuthorName(); ?></td>
+            <td><?php echo $currentDamage->getAmount(); ?>€</td>
             <td>
-                <?php if($currentDamage->isInvoiced()): ?>
+                <?php if ($currentDamage->isInvoiced()): ?>
                     <i class="fas fa-check"></i>
                 <?php else: ?>
                     <i class="fas fa-times"></i>
                 <?php endif; ?>
             </td>
             <td>
-                <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId());?>"><i class="fas fa-link"></i></a>
+                <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId()); ?>"><i class="fas fa-link"></i></a>
             </td>
         </tr>
     <?php endforeach; ?>

Braces +5 added lines, -2 removed lines

@@ -22,9 +22,12 @@
             <td>
                 <?php if($currentDamage->isInvoiced()): ?>
                     <i class="fas fa-check"></i>
-                <?php else: ?>
+                <?php else {
+    : ?>
                     <i class="fas fa-times"></i>
-                <?php endif; ?>
+                <?php endif;
+}
+?>
             </td>
             <td>
                 <a href="<?php print sprintf('%s/flightlog/index.php?r=get_one_damage&id=%s', DOL_URL_ROOT, $currentDamage->getId());?>"><i class="fas fa-link"></i></a>

Http/Web/templates/damage/view.php

Spacing +3 added lines, -3 removed lines

@@ -53,9 +53,9 @@
 ?>
 
 <table class="border centpercent">
-    <tr><td class="fieldrequired">Auteur</td><td><?php echo $damage->getAuthorName();?></td></tr>
-    <tr><td class="fieldrequired">Montant</td><td><?php echo $damage->getAmount();?>€</td></tr>
-    <tr><td class="fieldrequired">Facturé</td><td><?php echo $damage->isInvoiced()? 'Oui' : 'Non';?></td></tr>
+    <tr><td class="fieldrequired">Auteur</td><td><?php echo $damage->getAuthorName(); ?></td></tr>
+    <tr><td class="fieldrequired">Montant</td><td><?php echo $damage->getAmount(); ?>€</td></tr>
+    <tr><td class="fieldrequired">Facturé</td><td><?php echo $damage->isInvoiced() ? 'Oui' : 'Non'; ?></td></tr>
     <tr>
         <td class="fieldrequired">Vol</td>
         <td>

Http/Web/Controller/DamageController.php

Braces +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                 'form' => new Form($this->db),
                 'flight' => $flight
             ]);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             echo $e->getMessage();
         }
     }

Spacing +6 added lines, -6 removed lines

@@ -13,14 +13,14 @@ 
     /**
      * @return GetDamageQueryRepository
      */
-    private function getDamageRepository(){
+    private function getDamageRepository() {
         return new GetDamageQueryRepository($this->db);
     }
 
-    public function view(){
+    public function view() {
         $damageId = $this->request->getParam('id');
 
-        try{
+        try {
             $damage = $this->getDamageRepository()->query($damageId);
 
             $flight = new \Bbcvols($this->db);
@@ -31,16 +31,16 @@ 
                 'form' => new Form($this->db),
                 'flight' => $flight
             ]);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             echo $e->getMessage();
         }
     }
 
-    public function invoice(){
+    public function invoice() {
         $damageId = $this->request->getParam('id');
 
 
 
-        return $this->redirect($_SERVER["PHP_SELF"].'?id='.$damageId);
+        return $this->redirect($_SERVER["PHP_SELF"] . '?id=' . $damageId);
     }
 }
\ No newline at end of file

class/Damage/FlightDamage.php

Indentation +5 added lines, -5 removed lines

@@ -39,11 +39,11 @@
      */
     private function __construct(DamageAmount $amount, $billed, AuthorId $authorId, FlightId $flightId = null, DamageId $id = null)
     {
-       $this->flight = $flightId;
-       $this->amount = $amount;
-       $this->billed = $billed;
-       $this->author = $authorId;
-       $this->id = $id;
+        $this->flight = $flightId;
+        $this->amount = $amount;
+        $this->billed = $billed;
+        $this->author = $authorId;
+        $this->id = $id;
     }
 
     /**

Spacing +6 added lines, -6 removed lines

@@ -55,7 +55,7 @@ 
      *
      * @return FlightDamage
      */
-    public static function load(FlightId $flightId, DamageAmount $amount, $billed, AuthorId $authorId, DamageId $id = null){
+    public static function load(FlightId $flightId, DamageAmount $amount, $billed, AuthorId $authorId, DamageId $id = null) {
         return new self($amount, $billed, $authorId, $flightId, $id);
     }
 
@@ -66,7 +66,7 @@ 
      *
      * @return FlightDamage
      */
-    public static function damage(FlightId $flightId, DamageAmount $amount, AuthorId $authorId){
+    public static function damage(FlightId $flightId, DamageAmount $amount, AuthorId $authorId) {
         return new self($amount, false, $authorId, $flightId);
     }
 
@@ -76,7 +76,7 @@ 
      *
      * @return FlightDamage
      */
-    public static function waiting(DamageAmount $amount, AuthorId $authorId){
+    public static function waiting(DamageAmount $amount, AuthorId $authorId) {
         return new self($amount, false, $authorId);
     }
 
@@ -91,14 +91,14 @@ 
     /**
      * @return FlightId
      */
-    public function getFlightId(){
+    public function getFlightId() {
         return $this->flight;
     }
 
     /**
      * @return DamageAmount
      */
-    public function amount(){
+    public function amount() {
         return $this->amount;
     }
 
@@ -115,7 +115,7 @@ 
      *
      * @return FlightDamage
      */
-    public function invoice(){
+    public function invoice() {
         return new self($this->flight, $this->amount, true, $this->author, $this->id);
     }
 

Infrastructure/Damage/Query/Repository/GetDamageQueryRepository.php

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
         $this->db = $db;
     }
 
-    private function element($objectType, $rowid){
+    private function element($objectType, $rowid) {
         $element = null;
         $subelement = null;
 
@@ -33,7 +33,7 @@ 
             $subelement = $regs[2];
         }
 
-        $classpath = $element.'/class';
+        $classpath = $element . '/class';
 
         if ($objectType == 'facture') {
             $classpath = 'compta/facture/class';
@@ -85,7 +85,7 @@ 
             $classfile = 'subscription'; $classname = 'Subscription';
         }
 
-        dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
+        dol_include_once('/' . $classpath . '/' . $classfile . '.class.php');
         if (!class_exists($classname))
         {
             return null;
@@ -104,14 +104,14 @@ 
      *
      * @throws \Exception
      */
-    public function query($damageId){
+    public function query($damageId) {
 
         $sql = 'SELECT damage.rowid as id, damage.amount, author.login as author_name, damage.billed as invoiced, damage.flight_id as flight_id';
-        $sql.= ', element.rowid as element_id ,element.fk_target as element_fk_target, element.targettype as element_target_type';
-        $sql.=' FROM '.MAIN_DB_PREFIX.'bbc_flight_damages as damage';
-        $sql.=' INNER JOIN '.MAIN_DB_PREFIX.'user as author ON author.rowid = damage.author_id';
-        $sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'element_element as element ON (element.fk_source = damage.rowid AND element.sourcetype = "flightlog_damage")';
-        $sql.=' WHERE damage.rowid = '.$damageId;
+        $sql .= ', element.rowid as element_id ,element.fk_target as element_fk_target, element.targettype as element_target_type';
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bbc_flight_damages as damage';
+        $sql .= ' INNER JOIN ' . MAIN_DB_PREFIX . 'user as author ON author.rowid = damage.author_id';
+        $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'element_element as element ON (element.fk_source = damage.rowid AND element.sourcetype = "flightlog_damage")';
+        $sql .= ' WHERE damage.rowid = ' . $damageId;
 
         $resql = $this->db->query($sql);
         if (!$resql) {
@@ -125,13 +125,13 @@ 
 
         /** @var Damage $damage */
         $damage = null;
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             $properties = $this->db->fetch_array($resql);
-            if(!$damage){
+            if (!$damage) {
                 $damage = Damage::fromArray($properties);
             }
 
-            if(!isset($properties['element_id'])){
+            if (!isset($properties['element_id'])) {
                 continue;
             }
 

Braces +13 added lines, -26 removed lines

@@ -37,29 +37,21 @@ 
 
         if ($objectType == 'facture') {
             $classpath = 'compta/facture/class';
-        }
-        elseif ($objectType == 'facturerec') {
+        } elseif ($objectType == 'facturerec') {
             $classpath = 'compta/facture/class';
-        }
-        elseif ($objectType == 'propal') {
+        } elseif ($objectType == 'propal') {
             $classpath = 'comm/propal/class';
-        }
-        elseif ($objectType == 'supplier_proposal') {
+        } elseif ($objectType == 'supplier_proposal') {
             $classpath = 'supplier_proposal/class';
-        }
-        elseif ($objectType == 'shipping') {
+        } elseif ($objectType == 'shipping') {
             $classpath = 'expedition/class'; $subelement = 'expedition';
-        }
-        elseif ($objectType == 'delivery') {
+        } elseif ($objectType == 'delivery') {
             $classpath = 'livraison/class'; $subelement = 'livraison';
-        }
-        elseif ($objectType == 'invoice_supplier' || $objectType == 'order_supplier') {
+        } elseif ($objectType == 'invoice_supplier' || $objectType == 'order_supplier') {
             $classpath = 'fourn/class';
-        }
-        elseif ($objectType == 'fichinter') {
+        } elseif ($objectType == 'fichinter') {
             $classpath = 'fichinter/class'; $subelement = 'fichinter';
-        }
-        elseif ($objectType == 'subscription') {
+        } elseif ($objectType == 'subscription') {
             $classpath = 'adherents/class';
         }
 
@@ -68,20 +60,15 @@ 
 
         if ($objectType == 'order') {
             $classfile = 'commande'; $classname = 'Commande';
-        }
-        elseif ($objectType == 'invoice_supplier') {
+        } elseif ($objectType == 'invoice_supplier') {
             $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-        }
-        elseif ($objectType == 'order_supplier') {
+        } elseif ($objectType == 'order_supplier') {
             $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-        }
-        elseif ($objectType == 'supplier_proposal') {
+        } elseif ($objectType == 'supplier_proposal') {
             $classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-        }
-        elseif ($objectType == 'facturerec') {
+        } elseif ($objectType == 'facturerec') {
             $classfile = 'facture-rec'; $classname = 'FactureRec';
-        }
-        elseif ($objectType == 'subscription') {
+        } elseif ($objectType == 'subscription') {
             $classfile = 'subscription'; $classname = 'Subscription';
         }
 

Infrastructure/Damage/Repository/FlightDamageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
             'author_id' => $flightDamage->getAuthor()->getId()
         ];
 
-        if($flightDamage->getId()){
+        if ($flightDamage->getId()) {
             $this->update($flightDamage->getId()->getId(), $fields);
             return $flightDamage->getId()->getId();
         }
@@ -50,10 +50,10 @@ 
      *
      * @throws \Exception
      */
-    public function getById(DamageId $id){
+    public function getById(DamageId $id) {
         $damage = $this->get($id->getId());
 
-        if(null === $damage){
+        if (null === $damage) {
             throw new \Exception('Damage not found');
         }
 

Infrastructure/Common/Routes/guards.conf.php

Unused Use Statements -3 removed lines

@@ -1,9 +1,6 @@
 <?php
 
-use FlightLog\Http\Web\Controller\DamageController;
-use FlightLog\Http\Web\Controller\FlightController;
 use FlightLog\Infrastructure\Common\Routes\Guard;
-use FlightLog\Infrastructure\Common\Routes\Route;
 
 global $db;
 

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 global $db;
 
 return [
-    new Guard('get_one_damage', function(User $user){
+    new Guard('get_one_damage', function(User $user) {
         return $user->rights->flightlog->vol->financial;
     }),
 ];

Http/Web/Controller/WebController.php

Spacing +4 added lines, -4 removed lines

@@ -32,19 +32,19 @@
      *
      * @return Response
      */
-    protected function render($template, array $variables = []){
+    protected function render($template, array $variables = []) {
 
-        foreach($variables as $variableName => $variableValue){
+        foreach ($variables as $variableName => $variableValue) {
             $GLOBALS[$variableName] = $variableValue;
         }
 
-        return new Response(__DIR__.'/../templates/'.$template);
+        return new Response(__DIR__ . '/../templates/' . $template);
     }
 
     /**
      * @param string $html
      */
-    protected function renderHtml($html){
+    protected function renderHtml($html) {
         print $html;
     }