litefeel / writing-on-github

Spyc.php

Braces +269 added lines, -115 removed lines

@@ -243,14 +243,18 @@ 
 
     // New YAML document
     $string = "";
-    if (!$no_opening_dashes) $string = "---\n";
+    if (!$no_opening_dashes) {
+    	$string = "---\n";
+    }
 
     // Start at the base of the array and move through it.
     if ($array) {
       $array = (array)$array;
       $previous_key = -1;
       foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
+        if (!isset($first_key)) {
+        	$first_key = $key;
+        }
         $string .= $this->_yamlize($key,$value,0,$previous_key, $first_key, $array);
         $previous_key = $key;
       }
@@ -267,10 +271,13 @@ 
      * @param $indent The indent of the current node
      */
   private function _yamlize($key,$value,$indent, $previous_key = -1, $first_key = 0, $source_array = null) {
-    if(is_object($value)) $value = (array)$value;
+    if(is_object($value)) {
+    	$value = (array)$value;
+    }
     if (is_array($value)) {
-      if (empty ($value))
-        return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
+      if (empty ($value)) {
+              return $this->_dumpNode($key, array(), $indent, $previous_key, $first_key, $source_array);
+      }
       // It has children.  What to do?
       // Make it the right kind of item
       $string = $this->_dumpNode($key, self::REMPTY, $indent, $previous_key, $first_key, $source_array);
@@ -297,7 +304,9 @@ 
       $string = '';
       $previous_key = -1;
       foreach ($array as $key => $value) {
-        if (!isset($first_key)) $first_key = $key;
+        if (!isset($first_key)) {
+        	$first_key = $key;
+        }
         $string .= $this->_yamlize($key, $value, $indent, $previous_key, $first_key, $array);
         $previous_key = $key;
       }
@@ -327,20 +336,29 @@ 
       $value  = $this->_doFolding($value,$indent);
     }
 
-    if ($value === array()) $value = '[ ]';
-    if ($value === "") $value = '""';
+    if ($value === array()) {
+    	$value = '[ ]';
+    }
+    if ($value === "") {
+    	$value = '""';
+    }
     if (self::isTranslationWord($value)) {
       $value = $this->_doLiteralBlock($value, $indent);
     }
-    if (trim ($value) != $value)
-       $value = $this->_doLiteralBlock($value,$indent);
+    if (trim ($value) != $value) {
+           $value = $this->_doLiteralBlock($value,$indent);
+    }
 
     if (is_bool($value)) {
        $value = $value ? "true" : "false";
     }
 
-    if ($value === null) $value = 'null';
-    if ($value === "'" . self::REMPTY . "'") $value = null;
+    if ($value === null) {
+    	$value = 'null';
+    }
+    if ($value === "'" . self::REMPTY . "'") {
+    	$value = null;
+    }
 
     $spaces = str_repeat(' ',$indent);
 
@@ -365,7 +383,9 @@ 
      * @param $indent int The value of the indent
      */
   private function _doLiteralBlock($value,$indent) {
-    if ($value === "\n") return '\n';
+    if ($value === "\n") {
+    	return '\n';
+    }
     if (strpos($value, "\n") === false && strpos($value, "'") === false) {
       return sprintf ("'%s'", $value);
     }
@@ -405,10 +425,12 @@ 
       $wrapped = wordwrap($value,$this->_dumpWordWrap,"\n$indent");
       $value   = ">\n".$indent.$wrapped;
     } else {
-      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY)
-        $value = '"' . $value . '"';
-      if (is_numeric($value) && is_string($value))
-        $value = '"' . $value . '"';
+      if ($this->setting_dump_force_quotes && is_string ($value) && $value !== self::REMPTY) {
+              $value = '"' . $value . '"';
+      }
+      if (is_numeric($value) && is_string($value)) {
+              $value = '"' . $value . '"';
+      }
     }
 
 
