style: various code style fixes

Author: btry

src/AbstractImpact.php

@@ -37,6 +37,9 @@
 
 abstract class AbstractImpact extends CommonDBChild
 {
+    public static $itemtype = 'itemtype';
+    public static $items_id = 'items_id';
+
     public static $rightname = 'carbon:report';
 
     public function rawSearchOptions()
@@ -117,8 +120,8 @@ public function rawSearchOptions()
     public function getHumanReadableImpact(string $field): string
     {
         return Toolbox::getHumanReadableValue(
-                $this->fields[$field],
-                Type::getImpactUnit($field)
+            $this->fields[$field],
+            Type::getImpactUnit($field)
         );
     }
-}
+}

src/Dashboard/DemoProvider.php

@@ -462,10 +462,10 @@ public static function getImpactOfEmbodiedAndUsageCriteria(string $impact_type,
             $crit['itemtype'] = array_intersect($crit['itemtype'], PLUGIN_CARBON_TYPES);
         }
 
-        $value = self::$impact_values[$impact_type][0] ?? 0 + self::$impact_values[$impact_type][1] ?? 0;
-        if ($value === null) {
+        if (self::$impact_values[$impact_type][0] === null && self::$impact_values[$impact_type][1] === null) {
             $value = 'N/A';
         } else {
+            $value = (self::$impact_values[$impact_type][0] ?? 0) + (self::$impact_values[$impact_type][1] ?? 0);
             $value = Toolbox::getHumanReadableValue(
                 $value,
                 Type::getImpactUnit($impact_type)

src/EmbodiedImpact.php

@@ -36,7 +36,6 @@
 use DBmysql;
 use DBmysqlIterator;
 use Glpi\DBAL\QuerySubQuery;
-use GlpiPlugin\Carbon\Impact\Type;
 
 /**
  * Embodied impact of assets

src/Impact/Embodied/AbstractEmbodiedImpact.php

@@ -108,10 +108,12 @@ public static function getItemsToEvaluate(string $itemtype, array $crit = []): D
         /** @var DBmysql $DB */
         global $DB;
 
-        $crit[] = ['OR' => [
-            EmbodiedImpact::getTableField('id') => null,
-            EmbodiedImpact::getTableField('recalculate') => 1,
-        ]];
+        $crit[] = [
+            'OR' => [
+                EmbodiedImpact::getTableField('id') => null,
+                EmbodiedImpact::getTableField('recalculate') => 1,
+            ]
+        ];
         $iterator = $DB->request(self::getEvaluableQuery($itemtype, $crit, false));
 
         return $iterator;

src/Impact/Usage/AbstractUsageImpact.php

@@ -116,10 +116,12 @@ public function getItemsToEvaluate(array $crit = []): DBmysqlIterator
             throw new \LogicException('Itemtype does not inherits from ' . CommonDBTM::class);
         }
 
-        $crit[] = ['OR' => [
-            UsageImpact::getTableField('id') => null,
-            UsageImpact::getTableField('recalculate') => 1,
-        ]];
+        $crit[] = [
+            'OR' => [
+                UsageImpact::getTableField('id') => null,
+                UsageImpact::getTableField('recalculate') => 1,
+            ]
+        ];
         $crit[UsageImpact::getTableField('id')] = null;
         $iterator = $DB->request($this->getEvaluableQuery($crit, false));
 

src/UsageImpact.php

@@ -36,9 +36,6 @@
 
 class UsageImpact extends AbstractImpact
 {
-    public static $itemtype = 'itemtype';
-    public static $items_id = 'items_id';
-
     public static function getTypeName($nb = 0)
     {
         return _n("Usage impact", "Usage impacts", $nb, 'carbon');

templates/environmentalimpact-item.html.twig

@@ -47,7 +47,7 @@
               {{ label }}
             </div>
             <div class="col-xxl-5">
-              <span id="embodied_{{criteria}}_tip">
+              <span id="embodied_{{ criteria }}_tip">
                 {{ usage_impact.getHumanReadableImpact(criteria)|raw }}
                 {# <i class="fa-solid fa-circle-info"></i> #}
               </span>
@@ -101,7 +101,7 @@
               {{ label }}
             </div>
             <div class="col-xxl-5">
-              <span id="embodied_{{criteria}}_tip">
+              <span id="embodied_{{ criteria }}_tip">
                 {{ embodied_impact.getHumanReadableImpact(criteria)|raw }}
                 {# <i class="fa-solid fa-circle-info"></i> #}
               </span>

tests/src/Impact/Embodied/AbstractEmbodiedImpactTest.php

@@ -100,7 +100,6 @@ public function testGetItemsToEvaluate()
             $asset::getTableField('id') => $asset->getID(),
         ]);
         $this->assertEquals(1, $iterator->count());
-
     }
 
     public function testGetEvaluableQuery()