Merge

htdocs/includes/symfony/var-dumper/Tests/Fixtures/FooInterface.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+interface FooInterface
+{
+	/**
+	 * Hello.
+	 */
+	public function foo();
+}

htdocs/includes/symfony/var-dumper/Tests/Fixtures/NotLoadableClass.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class NotLoadableClass extends NotLoadableClass
+{
+}

htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php

@@ -1,34 +1,38 @@
 <?php
 
 /* foo.twig */
-class __TwigTemplate_VarDumperFixture_u75a09 extends Twig_Template
+class __TwigTemplate_VarDumperFixture_u75a09 extends Twig\Template
 {
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
+	private $path;
 
-        $this->parent = false;
+	public function __construct(Twig\Environment $env = null, $path = null)
+	{
+		if (null !== $env) {
+			parent::__construct($env);
+		}
+		$this->parent = false;
+		$this->blocks = array();
+		$this->path = $path;
+	}
 
-        $this->blocks = array(
-        );
-    }
+	protected function doDisplay(array $context, array $blocks = array())
+	{
+		// line 2
+		throw new \Exception('Foobar');
+	}
 
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 2
-        throw new \Exception('Foobar');
-    }
+	public function getTemplateName()
+	{
+		return 'foo.twig';
+	}
 
-    public function getTemplateName()
-    {
-        return 'foo.twig';
-    }
+	public function getDebugInfo()
+	{
+		return array(20 => 1, 21 => 2);
+	}
 
-    public function getDebugInfo()
-    {
-        return array (19 => 2);
-    }
+	public function getSourceContext()
+	{
+		return new Twig\Source("   foo bar\n     twig source\n\n", 'foo.twig', $this->path ?: __FILE__);
+	}
 }
-/* foo bar*/
-/*     twig source*/
-/* */

htdocs/includes/symfony/var-dumper/Tests/Fixtures/xml_reader.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foo>
+    <bar></bar>
+    <bar />
+    <bar>With text</bar>
+    <bar foo="bar" baz="fubar"></bar>
+    <bar xmlns:baz="http://symfony.com">
+        <baz:baz></baz:baz>
+    </bar>
+</foo>