@@ -482,7 +504,9 @@ 
   }
 
   private function loadWithSource($Source) {
-    if (empty ($Source)) return array();
+    if (empty ($Source)) {
+    	return array();
+    }
     if ($this->setting_use_syck_is_possible && function_exists ('syck_load')) {
       $array = syck_load (implode ("\n", $Source));
       return is_array($array) ? $array : array();
@@ -498,8 +522,12 @@ 
       $this->indent = strlen($line) - strlen(ltrim($line));
       $tempPath = $this->getParentPathByIndent($this->indent);
       $line = self::stripIndent($line, $this->indent);
-      if (self::isComment($line)) continue;
-      if (self::isEmpty($line)) continue;
+      if (self::isComment($line)) {
+      	continue;
+      }
+      if (self::isEmpty($line)) {
+      	continue;
+      }
       $this->path = $tempPath;
 
       $literalBlockStyle = self::startsLiteralBlock($line);
@@ -526,13 +554,15 @@ 
 
       $lineArray = $this->_parseLine($line);
 
-      if ($literalBlockStyle)
-        $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+      if ($literalBlockStyle) {
+              $lineArray = $this->revertLiteralPlaceHolder ($lineArray, $literalBlock);
+      }
 
       $this->addArray($lineArray, $this->indent);
 
-      foreach ($this->delayedPath as $indent => $delayedPath)
-        $this->path[$indent] = $delayedPath;
+      foreach ($this->delayedPath as $indent => $delayedPath) {
+              $this->path[$indent] = $delayedPath;
+      }
 
       $this->delayedPath = array();
 
@@ -541,8 +571,9 @@ 
   }
 
   private function loadFromSource ($input) {
-    if (!empty($input) && strpos($input, "\n") === false && file_exists($input))
-      $input = file_get_contents($input);
+    if (!empty($input) && strpos($input, "\n") === false && file_exists($input)) {
+          $input = file_get_contents($input);
+    }
 
     return $this->loadFromString($input);
   }
@@ -562,9 +593,13 @@ 
      * @param string $line A line from the YAML file
      */
   private function _parseLine($line) {
-    if (!$line) return array();
+    if (!$line) {
+    	return array();
+    }
     $line = trim($line);
-    if (!$line) return array();
+    if (!$line) {
+    	return array();
+    }
 
     $array = array();
 
@@ -574,17 +609,21 @@ 
       $line = $this->stripGroup ($line, $group);
     }
 
-    if ($this->startsMappedSequence($line))
-      return $this->returnMappedSequence($line);
+    if ($this->startsMappedSequence($line)) {
+          return $this->returnMappedSequence($line);
+    }
 
-    if ($this->startsMappedValue($line))
-      return $this->returnMappedValue($line);
+    if ($this->startsMappedValue($line)) {
+          return $this->returnMappedValue($line);
+    }
 
-    if ($this->isArrayElement($line))
-     return $this->returnArrayElement($line);
+    if ($this->isArrayElement($line)) {
+         return $this->returnArrayElement($line);
+    }
 
-    if ($this->isPlainArray($line))
-     return $this->returnPlainArray($line);
+    if ($this->isPlainArray($line)) {
+         return $this->returnPlainArray($line);
+    }
 
 
     return $this->returnKeyValuePair($line);
@@ -598,32 +637,44 @@ 
      * @return mixed
      */
   private function _toType($value) {
-    if ($value === '') return "";
+    if ($value === '') {
+    	return "";
+    }
     $first_character = $value[0];
     $last_character = substr($value, -1, 1);
 
     $is_quoted = false;
     do {
-      if (!$value) break;
-      if ($first_character != '"' && $first_character != "'") break;
-      if ($last_character != '"' && $last_character != "'") break;
+      if (!$value) {
+      	break;
+      }
+      if ($first_character != '"' && $first_character != "'") {
+      	break;
+      }
+      if ($last_character != '"' && $last_character != "'") {
+      	break;
+      }
       $is_quoted = true;
     } while (0);
 
     if ($is_quoted) {
       $value = str_replace('\n', "\n", $value);
-      if ($first_character == "'")
-        return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
+      if ($first_character == "'") {
+              return strtr(substr ($value, 1, -1), array ('\'\'' => '\'', '\\\''=> '\''));
+      }
       return strtr(substr ($value, 1, -1), array ('\\"' => '"', '\\\''=> '\''));
     }
 
-    if (strpos($value, ' #') !== false && !$is_quoted)
-      $value = preg_replace('/\s+#(.+)$/','',$value);
+    if (strpos($value, ' #') !== false && !$is_quoted) {
+          $value = preg_replace('/\s+#(.+)$/','',$value);
+    }
 
     if ($first_character == '[' && $last_character == ']') {
       // Take out strings sequences and mappings
       $innerValue = trim(substr ($value, 1, -1));
-      if ($innerValue === '') return array();
+      if ($innerValue === '') {
+      	return array();
+      }
       $explode = $this->_inlineEscape($innerValue);
       // Propagate value array
       $value  = array();
@@ -644,7 +695,9 @@ 
 
     if ($first_character == '{' && $last_character == '}') {
       $innerValue = trim(substr ($value, 1, -1));
-      if ($innerValue === '') return array();
+      if ($innerValue === '') {
+      	return array();
+      }
       // Inline Mapping
       // Take out strings sequences and mappings
       $explode = $this->_inlineEscape($innerValue);
@@ -652,7 +705,9 @@ 
       $array = array();
       foreach ($explode as $v) {
         $SubArr = $this->_toType($v);
-        if (empty($SubArr)) continue;
+        if (empty($SubArr)) {
+        	continue;
+        }
         if (is_array ($SubArr)) {
           $array[key($SubArr)] = $SubArr[key($SubArr)]; continue;
         }
@@ -667,8 +722,9 @@ 
 
     if ( is_numeric($value) && preg_match ('/^(-|)[1-9]+[0-9]*$/', $value) ){
       $intvalue = (int)$value;
-      if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX)
-        $value = $intvalue;
+      if ($intvalue != PHP_INT_MAX && $intvalue != ~PHP_INT_MAX) {
+              $value = $intvalue;
+      }
       return $value;
     }
 
@@ -680,9 +736,12 @@ 
     $this->coerceValue($value);
 
     if (is_numeric($value)) {
-      if ($value === '0') return 0;
-      if (rtrim ($value, 0) === $value)
-        $value = (float)$value;
+      if ($value === '0') {
+      	return 0;
+      }
+      if (rtrim ($value, 0) === $value) {
+              $value = (float)$value;
+      }
       return $value;
     }
 
@@ -738,7 +797,9 @@ 
       $inline = preg_replace('/{([^\[\]{}]+)}/U', ('YAMLMap' . (count($maps) - 1) . 's'), $inline, 1);
     }
 
-    if ($i++ >= 10) break;
+    if ($i++ >= 10) {
+    	break;
+    }
 
     } while (strpos ($inline, '[') !== false || strpos ($inline, '{') !== false);
 
@@ -811,11 +872,15 @@ 
         $finished = false; break;
       }
     }
