brki
diff --git a/‎src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php
Lines changed: 16 additions & 4 deletions b/‎src/Symfony/Component/HttpKernel/Event/FilterControllerEvent.php
Lines changed: 16 additions & 4 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Exception/FlattenException.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/Exception/FlattenException.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Yaml/Inline.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Yaml/Inline.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/Symfony/Tests/Component/HttpKernel/DataCollector/LoggerDataCollectorTest.php
Lines changed: 1 addition & 1 deletion b/‎tests/Symfony/Tests/Component/HttpKernel/DataCollector/LoggerDataCollectorTest.php
Lines changed: 1 addition & 1 deletion
@@ -94,7 +94,7 @@ private function sanitizeContext($context)
         }
 
         if (is_resource($context)) {
-            return 'Resource';
+            return sprintf('Resource(%s)', get_resource_type($context));
         }
 
         if (is_object($context)) {
 
@@ -68,7 +68,7 @@ public function setController($controller)
     private function varToString($var)
     {
         if (is_object($var)) {
-            return sprintf('[object](%s)', get_class($var));
+            return sprintf('Object(%s)', get_class($var));
         }
 
         if (is_array($var)) {
@@ -77,13 +77,25 @@ private function varToString($var)
                 $a[] = sprintf('%s => %s', $k, $this->varToString($v));
             }
 
-            return sprintf("[array](%s)", implode(', ', $a));
+            return sprintf("Array(%s)", implode(', ', $a));
         }
 
         if (is_resource($var)) {
-            return '[resource]';
+            return sprintf('Resource(%s)', get_resource_type($var));
         }
 
-        return str_replace("\n", '', var_export((string) $var, true));
+        if (null === $var) {
+            return 'null';
+        }
+
+        if (false === $var) {
+            return 'false';
+        }
+
+        if (true === $var) {
+            return 'true';
+        }
+
+        return (string) $var;
     }
 }
@@ -182,7 +182,7 @@ private function flattenArgs($args)
             } elseif (is_bool($value)) {
                 $result[$key] = array('boolean', $value);
             } elseif (is_resource($value)) {
-                $result[$key] = array('resource', '');
+                $result[$key] = array('resource', get_resource_type($value));
             } else {
                 $result[$key] = array('string', (string) $value);
             }
 
@@ -73,7 +73,7 @@ static public function dump($value)
     {
         switch (true) {
             case is_resource($value):
-                throw new DumpException('Unable to dump PHP resources in a YAML file.');
+                throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
             case is_object($value):
                 return '!!php/object:'.serialize($value);
             case is_array($value):
 
@@ -46,7 +46,7 @@ public function getCollectTestData()
             array(
                 1,
                 array(array('message' => 'foo', 'context' => array('foo' => fopen(__FILE__, 'r')))),
-                array(array('message' => 'foo', 'context' => array('foo' => 'Resource'))),
+                array(array('message' => 'foo', 'context' => array('foo' => 'Resource(stream)'))),
             ),
             array(
                 1,
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function sanitizeContext($context)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if (is_resource($context)) {`
`97`		`- return 'Resource';`
	`97`	`+ return sprintf('Resource(%s)', get_resource_type($context));`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (is_object($context)) {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function setController($controller)`
`68`	`68`	`private function varToString($var)`
`69`	`69`	`{`
`70`	`70`	`if (is_object($var)) {`
`71`		`- return sprintf('[object](%s)', get_class($var));`
	`71`	`+ return sprintf('Object(%s)', get_class($var));`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if (is_array($var)) {`
`@@ -77,13 +77,25 @@ private function varToString($var)`
`77`	`77`	`$a[] = sprintf('%s => %s', $k, $this->varToString($v));`
`78`	`78`	`}`
`79`	`79`
`80`		`- return sprintf("[array](%s)", implode(', ', $a));`
	`80`	`+ return sprintf("Array(%s)", implode(', ', $a));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`if (is_resource($var)) {`
`84`		`- return '[resource]';`
	`84`	`+ return sprintf('Resource(%s)', get_resource_type($var));`
`85`	`85`	`}`
`86`	`86`
`87`		`- return str_replace("\n", '', var_export((string) $var, true));`
	`87`	`+ if (null === $var) {`
	`88`	`+ return 'null';`
	`89`	`+ }`
	`90`	`+`
	`91`	`+ if (false === $var) {`
	`92`	`+ return 'false';`
	`93`	`+ }`
	`94`	`+`
	`95`	`+ if (true === $var) {`
	`96`	`+ return 'true';`
	`97`	`+ }`
	`98`	`+`
	`99`	`+ return (string) $var;`
`88`	`100`	`}`
`89`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private function flattenArgs($args)`
`182`	`182`	`} elseif (is_bool($value)) {`
`183`	`183`	`$result[$key] = array('boolean', $value);`
`184`	`184`	`} elseif (is_resource($value)) {`
`185`		`- $result[$key] = array('resource', '');`
	`185`	`+ $result[$key] = array('resource', get_resource_type($value));`
`186`	`186`	`} else {`
`187`	`187`	`$result[$key] = array('string', (string) $value);`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ static public function dump($value)`
`73`	`73`	`{`
`74`	`74`	`switch (true) {`
`75`	`75`	`case is_resource($value):`
`76`		`- throw new DumpException('Unable to dump PHP resources in a YAML file.');`
	`76`	`+ throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));`
`77`	`77`	`case is_object($value):`
`78`	`78`	`return '!!php/object:'.serialize($value);`
`79`	`79`	`case is_array($value):`