minor symfony#13594 added deprecation notice for HttpCache::createEsi() (fabpot)

fabpot · fabpot · commit c9d76d6efaa0 · 2015-02-05T07:15:27.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- added deprecation notice for HttpCache::createEsi() | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- f109f95 added deprecation notice for HttpCache::createEsi()
diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
@@ -72,7 +72,7 @@ protected function getOptions()
 
     protected function createSurrogate()
     {
-        return $this->createEsi();
+        return new Esi();
     }
 
     /**
@@ -84,7 +84,9 @@ protected function createSurrogate()
      */
     protected function createEsi()
     {
-        return new Esi();
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use createSurrogate() instead.', E_USER_DEPRECATED);
+
+        return $this->createSurrogate();
     }
 
     protected function createStore()

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ protected function getOptions()`
`72`	`72`
`73`	`73`	`protected function createSurrogate()`
`74`	`74`	`{`
`75`		`- return $this->createEsi();`
	`75`	`+ return new Esi();`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
`@@ -84,7 +84,9 @@ protected function createSurrogate()`
`84`	`84`	`*/`
`85`	`85`	`protected function createEsi()`
`86`	`86`	`{`
`87`		`- return new Esi();`
	`87`	`+ trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use createSurrogate() instead.', E_USER_DEPRECATED);`
	`88`	`+`
	`89`	`+ return $this->createSurrogate();`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`protected function createStore()`