Clean elses

src/Common/File.php

@@ -43,13 +43,13 @@ public static function fileExists($pFilename)
                 $zip->close();
 
                 return $returnValue;
-            } else {
-                return false;
             }
-        } else {
-            // Regular file_exists
-            return file_exists($pFilename);
+
+            return false;
         }
+
+        // Regular file_exists
+        return file_exists($pFilename);
     }
 
     /**

src/Common/Microsoft/OLERead.php

@@ -186,26 +186,26 @@ public function getStream($stream)
             }
 
             return $streamData;
-        } else {
-            $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
-            if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
-                ++$numBlocks;
-            }
+        }
 
-            if ($numBlocks == 0) {
-                return '';
-            }
+        $numBlocks = $this->props[$stream]['size'] / self::BIG_BLOCK_SIZE;
+        if ($this->props[$stream]['size'] % self::BIG_BLOCK_SIZE != 0) {
+            ++$numBlocks;
+        }
 
-            $block = $this->props[$stream]['startBlock'];
+        if ($numBlocks == 0) {
+            return '';
+        }
 
-            while ($block != -2) {
-                $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
-                $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
-                $block = self::getInt4d($this->bigBlockChain, $block*4);
-            }
+        $block = $this->props[$stream]['startBlock'];
 
-            return $streamData;
+        while ($block != -2) {
+            $pos = ($block + 1) * self::BIG_BLOCK_SIZE;
+            $streamData .= substr($this->data, $pos, self::BIG_BLOCK_SIZE);
+            $block = self::getInt4d($this->bigBlockChain, $block*4);
         }
+
+        return $streamData;
     }
 
     /**
@@ -259,10 +259,10 @@ private function readPropertySets()
                         'type' => $type,
                         'startBlock' => $startBlock,
                         'size' => $size);
-                
+
                 // tmp helper to simplify checks
                 $upName = strtoupper($name);
-                
+
                 switch ($upName) {
                     case 'ROOT ENTRY':
                     case 'R':

src/Common/XMLReader.php

@@ -58,9 +58,9 @@ public function getDomFromZip($zipFile, $xmlFile)
 
         if ($content === false) {
             return false;
-        } else {
-            return $this->getDomFromString($content);
         }
+
+        return $this->getDomFromString($content);
     }
 
     /**
@@ -95,9 +95,9 @@ public function getElements($path, \DOMElement $contextNode = null)
 
         if (is_null($contextNode)) {
             return $this->xpath->query($path);
-        } else {
-            return $this->xpath->query($path, $contextNode);
         }
+
+        return $this->xpath->query($path, $contextNode);
     }
 
     /**
@@ -112,9 +112,9 @@ public function getElement($path, \DOMElement $contextNode = null)
         $elements = $this->getElements($path, $contextNode);
         if ($elements->length > 0) {
             return $elements->item(0);
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**
@@ -156,9 +156,9 @@ public function getValue($path, \DOMElement $contextNode = null)
         $elements = $this->getElements($path, $contextNode);
         if ($elements->length > 0) {
             return $elements->item(0)->nodeValue;
-        } else {
-            return null;
         }
+
+        return null;
     }
 
     /**

src/Common/XMLWriter.php

@@ -100,10 +100,10 @@ public function getData()
     {
         if ($this->tempFileName == '') {
             return $this->outputMemory(true);
-        } else {
-            $this->flush();
-            return file_get_contents($this->tempFileName);
         }
+
+        $this->flush();
+        return file_get_contents($this->tempFileName);
     }