Use null coalescing operator when possible

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Feb 28, 2020 · 0cc8618 · 0cc8618
1 parent 00fcc8f
commit 0cc8618
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ShapeFile.php b/src/ShapeFile.php
@@ -401,7 +401,7 @@ private function loadHeaders()
     private function saveBBoxRecord($file, $type)
     {
         fwrite($file, Util::packDouble(
-            isset($this->boundingBox[$type]) ? $this->boundingBox[$type] : 0
+            $this->boundingBox[$type] ?? 0
         ));
     }
 

diff --git a/src/ShapeRecord.php b/src/ShapeRecord.php
@@ -215,7 +215,7 @@ public function updateDBFInfo($header)
         unset($this->dbfData);
         $this->dbfData = [];
         foreach ($header as $value) {
-            $this->dbfData[$value[0]] = (isset($tmp[$value[0]])) ? $tmp[$value[0]] : '';
+            $this->dbfData[$value[0]] = $tmp[$value[0]] ?? '';
         }
     }
 
@@ -685,14 +685,14 @@ public function addPoint($point, $partIndex = 0)
                 //Adds a new point to the selected part
                 $this->shpData['parts'][$partIndex]['points'][] = $point;
                 $this->shpData['numparts'] = count($this->shpData['parts']);
-                $this->shpData['numpoints'] = 1 + (isset($this->shpData['numpoints']) ? $this->shpData['numpoints'] : 0);
+                $this->shpData['numpoints'] = 1 + ($this->shpData['numpoints'] ?? 0);
                 break;
             case 8:
             case 18:
             case 28:
                 //Adds a new point
                 $this->shpData['points'][] = $point;
-                $this->shpData['numpoints'] = 1 + (isset($this->shpData['numpoints']) ? $this->shpData['numpoints'] : 0);
+                $this->shpData['numpoints'] = 1 + ($this->shpData['numpoints'] ?? 0);
                 break;
             default:
                 $this->setError(sprintf('The Shape Type "%s" is not supported.', $this->shapeType));