laudeco / bbc-dolibarr-flightlog

command/CreatePilotYearBillCommandHandler.php

Spacing +5 added lines, -5 removed lines

@@ -258,7 +258,7 @@ 
      */
     private function addOrderDiscount($order, $pilotFlightCount, $service, $year)
     {
-        $price = $pilotFlightCount->getCost()->getValue()/(1+$service->tva_tx/100);
+        $price = $pilotFlightCount->getCost()->getValue() / (1 + $service->tva_tx / 100);
         $pu_ht = price2num($price, 'MU');
         $desc = $year . " - " . $service->label . " - (" . $pilotFlightCount->getCount() . " * " . $pilotFlightCount->getFactor() . ")";
 
@@ -289,7 +289,7 @@ 
             return;
         }
 
-        $pointsHt = $command->getAdditionalBonus()/(1+6/100);
+        $pointsHt = $command->getAdditionalBonus() / (1 + 6 / 100);
         $desc = sprintf("%s - %s", $command->getYear(), $command->getBonusAdditionalMessage());
 
         $discountid = $this->getCompany($object->socid)->set_remise_except($pointsHt, $this->user, $desc, 6);
@@ -309,14 +309,14 @@ 
         $totalCost = FlightCost::zero();
         $description = '';
 
-        foreach ($damages as $damage){
+        foreach ($damages as $damage) {
             $totalCost->addCost($damage->getCost());
-            $description .= $damage->getLabel().'; ';
+            $description .= $damage->getLabel() . '; ';
         }
 
         $tDamage = new Product($this->db);
         $tDamage->label = 'Réparations aux ballons';
-        $tDamage->description = $description ;
+        $tDamage->description = $description;
         $tDamage->tva_tx = 21;
         $tDamage->price_ttc = $totalCost->getValue();
         $tDamage->price = $tDamage->price_ttc / (1 + $tDamage->tva_tx / 100);

readFlights.php

Spacing +5 added lines, -5 removed lines

@@ -189,7 +189,7 @@ 
     print '<td>' . $pilot->getCountForType('orga_T6')->getCount() . '</td>';
     print '<td>' . $pilot->getCountForType('orga_T6')->getCost()->getValue() . '</td>';
 
-    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0?'text-muted':'text-bold'). $pilot->getFlightBonus()->getValue() . ' pts</td>';
+    print sprintf('<td class="%s">', $pilot->getFlightBonus()->getValue() === 0 ? 'text-muted' : 'text-bold') . $pilot->getFlightBonus()->getValue() . ' pts</td>';
 
     print '<td>' . $pilot->getCountForType('3')->getCount() . '</td>';
     print '<td>' . price($pilot->getCountForType('3')->getCost()->getValue()) . '€</td>';
@@ -208,8 +208,8 @@ 
     print '<td>' . price($pilot->damageCost()->getValue()) . '€</td>';
     print '<td>' . price($pilot->invoicedDamageCost()->getValue()) . '€</td>';
 
-    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0?'text-muted':'text-bold'). price($pilot->getFlightsCost()->getValue()) . '€ </td>';
-    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero())?'text-bold':'text-muted'). price($pilot->getTotalBill()->getValue()) . '€</td>';
+    print sprintf('<td class="%s">', $pilot->getFlightsCost()->getValue() === 0 ? 'text-muted' : 'text-bold') . price($pilot->getFlightsCost()->getValue()) . '€ </td>';
+    print sprintf('<td class="%s">', $pilot->isBillable(FlightBonus::zero()) ? 'text-bold' : 'text-muted') . price($pilot->getTotalBill()->getValue()) . '€</td>';
     print '</tr>';
 }
 
@@ -234,7 +234,7 @@ 
 print '<td>' . $totalT3 . '</td>';
 print '<td></td>';
 
-print '<td>' . $totalT4. '</td>';
+print '<td>' . $totalT4 . '</td>';
 print '<td></td>';
 
 print '<td>' . $totalT5 . '</td>';
@@ -263,7 +263,7 @@ 
 //table km
 $tauxRemb = isset($conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM) ? $conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM : 0;
 $year = GETPOST("year", 'int');
