Skip to content

Commit 338b1d9

Browse files
Merge branch '4.0'
* 4.0: (42 commits) fix merge Remove some unused variables and properties [appveyor] disable memory limit on composer up [HttpFoundation] don't prefix cookies with "Set-Cookie:" Remove some unused variables and properties [HttpFoundation] Fixed default user-agent (3.X -> 4.X) Fix debug:form definition Remove some unused variables, properties and methods fix some edge cases with indented blocks [ExpressionLanguage] Fix parse error on 5.3 [HttpKernel] remove noisy frame in controller stack traces [DI] Force root-namespace for function calls in the dumper container [DI] Fix circular-aliases message register system cache clearer only if it's used doc : Namespace prefix must end with a "\" [ExpressionLanguage] throw an SyntaxError instead of letting a undefined index notice Prevent a loop in aliases within the `findDefinition` method [HttpKernel] Disable inlining on PHP 5 Ensure that inlined services with parameterized class name can be dumped [DI] Fix non-string class handling in PhpDumper ...
2 parents 203661c + 3a56226 commit 338b1d9

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)