-    if ($finished) break;
+    if ($finished) {
+    	break;
+    }
 
     $i++;
-    if ($i > 10)
-      break; // Prevent infinite loops.
+    if ($i > 10) {
+          break;
+    }
+    // Prevent infinite loops.
     }
 
 
@@ -823,8 +888,12 @@ 
   }
 
   private function literalBlockContinues ($line, $lineIndent) {
-    if (!trim($line)) return true;
-    if (strlen($line) - strlen(ltrim($line)) > $lineIndent) return true;
+    if (!trim($line)) {
+    	return true;
+    }
+    if (strlen($line) - strlen(ltrim($line)) > $lineIndent) {
+    	return true;
+    }
     return false;
   }
 
@@ -842,7 +911,9 @@ 
 
   private function addArrayInline ($array, $indent) {
       $CommonGroupPath = $this->path;
-      if (empty ($array)) return false;
+      if (empty ($array)) {
+      	return false;
+      }
 
       foreach ($array as $k => $_) {
         $this->addArray(array($k => $_), $indent);
@@ -855,12 +926,15 @@ 
 
    // print_r ($incoming_data);
 
-    if (count ($incoming_data) > 1)
-      return $this->addArrayInline ($incoming_data, $incoming_indent);
+    if (count ($incoming_data) > 1) {
+          return $this->addArrayInline ($incoming_data, $incoming_indent);
+    }
 
     $key = key ($incoming_data);
     $value = isset($incoming_data[$key]) ? $incoming_data[$key] : null;
-    if ($key === '__!YAMLZero') $key = '0';
+    if ($key === '__!YAMLZero') {
+    	$key = '0';
+    }
 
     if ($incoming_indent == 0 && !$this->_containsGroupAlias && !$this->_containsGroupAnchor) { // Shortcut for root-level values.
       if ($key || $key === '' || $key === '0') {
@@ -893,13 +967,13 @@ 
 
       $_arr = array_merge ($_arr, $value);
     } else if ($key || $key === '' || $key === '0') {
-      if (!is_array ($_arr))
-        $_arr = array ($key=>$value);
-      else
-        $_arr[$key] = $value;
+      if (!is_array ($_arr)) {
+              $_arr = array ($key=>$value);
+      } else {
+              $_arr[$key] = $value;
+      }
     } else {
-      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; }
-      else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
+      if (!is_array ($_arr)) { $_arr = array ($value); $key = 0; } else { $_arr[] = $value; end ($_arr); $key = key ($_arr); }
     }
 
     $reverse_path = array_reverse($this->path);
@@ -928,19 +1002,33 @@ 
 
   private static function startsLiteralBlock ($line) {
     $lastChar = substr (trim($line), -1);
-    if ($lastChar != '>' && $lastChar != '|') return false;
-    if ($lastChar == '|') return $lastChar;
+    if ($lastChar != '>' && $lastChar != '|') {
+    	return false;
+    }
+    if ($lastChar == '|') {
+    	return $lastChar;
+    }
     // HTML tags should not be counted as literal blocks.
-    if (preg_match ('#<.*?>$#', $line)) return false;
+    if (preg_match ('#<.*?>$#', $line)) {
+    	return false;
+    }
     return $lastChar;
   }
 
   private static function greedilyNeedNextLine($line) {
     $line = trim ($line);
-    if (!strlen($line)) return false;
-    if (substr ($line, -1, 1) == ']') return false;
-    if ($line[0] == '[') return true;
-    if (preg_match ('#^[^:]+?:\s*\[#', $line)) return true;
+    if (!strlen($line)) {
+    	return false;
+    }
+    if (substr ($line, -1, 1) == ']') {
+    	return false;
+    }
+    if ($line[0] == '[') {
+    	return true;
+    }
+    if (preg_match ('#^[^:]+?:\s*\[#', $line)) {
+    	return true;
+    }
     return false;
   }
 
@@ -953,37 +1041,46 @@ 
     if ($literalBlockStyle == '|') {
       return $literalBlock . $line;
     }
-    if (strlen($line) == 0)
-      return rtrim($literalBlock, ' ') . "\n";
+    if (strlen($line) == 0) {
+          return rtrim($literalBlock, ' ') . "\n";
+    }
     if ($line == "\n" && $literalBlockStyle == '>') {
       return rtrim ($literalBlock, " \t") . "\n";
     }
-    if ($line != "\n")
-      $line = trim ($line, "\r\n ") . " ";
+    if ($line != "\n") {
+          $line = trim ($line, "\r\n ") . " ";
+    }
     return $literalBlock . $line;
   }
 
    function revertLiteralPlaceHolder ($lineArray, $literalBlock) {
      foreach ($lineArray as $k => $_) {
-      if (is_array($_))
-        $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
-      else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder)
-	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+      if (is_array($_)) {
+              $lineArray[$k] = $this->revertLiteralPlaceHolder ($_, $literalBlock);
+      } else if (substr($_, -1 * strlen ($this->LiteralPlaceHolder)) == $this->LiteralPlaceHolder) {
+      	       $lineArray[$k] = rtrim ($literalBlock, " \r\n");
+      }
      }
      return $lineArray;
    }
 
   private static function stripIndent ($line, $indent = -1) {
-    if ($indent == -1) $indent = strlen($line) - strlen(ltrim($line));
+    if ($indent == -1) {
+    	$indent = strlen($line) - strlen(ltrim($line));
+    }
     return substr ($line, $indent);
   }
 
   private function getParentPathByIndent ($indent) {
-    if ($indent == 0) return array();
+    if ($indent == 0) {
+    	return array();
+    }
     $linePath = $this->path;
     do {
       end($linePath); $lastIndentInParentPath = key($linePath);
-      if ($indent <= $lastIndentInParentPath) array_pop ($linePath);
+      if ($indent <= $lastIndentInParentPath) {
+      	array_pop ($linePath);
+      }
     } while ($indent <= $lastIndentInParentPath);
     return $linePath;
   }
