bug #16970 [HttpKernel] HttpCache: remove an ESI instance checking (voronkovich)

Tobion · Tobion · commit 605e13310be5 · 2015-12-12T01:04:47.000+01:00
This PR was merged into the 3.0 branch. Discussion ---------- [HttpKernel] HttpCache: remove an ESI instance checking | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | no | License | MIT | Doc PR | no This checking was added by this commit 32d964b, but now it's not needed Commits ------- 7528134 Removed ESI instance check
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -153,16 +153,10 @@ public function getKernel()
     /**
      * Gets the Surrogate instance.
      *
-     * @throws \LogicException
-     *
      * @return SurrogateInterface A Surrogate instance
      */
     public function getSurrogate()
     {
-        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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -153,16 +153,10 @@ public function getKernel()`
`153`	`153`	`/**`
`154`	`154`	`* Gets the Surrogate instance.`
`155`	`155`	`*`
`156`		`- * @throws \LogicException`
`157`		`- *`
`158`	`156`	`* @return SurrogateInterface A Surrogate instance`
`159`	`157`	`*/`
`160`	`158`	`public function getSurrogate()`
`161`	`159`	`{`
`162`		`- if (!$this->surrogate instanceof Esi) {`
`163`		`- throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');`
`164`		`- }`
`165`		`-`
`166`	`160`	`return $this->surrogate;`
`167`	`161`	`}`
`168`	`162`