eserozvataf / scabbia2-yaml

src/Yaml/Inline.php

Doc Comments +3 added lines, -2 removed lines

@@ -85,9 +85,9 @@ 
     /**
      * Parses a scalar to a YAML string
      *
-     * @param scalar $scalar
+     * @param string $scalar
      * @param string $delimiters
-     * @param array  $stringDelimiters
+     * @param string[]  $stringDelimiters
      * @param int    &$i
      * @param bool   $evaluate
      * @param array  $references
@@ -145,6 +145,7 @@ 
      *
      * @param string $scalar
      * @param int    &$i
+     * @param integer $i
      *
      * @throws ParseException When malformed inline YAML string is parsed
      * @return string A YAML string

Indentation +26 added lines, -26 removed lines

@@ -1,31 +1,31 @@
 <?php
 /**
- * Scabbia2 Yaml Component
- * https://github.com/eserozvataf/scabbia2
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
- * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
- * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
- *
- * -------------------------
- * Portions of this code are from Symfony YAML Component under the MIT license.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE-MIT
- * file that was distributed with this source code.
- *
- * Modifications made:
- * - Scabbia Framework code styles applied.
- * - All dump methods are moved under Dumper class.
- * - Redundant classes removed.
- * - Namespace changed.
- * - Tests ported to Scabbia2.
- * - Encoding checks removed.
- */
+     * Scabbia2 Yaml Component
+     * https://github.com/eserozvataf/scabbia2
+     *
+     * For the full copyright and license information, please view the LICENSE
+     * file that was distributed with this source code.
+     *
+     * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
+     * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
+     * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
+     *
+     * -------------------------
+     * Portions of this code are from Symfony YAML Component under the MIT license.
+     *
+     * (c) Fabien Potencier <fabien@symfony.com>
+     *
+     * For the full copyright and license information, please view the LICENSE-MIT
+     * file that was distributed with this source code.
+     *
+     * Modifications made:
+     * - Scabbia Framework code styles applied.
+     * - All dump methods are moved under Dumper class.
+     * - Redundant classes removed.
+     * - Namespace changed.
+     * - Tests ported to Scabbia2.
+     * - Encoding checks removed.
+     */
 
 namespace Scabbia\Yaml;
 

