Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 0f1cdc3a2312 · 2017-12-08T15:18:43.000+01:00
* 2.8:
  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.8.33
  updated VERSION for 2.8.32
  updated CHANGELOG for 2.8.32
  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
diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/Compiler/AnalyzeServiceReferencesPass.php
@@ -31,7 +31,6 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
 {
     private $graph;
     private $currentDefinition;
-    private $repeatedPass;
     private $onlyConstructorArguments;
     private $lazy;
     private $expressionLanguage;
@@ -49,7 +48,7 @@ public function __construct($onlyConstructorArguments = false)
      */
     public function setRepeatedPass(RepeatedPass $repeatedPass)
     {
-        $this->repeatedPass = $repeatedPass;
+        // no-op for BC
     }
 
     /**
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -23,7 +23,6 @@
  */
 class InlineServiceDefinitionsPass extends AbstractRecursivePass implements RepeatablePassInterface
 {
-    private $repeatedPass;
     private $cloningIds = array();
     private $inlinedServiceIds = array();
 
@@ -32,7 +31,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
      */
     public function setRepeatedPass(RepeatedPass $repeatedPass)
     {
-        $this->repeatedPass = $repeatedPass;
+        // no-op for BC
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe`
`31`	`31`	`{`
`32`	`32`	`private $graph;`
`33`	`33`	`private $currentDefinition;`
`34`		`- private $repeatedPass;`
`35`	`34`	`private $onlyConstructorArguments;`
`36`	`35`	`private $lazy;`
`37`	`36`	`private $expressionLanguage;`
`@@ -49,7 +48,7 @@ public function __construct($onlyConstructorArguments = false)`
`49`	`48`	`*/`
`50`	`49`	`public function setRepeatedPass(RepeatedPass $repeatedPass)`
`51`	`50`	`{`
`52`		`- $this->repeatedPass = $repeatedPass;`
	`51`	`+ // no-op for BC`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`*/`
`24`	`24`	`class InlineServiceDefinitionsPass extends AbstractRecursivePass implements RepeatablePassInterface`
`25`	`25`	`{`
`26`		`- private $repeatedPass;`
`27`	`26`	`private $cloningIds = array();`
`28`	`27`	`private $inlinedServiceIds = array();`
`29`	`28`
`@@ -32,7 +31,7 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe`
`32`	`31`	`*/`
`33`	`32`	`public function setRepeatedPass(RepeatedPass $repeatedPass)`
`34`	`33`	`{`
`35`		`- $this->repeatedPass = $repeatedPass;`
	`34`	`+ // no-op for BC`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`/**`