minor #11531 [HttpKernel][FrameworkBundle] Replaced ESI mentions with SSI when appropriate (pgodel)

fabpot · fabpot · commit 94ff4e999aa7 · 2014-08-01T08:18:37.000+02:00
This PR was merged into the 2.6-dev branch. Discussion ---------- [HttpKernel][FrameworkBundle] Replaced ESI mentions with SSI when appropriate | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 7ee23c1 Replaced ESI mentions with SSI when appropriate
diff --git a/src/Symfony/Component/HttpKernel/Fragment/SsiFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/SsiFragmentRenderer.php
@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\UriSigner;
 
 /**
- * Implements the ESI rendering strategy.
+ * Implements the SSI rendering strategy.
  *
  * @author Sebastian Krebs <krebs.seb@gmail.com>
  */
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -17,7 +17,7 @@
 
 class SsiTest extends \PHPUnit_Framework_TestCase
 {
-    public function testHasSurrogateEsiCapability()
+    public function testHasSurrogateSsiCapability()
     {
         $ssi = new Ssi();
 
@@ -33,7 +33,7 @@ public function testHasSurrogateEsiCapability()
         $this->assertFalse($ssi->hasSurrogateCapability($request));
     }
 
-    public function testAddSurrogateEsiCapability()
+    public function testAddSurrogateSsiCapability()
     {
         $ssi = new Ssi();
 
@@ -58,7 +58,7 @@ public function testAddSurrogateControl()
         $this->assertEquals('', $response->headers->get('Surrogate-Control'));
     }
 
-    public function testNeedsEsiParsing()
+    public function testNeedsSsiParsing()
     {
         $ssi = new Ssi();
 
@@ -117,7 +117,7 @@ public function testProcessEscapesPhpTags()
     /**
      * @expectedException \RuntimeException
      */
-    public function testProcessWhenNoSrcInAnEsi()
+    public function testProcessWhenNoSrcInAnSsi()
     {
         $ssi = new Ssi();
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\HttpKernel\UriSigner;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * Implements the ESI rendering strategy.`
	`19`	`+ * Implements the SSI rendering strategy.`
`20`	`20`	`*`
`21`	`21`	`* @author Sebastian Krebs <[email protected]>`
`22`	`22`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`class SsiTest extends \PHPUnit_Framework_TestCase`
`19`	`19`	`{`
`20`		`- public function testHasSurrogateEsiCapability()`
	`20`	`+ public function testHasSurrogateSsiCapability()`
`21`	`21`	`{`
`22`	`22`	`$ssi = new Ssi();`
`23`	`23`
`@@ -33,7 +33,7 @@ public function testHasSurrogateEsiCapability()`
`33`	`33`	`$this->assertFalse($ssi->hasSurrogateCapability($request));`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function testAddSurrogateEsiCapability()`
	`36`	`+ public function testAddSurrogateSsiCapability()`
`37`	`37`	`{`
`38`	`38`	`$ssi = new Ssi();`
`39`	`39`
`@@ -58,7 +58,7 @@ public function testAddSurrogateControl()`
`58`	`58`	`$this->assertEquals('', $response->headers->get('Surrogate-Control'));`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function testNeedsEsiParsing()`
	`61`	`+ public function testNeedsSsiParsing()`
`62`	`62`	`{`
`63`	`63`	`$ssi = new Ssi();`
`64`	`64`
`@@ -117,7 +117,7 @@ public function testProcessEscapesPhpTags()`
`117`	`117`	`/**`
`118`	`118`	`* @expectedException \RuntimeException`
`119`	`119`	`*/`
`120`		`- public function testProcessWhenNoSrcInAnEsi()`
	`120`	`+ public function testProcessWhenNoSrcInAnSsi()`
`121`	`121`	`{`
`122`	`122`	`$ssi = new Ssi();`
`123`	`123`