Skip to content

Commit 99e25f6

Browse files
Merge branch '2.7' into 2.8
* 2.7: Remove some unused variables, properties and methods [ExpressionLanguage] Fix parse error on 5.3 [HttpKernel] remove noisy frame in controller stack traces [ExpressionLanguage] throw an SyntaxError instead of letting a undefined index notice Fix php doc in Table class bumped Symfony version to 2.7.40 updated VERSION for 2.7.39 update CONTRIBUTORS for 2.7.39 updated CHANGELOG for 2.7.39
2 parents b7b0414 + 183193b commit 99e25f6

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

Parser/TokenStream.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ class TokenStream
3131
*/
3232
private $tokens = array();
3333

34-
/**
35-
* @var bool
36-
*/
37-
private $frozen = false;
38-
3934
/**
4035
* @var Token[]
4136
*/
@@ -49,7 +44,7 @@ class TokenStream
4944
/**
5045
* @var Token|null
5146
*/
52-
private $peeked = null;
47+
private $peeked;
5348

5449
/**
5550
* @var bool
@@ -75,8 +70,6 @@ public function push(Token $token)
7570
*/
7671
public function freeze()
7772
{
78-
$this->frozen = true;
79-
8073
return $this;
8174
}
8275

0 commit comments

Comments
 (0)