-if(empty($year)){
+if (empty($year)) {
     $year = date('Y');
 }
 

Infrastructure/Damage/Query/Repository/GetDamagesForFlightQueryRepository.php

Spacing +4 added lines, -4 removed lines

@@ -31,15 +31,15 @@
     public function __invoke($flightId)
     {
         $sql = 'SELECT damage.author_id as author_id, damage.rowid as id, damage.amount, damage.label, CONCAT(author.firstname, " " , author.lastname) as author_name, damage.billed as invoiced';
-        $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.=' WHERE damage.flight_id = '.$this->db->escape($flightId);
+        $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 .= ' WHERE damage.flight_id = ' . $this->db->escape($flightId);
 
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
             if ($num) {
-                for($i = 0; $i < $num ; $i++) {
+                for ($i = 0; $i < $num; $i++) {
                     $properties = $this->db->fetch_array($resql);
                     yield Damage::fromArray($properties);
                 }

Infrastructure/Damage/Repository/FlightDamageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
             'label' => $flightDamage->getLabel()->value(),
         ];
 
-        if($flightDamage->getId()){
+        if ($flightDamage->getId()) {
             $this->update($flightDamage->getId()->getId(), $fields);
             return $flightDamage->getId()->getId();
         }
@@ -52,10 +52,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/Repository/AbstractDomainRepository.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
     public function __construct(\DoliDB $db, $tableName)
     {
         $this->db = $db;
-        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX.$tableName;
+        $this->tableName = strpos($tableName, MAIN_DB_PREFIX) === 0 ? $tableName : MAIN_DB_PREFIX . $tableName;
     }
 
     /**
@@ -33,7 +33,7 @@ 
      *
      * @throws \Exception
      */
-    protected function write(array $elements){
+    protected function write(array $elements) {
         $columns = join(',', array_keys($elements));
         $values = join(',', array_map([$this, 'escape'], array_values($elements)));
 
@@ -44,7 +44,7 @@ 
             $lasterror = $this->db->lasterror();
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
             $this->db->rollback();
-            throw new \Exception("Repository error - ".$lasterror);
+            throw new \Exception("Repository error - " . $lasterror);
         }
 
         $id = $this->db->last_insert_id($this->tableName);
@@ -57,16 +57,16 @@ 
      *
      * @return int|string|null
      */
-    private function escape($value){
-        if(is_null($value)){
+    private function escape($value) {
+        if (is_null($value)) {
             return null;
         }
 
-        if(is_bool($value)){
-            return (int)$value;
+        if (is_bool($value)) {
+            return (int) $value;
         }
 
-        return is_string($value) ? "'".$this->db->escape($value)."'" : $value ;
+        return is_string($value) ? "'" . $this->db->escape($value) . "'" : $value;
     }
 
     /**
@@ -79,18 +79,18 @@ 
     {
         $sqlModifications = [];
 
-        foreach($elements as $field => $value){
+        foreach ($elements as $field => $value) {
             $sqlModifications[] = sprintf('%s=%s', $field, $this->escape($value));
         }
 
         $this->db->begin();
-        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',',$sqlModifications), $id));
+        $resql = $this->db->query(sprintf('UPDATE %s SET %s WHERE rowid = %s ', $this->tableName, join(',', $sqlModifications), $id));
 
         if (!$resql) {
             $lasterror = $this->db->lasterror();
             dol_syslog(__METHOD__ . ' ' . $lasterror, LOG_ERR);
             $this->db->rollback();
-            throw new \Exception("Repository error - ".$lasterror);
+            throw new \Exception("Repository error - " . $lasterror);
         }
 
         $this->db->commit();
@@ -103,8 +103,8 @@ 
      *
      * @return array|null
      */
-    protected function get($id){
-        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id );
+    protected function get($id) {
+        $sql = sprintf('SELECT * FROM %s WHERE rowid = %s', $this->tableName, $id);
 
         $resql = $this->db->query($sql);
         if (!$resql) {
@@ -116,7 +116,7 @@ 
             return null;
         }
 
-        for($i = 0; $i < $num ; $i++) {
+        for ($i = 0; $i < $num; $i++) {
             return $this->db->fetch_array($resql);
         }
 

Application/Damage/ViewModel/Damage.php

Spacing +2 added lines, -2 removed lines

@@ -72,14 +72,14 @@
      *
      * @return Damage
      */
-    public static function fromArray(array $properties){
+    public static function fromArray(array $properties) {
         $authorId = $properties['author_id'];
         $author = $properties['author_name'];
         $label = $properties['label'];
         $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($authorId, $author, $amount, $id, $invoiced, $flightId, $label);
     }

Application/Damage/Command/CreateDamageCommandHandler.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
     public function __invoke(CreateDamageCommand $command)
     {
         $damage = FlightDamage::waiting(new DamageAmount($command->getAmount()), AuthorId::create($command->getAuthorId()), new DamageLabel($command->getLabel()));
-        if(null !== $command->getFlightId()){
+        if (null !== $command->getFlightId()) {
             $damage = FlightDamage::damage(FlightId::create($command->getFlightId()), new DamageLabel($command->getLabel()), new DamageAmount($command->getAmount()), AuthorId::create($command->getAuthorId()));
         }
 
@@ -60,7 +60,7 @@ 
      */
     private function linkSupplierInvoice($damageId, $invoiceId)
     {
-        if($invoiceId <= 0){
+        if ($invoiceId <= 0) {
             return;
         }
 
@@ -81,8 +81,8 @@ 
      * @param int $targetId
      * @param string $targetType
      */
-    private function insertLinks($damageId, $targetId, $targetType){
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+    private function insertLinks($damageId, $targetId, $targetType) {
+        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
         $sql .= "fk_source";
         $sql .= ", sourcetype";
         $sql .= ", fk_target";
@@ -90,8 +90,8 @@ 
         $sql .= ") VALUES (";
         $sql .= $damageId;
         $sql .= ", 'flightlog_damage'";
-        $sql .= ", ".$targetId;
-        $sql .= ", '".$targetType."'";
+        $sql .= ", " . $targetId;
+        $sql .= ", '" . $targetType . "'";
         $sql .= ")";
 
         if ($this->db->query($sql))

class/Damage/ValueObject/DamageLabel.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $this->label = $label;
     }
 
-    public function value(){
+    public function value() {
         return $this->label;
     }
 

class/flight/Pilot.php

Spacing +11 added lines, -11 removed lines

@@ -106,11 +106,11 @@ 
         return new Pilot($this->name, $this->id, $types);
     }
 
-    public function addDamage(FlightDamageCount $damage){
+    public function addDamage(FlightDamageCount $damage) {
         $this->damages[] = $damage;
     }
 
-    public function addInvoicedDamage(FlightInvoicedDamageCount $damage){
+    public function addInvoicedDamage(FlightInvoicedDamageCount $damage) {
         $this->damages[] = $damage;
     }
 
@@ -161,21 +161,21 @@ 
         return $flightsCost;
     }
 
-    public function totalDamageCost(){
+    public function totalDamageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
+        foreach ($this->damages as $damage) {
             $flightCost = $flightCost->addCost($damage->getCost());
         }
 
         return $flightCost;
     }
 
-    public function damageCost(){
+    public function damageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
-            if(!$damage instanceof FlightDamageCount){
+        foreach ($this->damages as $damage) {
+            if (!$damage instanceof FlightDamageCount) {
                 continue;
             }
 
@@ -185,11 +185,11 @@ 
         return $flightCost;
     }
 
-    public function invoicedDamageCost(){
+    public function invoicedDamageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
-            if(!$damage instanceof FlightInvoicedDamageCount){
+        foreach ($this->damages as $damage) {
+            if (!$damage instanceof FlightInvoicedDamageCount) {
                 continue;
             }
 
@@ -199,7 +199,7 @@ 
         return $flightCost;
     }
 
-    public function damages(){
+    public function damages() {
         return $this->damages;
     }