@@ -992,11 +1089,17 @@ 
   private function clearBiggerPathValues ($indent) {
 
 
-    if ($indent == 0) $this->path = array();
-    if (empty ($this->path)) return true;
+    if ($indent == 0) {
+    	$this->path = array();
+    }
+    if (empty ($this->path)) {
+    	return true;
+    }
 
     foreach ($this->path as $k => $_) {
-      if ($k > $indent) unset ($this->path[$k]);
+      if ($k > $indent) {
+      	unset ($this->path[$k]);
+      }
     }
 
     return true;
@@ -1004,9 +1107,15 @@ 
 
 
   private static function isComment ($line) {
-    if (!$line) return false;
-    if ($line[0] == '#') return true;
-    if (trim($line, " \r\n\t") == '---') return true;
+    if (!$line) {
+    	return false;
+    }
+    if ($line[0] == '#') {
+    	return true;
+    }
+    if (trim($line, " \r\n\t") == '---') {
+    	return true;
+    }
     return false;
   }
 
@@ -1016,10 +1125,15 @@ 
 
 
   private function isArrayElement ($line) {
-    if (!$line || !is_scalar($line)) return false;
-    if (substr($line, 0, 2) != '- ') return false;
-    if (strlen ($line) > 3)
-      if (substr($line,0,3) == '---') return false;
+    if (!$line || !is_scalar($line)) {
+    	return false;
+    }
+    if (substr($line, 0, 2) != '- ') {
+    	return false;
+    }
+    if (strlen ($line) > 3) {
+          if (substr($line,0,3) == '---') return false;
+    }
 
     return true;
   }
@@ -1029,17 +1143,29 @@ 
   }
 
   private function isLiteral ($line) {
-    if ($this->isArrayElement($line)) return false;
-    if ($this->isHashElement($line)) return false;
+    if ($this->isArrayElement($line)) {
+    	return false;
+    }
+    if ($this->isHashElement($line)) {
+    	return false;
+    }
     return true;
   }
 
 
   private static function unquote ($value) {
-    if (!$value) return $value;
-    if (!is_string($value)) return $value;
-    if ($value[0] == '\'') return trim ($value, '\'');
-    if ($value[0] == '"') return trim ($value, '"');
+    if (!$value) {
+    	return $value;
+    }
+    if (!is_string($value)) {
+    	return $value;
+    }
+    if ($value[0] == '\'') {
+    	return trim ($value, '\'');
+    }
+    if ($value[0] == '"') {
+    	return trim ($value, '"');
+    }
     return $value;
   }
 
