symfony
diff --git a/‎src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+6-6Lines changed: 6 additions & 6 deletions b/‎src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
+6-6Lines changed: 6 additions & 6 deletions
@@ -160,7 +160,11 @@ public function getKernel()
      */
     public function getSurrogate()
     {
-        return $this->getEsi();
+        if (!$this->surrogate instanceof Esi) {
+            throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
+        }
+
+        return $this->surrogate;
     }
 
     /**
@@ -176,11 +180,7 @@ public function getEsi()
     {
         @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);
 
-        if (!$this->surrogate instanceof Esi) {
-            throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
-        }
-
-        return $this->surrogate;
+        return $this->getSurrogate();
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,11 @@ public function getKernel()`
`160`	`160`	`*/`
`161`	`161`	`public function getSurrogate()`
`162`	`162`	`{`
`163`		`- return $this->getEsi();`
	`163`	`+ if (!$this->surrogate instanceof Esi) {`
	`164`	`+ throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');`
	`165`	`+ }`
	`166`	`+`
	`167`	`+ return $this->surrogate;`
`164`	`168`	`}`
`165`	`169`
`166`	`170`	`/**`
`@@ -176,11 +180,7 @@ public function getEsi()`
`176`	`180`	`{`
`177`	`181`	`@trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);`
`178`	`182`
`179`		`- if (!$this->surrogate instanceof Esi) {`
`180`		`- throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');`
`181`		`- }`
`182`		`-`
`183`		`- return $this->surrogate;`
	`183`	`+ return $this->getSurrogate();`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/**`