src/Yaml/ParseException.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
     /**
      * Gets the snippet of code near the error
      *
-     * @return string The snippet of code
+     * @return integer|null The snippet of code
      */
     public function getSnippet()
     {

Indentation +26 added lines, -26 removed lines

@@ -1,31 +1,31 @@
 <?php
 /**
- * Scabbia2 Yaml Component
- * https://github.com/eserozvataf/scabbia2
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
- * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
- * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
- *
- * -------------------------
- * Portions of this code are from Symfony YAML Component under the MIT license.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE-MIT
- * file that was distributed with this source code.
- *
- * Modifications made:
- * - Scabbia Framework code styles applied.
- * - All dump methods are moved under Dumper class.
- * - Redundant classes removed.
- * - Namespace changed.
- * - Tests ported to Scabbia2.
- * - Encoding checks removed.
- */
+     * Scabbia2 Yaml Component
+     * https://github.com/eserozvataf/scabbia2
+     *
+     * For the full copyright and license information, please view the LICENSE
+     * file that was distributed with this source code.
+     *
+     * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
+     * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
+     * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
+     *
+     * -------------------------
+     * Portions of this code are from Symfony YAML Component under the MIT license.
+     *
+     * (c) Fabien Potencier <fabien@symfony.com>
+     *
+     * For the full copyright and license information, please view the LICENSE-MIT
+     * file that was distributed with this source code.
+     *
+     * Modifications made:
+     * - Scabbia Framework code styles applied.
+     * - All dump methods are moved under Dumper class.
+     * - Redundant classes removed.
+     * - Namespace changed.
+     * - Tests ported to Scabbia2.
+     * - Encoding checks removed.
+     */
 
 namespace Scabbia\Yaml;
 

src/Yaml/Dumper.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
     {
         // array
         $keys = array_keys($value);
-        $func = function ($v, $w) {
+        $func = function($v, $w) {
             return (int)$v + $w;
         };
 

src/Yaml/Escaper.php

Spacing +9 added lines, -9 removed lines

@@ -53,21 +53,21 @@ 
      * avoids the use of strtr, which performs more slowly
      */
     protected static $escapees = ["\\", "\\\\", "\\\"", "\"",
-                                "\x00",  "\x01",  "\x02",  "\x03",  "\x04",  "\x05",  "\x06",  "\x07",
-                                "\x08",  "\x09",  "\x0a",  "\x0b",  "\x0c",  "\x0d",  "\x0e",  "\x0f",
-                                "\x10",  "\x11",  "\x12",  "\x13",  "\x14",  "\x15",  "\x16",  "\x17",
-                                "\x18",  "\x19",  "\x1a",  "\x1b",  "\x1c",  "\x1d",  "\x1e",  "\x1f",
+                                "\x00", "\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07",
+                                "\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f",
+                                "\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
+                                "\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
                                 "\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9"];
     /**
      * @type array $escaped  Mapping arrays for escaping a double quoted string. The backslash is first to ensure
      * proper escaping because str_replace operates iteratively on the input arrays. This ordering of the characters
      * avoids the use of strtr, which performs more slowly
      */
-    protected static $escaped  = ["\\\\", "\\\"", "\\\\", "\\\"",
-                                "\\0",   "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\a",
-                                "\\b",   "\\t",   "\\n",   "\\v",   "\\f",   "\\r",   "\\x0e", "\\x0f",
+    protected static $escaped = ["\\\\", "\\\"", "\\\\", "\\\"",
+                                "\\0", "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\a",
+                                "\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "\\x0e", "\\x0f",
                                 "\\x10", "\\x11", "\\x12", "\\x13", "\\x14", "\\x15", "\\x16", "\\x17",
-                                "\\x18", "\\x19", "\\x1a", "\\e",   "\\x1c", "\\x1d", "\\x1e", "\\x1f",
+                                "\\x18", "\\x19", "\\x1a", "\\e", "\\x1c", "\\x1d", "\\x1e", "\\x1f",
                                 "\\N", "\\_", "\\L", "\\P"];
 
 
@@ -140,7 +140,7 @@ 
      */
     public function unescapeDoubleQuotedString($value)
     {
-        $callback = function ($match) {
+        $callback = function($match) {
             return $this->unescapeCharacter($match[0]);
         };
 

Indentation +26 added lines, -26 removed lines

@@ -1,31 +1,31 @@
 <?php
 /**
- * Scabbia2 Yaml Component
- * https://github.com/eserozvataf/scabbia2
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
- * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
- * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
- *
- * -------------------------
- * Portions of this code are from Symfony YAML Component under the MIT license.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE-MIT
- * file that was distributed with this source code.
- *
- * Modifications made:
- * - Scabbia Framework code styles applied.
- * - All dump methods are moved under Dumper class.
- * - Redundant classes removed.
- * - Namespace changed.
- * - Tests ported to Scabbia2.
- * - Encoding checks removed.
- */
+     * Scabbia2 Yaml Component
+     * https://github.com/eserozvataf/scabbia2
+     *
+     * For the full copyright and license information, please view the LICENSE
+     * file that was distributed with this source code.
+     *
+     * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
+     * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
+     * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
+     *
+     * -------------------------
+     * Portions of this code are from Symfony YAML Component under the MIT license.
+     *
+     * (c) Fabien Potencier <fabien@symfony.com>
+     *
+     * For the full copyright and license information, please view the LICENSE-MIT
+     * file that was distributed with this source code.
+     *
+     * Modifications made:
+     * - Scabbia Framework code styles applied.
+     * - All dump methods are moved under Dumper class.
+     * - Redundant classes removed.
+     * - Namespace changed.
+     * - Tests ported to Scabbia2.
+     * - Encoding checks removed.
+     */
 
 namespace Scabbia\Yaml;
 

src/Yaml/Parser.php

Indentation +26 added lines, -26 removed lines

@@ -1,31 +1,31 @@
 <?php
 /**
- * Scabbia2 Yaml Component
- * https://github.com/eserozvataf/scabbia2
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
- * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
- * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
- *
- * -------------------------
- * Portions of this code are from Symfony YAML Component under the MIT license.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE-MIT
- * file that was distributed with this source code.
- *
- * Modifications made:
- * - Scabbia Framework code styles applied.
- * - All dump methods are moved under Dumper class.
- * - Redundant classes removed.
- * - Namespace changed.
- * - Tests ported to Scabbia2.
- * - Encoding checks removed.
- */
+     * Scabbia2 Yaml Component
+     * https://github.com/eserozvataf/scabbia2
+     *
+     * For the full copyright and license information, please view the LICENSE
+     * file that was distributed with this source code.
+     *
+     * @link        https://github.com/eserozvataf/scabbia2-yaml for the canonical source repository
+     * @copyright   2010-2016 Eser Ozvataf. (http://eser.ozvataf.com/)
+     * @license     http://www.apache.org/licenses/LICENSE-2.0 - Apache License, Version 2.0
+     *
+     * -------------------------
+     * Portions of this code are from Symfony YAML Component under the MIT license.
+     *
+     * (c) Fabien Potencier <fabien@symfony.com>
+     *
+     * For the full copyright and license information, please view the LICENSE-MIT
+     * file that was distributed with this source code.
+     *
+     * Modifications made:
+     * - Scabbia Framework code styles applied.
+     * - All dump methods are moved under Dumper class.
+     * - Redundant classes removed.
+     * - Namespace changed.
+     * - Tests ported to Scabbia2.
+     * - Encoding checks removed.
+     */
 
 namespace Scabbia\Yaml;
 

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
                     strpos(ltrim($values["value"], " "), "#") === 0) {
                     $c = $this->getRealCurrentLineNb() + 1;
                     $parser = new static($c);
-                    $parser->refs =& $this->refs;
+                    $parser->refs = & $this->refs;
                     $data[] = $parser->parse($this->getNextEmbedBlock(null, true));
                 } else {
                     if (isset($values["leadspaces"])
@@ -137,7 +137,7 @@ 
                         // this is a compact notation element, add to next block and parse
                         $c = $this->getRealCurrentLineNb();
                         $parser = new static($c);
-                        $parser->refs =& $this->refs;
+                        $parser->refs = & $this->refs;
 
                         $block = $values["value"];
                         if ($this->isNextLineIndented()) {
@@ -194,7 +194,7 @@ 
 
                         $c = $this->getRealCurrentLineNb() + 1;
                         $parser = new static($c);
-                        $parser->refs =& $this->refs;
+                        $parser->refs = & $this->refs;
                         $parsed = $parser->parse($value);
 
                         $merged = [];
@@ -241,7 +241,7 @@ 
                     } else {
                         $c = $this->getRealCurrentLineNb() + 1;
                         $parser = new static($c);
-                        $parser->refs =& $this->refs;
+                        $parser->refs = & $this->refs;
                         $data[$key] = $parser->parse($this->getNextEmbedBlock());
                     }
                 } else {

Doc Comments -2 removed lines

@@ -535,8 +535,6 @@
     /**
      * Parses a block scalar
      *
-     * @param string  $separator   The style indicator that was used to begin this block scalar (| or >)
-     * @param string  $indicator   The chomping indicator that was used to begin this block scalar (+ or -)
      * @param int     $indentation The indentation indicator that was used to begin this block scalar
      *
      * @return string  The text value