@@ -1101,7 +1227,9 @@ 
       }
       // Set the type of the value.  Int, string, etc
       $value = $this->_toType($value);
-      if ($key === '0') $key = '__!YAMLZero';
+      if ($key === '0') {
+      	$key = '__!YAMLZero';
+      }
       $array[$key] = $value;
     } else {
       $array = array ($line);
@@ -1112,7 +1240,10 @@ 
 
 
   private function returnArrayElement ($line) {
-     if (strlen($line) <= 1) return array(array()); // Weird %)
+     if (strlen($line) <= 1) {
+     	return array(array());
+     }
+     // Weird %)
      $array = array();
      $value   = trim(substr($line,1));
      $value   = $this->_toType($value);
@@ -1126,19 +1257,36 @@ 
 
   private function nodeContainsGroup ($line) {
     $symbolsForReference = 'A-z0-9_\-';
-    if (strpos($line, '&') === false && strpos($line, '*') === false) return false; // Please die fast ;-)
-    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) return $matches[1];
-    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) return $matches[1];
-    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) return $matches[1];
-    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) return $matches[1];
+    if (strpos($line, '&') === false && strpos($line, '*') === false) {
+    	return false;
+    }
+    // Please die fast ;-)
+    if ($line[0] == '&' && preg_match('/^(&['.$symbolsForReference.']+)/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if ($line[0] == '*' && preg_match('/^(\*['.$symbolsForReference.']+)/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if (preg_match('/(&['.$symbolsForReference.']+)$/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if (preg_match('/(\*['.$symbolsForReference.']+$)/', $line, $matches)) {
+    	return $matches[1];
+    }
+    if (preg_match ('#^\s*<<\s*:\s*(\*[^\s]+).*$#', $line, $matches)) {
+    	return $matches[1];
+    }
     return false;
 
   }
 
   private function addGroup ($line, $group) {
-    if ($group[0] == '&') $this->_containsGroupAnchor = substr ($group, 1);
-    if ($group[0] == '*') $this->_containsGroupAlias = substr ($group, 1);
+    if ($group[0] == '&') {
+    	$this->_containsGroupAnchor = substr ($group, 1);
+    }
+    if ($group[0] == '*') {
+    	$this->_containsGroupAlias = substr ($group, 1);
+    }
     //print_r ($this->path);
   }
 
@@ -1153,9 +1301,15 @@ 
 // The syntax is the following: php Spyc.php spyc.yaml
 
 do {
-  if (PHP_SAPI != 'cli') break;
-  if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) break;
-  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos ($_SERVER['PHP_SELF'], 'Spyc.php') ) break;
+  if (PHP_SAPI != 'cli') {
+  	break;
+  }
+  if (empty ($_SERVER['argc']) || $_SERVER['argc'] < 2) {
+  	break;
+  }
+  if (empty ($_SERVER['PHP_SELF']) || FALSE === strpos ($_SERVER['PHP_SELF'], 'Spyc.php') ) {
+  	break;
+  }
   $file = $argv[1];
   echo json_encode (spyc_load_file ($file));
 } while (0);