From eb64cefb9d68b56e4eefc2b044c535ff00ad996c Mon Sep 17 00:00:00 2001
From: Benjamin Bender <bb@riiide.com>
Date: Tue, 12 Mar 2013 14:17:26 +0100
Subject: [PATCH 1/3] Fixes Issue #7342 in TwigBundle

---
 src/Symfony/Bridge/Twig/NodeVisitor/Scope.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
index 4993aed90a808..2a936b8da6371 100644
--- a/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
@@ -32,6 +32,7 @@ class Scope
      */
     public function __construct(Scope $parent = null)
     {
+        $this->data = array();
         $this->parent = $parent;
         $this->left = false;
     }

From fd87e5c9e7b2d3034b0c04454ec740ca4936c13d Mon Sep 17 00:00:00 2001
From: Benjamin Bender <bb@riiide.com>
Date: Tue, 12 Mar 2013 14:50:17 +0100
Subject: [PATCH 2/3] Adds Test for NodeVisitor/Scope instantiation

---
 .../Twig/Tests/NodeVisitor/ScopeTest.php      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php

diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php
new file mode 100644
index 0000000000000..953c822c99deb
--- /dev/null
+++ b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Symfony\Bridge\Twig\Tests\NodeVisitor;
+
+use Symfony\Bridge\Twig\NodeVisitor\Scope;
+use Symfony\Bridge\Twig\Tests\TestCase;
+
+class ScopeTest extends TestCase
+{
+    public function testScopeInitiation()
+    {
+        $scope = new Scope();
+        $scope->enter();
+        $result = $scope->get('test');
+        $scope->leave();
+
+        $this->assertEquals($result, null);
+    }
+}
\ No newline at end of file

From 26f63520e5676de2e8bc824faccd45f01a246412 Mon Sep 17 00:00:00 2001
From: Benjamin Bender <bb@riiide.com>
Date: Tue, 12 Mar 2013 15:55:01 +0100
Subject: [PATCH 3/3] Simplify Test for Scope

---
 src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php
index 953c822c99deb..4111c7e681048 100644
--- a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/ScopeTest.php
@@ -11,9 +11,6 @@ public function testScopeInitiation()
     {
         $scope = new Scope();
         $scope->enter();
-        $result = $scope->get('test');
-        $scope->leave();
-
-        $this->assertEquals($result, null);
+        $this->assertNull($scope->get('test'));
     }
-}
\ No newline at end of file
+}