Skip to content

Commit

Permalink
Merge pull request zendframework#3762 branch 'hotfix/cs'
Browse files Browse the repository at this point in the history
  • Loading branch information
Maks3w committed Feb 13, 2013
2 parents a6a1e23 + 62e7af5 commit eaa36b2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion library/Zend/Debug/Debug.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static function getEscaper()
* @param bool $echo OPTIONAL Echo output if true.
* @return string
*/
public static function dump($var, $label=null, $echo=true)
public static function dump($var, $label = null, $echo = true)
{
// format the label
$label = ($label===null) ? '' : rtrim($label) . ' ';
Expand Down
2 changes: 1 addition & 1 deletion library/Zend/Json/Json.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ protected static function _processXml($simpleXmlElementObject, $ignoreXmlAttribu
* @return mixed - JSON formatted string on success
* @throws \Zend\Json\Exception\RuntimeException if the input not a XML formatted string
*/
public static function fromXml ($xmlStringContents, $ignoreXmlAttributes=true)
public static function fromXml($xmlStringContents, $ignoreXmlAttributes = true)
{
// Load the XML formatted string into a Simple XML Element object.
$simpleXmlElementObject = simplexml_load_string($xmlStringContents);
Expand Down

0 comments on commit eaa36b2

Please sign in to comment.