Merge remote-tracking branch 'origin/master'

Asmir Mustafic · Asmir Mustafic · commit 82ecc3689d9e · 2014-01-08T11:49:40.000+01:00
Conflicts:
	composer.json
	lib/Goetas/Xsd/XsdToPhp/Xsd2PhpBase.php
diff --git a/lib/Goetas/Xsd/XsdToPhp/Xsd2PhpBase.php b/lib/Goetas/Xsd/XsdToPhp/Xsd2PhpBase.php
@@ -125,7 +125,6 @@ protected function uniqueTypes(\DOMDocument $dom)
     protected function loadXsd($src)
     {
         $ci = new DOMDocument();
-        var_dump($src);
         if(!@$ci->load($src)){
             throw new \Exception("Can not load/find $src");
         }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,6 @@ protected function uniqueTypes(\DOMDocument $dom)`
`125`	`125`	`protected function loadXsd($src)`
`126`	`126`	`{`
`127`	`127`	`$ci = new DOMDocument();`
`128`		`- var_dump($src);`
`129`	`128`	`if(!@$ci->load($src)){`
`130`	`129`	`throw new \Exception("Can not load/find $src");`
`131`	`130`	`}`