tidal
diff --git a/‎src/Symfony/Components/OutputEscaper/Escaper.php
Copy file name to clipboardExpand all lines: src/Symfony/Components/OutputEscaper/Escaper.php
+13-9Lines changed: 13 additions & 9 deletions b/‎src/Symfony/Components/OutputEscaper/Escaper.php
Copy file name to clipboardExpand all lines: src/Symfony/Components/OutputEscaper/Escaper.php
+13-9Lines changed: 13 additions & 9 deletions
@@ -127,26 +127,28 @@ static public function escape($escaper, $value)
 
         return $copy;
       }
-      elseif (self::isClassMarkedAsSafe(get_class($value)))
+
+      if (self::isClassMarkedAsSafe(get_class($value)))
       {
         // the class or one of its children is marked as safe
         // return the unescaped object
         return $value;
       }
-      elseif ($value instanceof SafeDecorator)
+
+      if ($value instanceof SafeDecorator)
       {
         // do not escape objects marked as safe
         // return the original object
         return $value->getValue();
       }
-      elseif ($value instanceof \Traversable)
+
+      if ($value instanceof \Traversable)
       {
         return new IteratorDecorator($escaper, $value);
       }
-      else
-      {
-        return new ObjectDecorator($escaper, $value);
-      }
+
+      return new ObjectDecorator($escaper, $value);
+
     }
 
     // it must be a resource; cannot escape that.
@@ -173,7 +175,8 @@ static public function unescape($value)
     {
       return html_entity_decode($value, ENT_QUOTES, self::$charset);
     }
-    elseif (is_array($value))
+
+    if (is_array($value))
     {
       foreach ($value as $name => $v)
       {
@@ -182,7 +185,8 @@ static public function unescape($value)
 
       return $value;
     }
-    elseif (is_object($value))
+
+    if (is_object($value))
     {
       return $value instanceof Escaper ? $value->getRawValue() : $value;
     }
Original file line number	Diff line number	Diff line change
`@@ -127,26 +127,28 @@ static public function escape($escaper, $value)`
`127`	`127`
`128`	`128`	`return $copy;`
`129`	`129`	`}`
`130`		`- elseif (self::isClassMarkedAsSafe(get_class($value)))`
	`130`	`+`
	`131`	`+ if (self::isClassMarkedAsSafe(get_class($value)))`
`131`	`132`	`{`
`132`	`133`	`// the class or one of its children is marked as safe`
`133`	`134`	`// return the unescaped object`
`134`	`135`	`return $value;`
`135`	`136`	`}`
`136`		`- elseif ($value instanceof SafeDecorator)`
	`137`	`+`
	`138`	`+ if ($value instanceof SafeDecorator)`
`137`	`139`	`{`
`138`	`140`	`// do not escape objects marked as safe`
`139`	`141`	`// return the original object`
`140`	`142`	`return $value->getValue();`
`141`	`143`	`}`
`142`		`- elseif ($value instanceof \Traversable)`
	`144`	`+`
	`145`	`+ if ($value instanceof \Traversable)`
`143`	`146`	`{`
`144`	`147`	`return new IteratorDecorator($escaper, $value);`
`145`	`148`	`}`
`146`		`- else`
`147`		`- {`
`148`		`- return new ObjectDecorator($escaper, $value);`
`149`		`- }`
	`149`	`+`
	`150`	`+ return new ObjectDecorator($escaper, $value);`
	`151`	`+`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`// it must be a resource; cannot escape that.`
`@@ -173,7 +175,8 @@ static public function unescape($value)`
`173`	`175`	`{`
`174`	`176`	`return html_entity_decode($value, ENT_QUOTES, self::$charset);`
`175`	`177`	`}`
`176`		`- elseif (is_array($value))`
	`178`	`+`
	`179`	`+ if (is_array($value))`
`177`	`180`	`{`
`178`	`181`	`foreach ($value as $name => $v)`
`179`	`182`	`{`
`@@ -182,7 +185,8 @@ static public function unescape($value)`
`182`	`185`
`183`	`186`	`return $value;`
`184`	`187`	`}`
`185`		`- elseif (is_object($value))`
	`188`	`+`
	`189`	`+ if (is_object($value))`
`186`	`190`	`{`
`187`	`191`	`return $value instanceof Escaper ? $value->getRawValue() : $value;`
`188`	`192`	`}`