fixed a unit test and CS

fabpot · fabpot · commit 9714524b39d6 · 2011-05-19T17:38:16.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -60,13 +60,13 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
         $this->secure = (Boolean) $secure;
         $this->httpOnly = (Boolean) $httpOnly;
     }
-    
+
     public function __toString()
     {
         $str = urlencode($this->getName()).'=';
 
         if ('' === (string) $this->getValue()) {
-            $str .= 'deleted; expires='.gmdate("D, d-M-Y H:i:s T", time()-31536001);
+            $str .= 'deleted; expires='.gmdate("D, d-M-Y H:i:s T", time() - 31536001);
         } else {
             $str .= urlencode($this->getValue());
 
diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
@@ -44,9 +44,7 @@ public function __toString()
             $cookies .= 'Set-Cookie: '.$cookie."\r\n";
         }
 
-        return
-            parent::__toString().
-            $cookies;
+        return parent::__toString().$cookies;
     }
 
     /**
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php b/tests/Symfony/Tests/Component/HttpFoundation/ResponseHeaderBagTest.php
@@ -63,16 +63,16 @@ public function testCacheControlHeader()
         $bag->set('Last-Modified', 'abcde');
         $this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));
     }
-    
+
     public function testToStringIncludesCookieHeaders()
     {
         $bag = new ResponseHeaderBag(array());
         $bag->setCookie(new Cookie('foo', 'bar'));
-        
+
         $this->assertContains("Set-Cookie: foo=bar; path=/; httponly", explode("\r\n", $bag->__toString()));
-        
+
         $bag->clearCookie('foo');
 
-        $this->assertContains("Set-Cookie: foo=deleted; expires=Thu, 01 Jan 1970 00:00:00 GMT; httponly", explode("\r\n", $bag->__toString()));
+        $this->assertContains("Set-Cookie: foo=deleted; expires=".gmdate("D, d-M-Y H:i:s T", time() - 31536001)."; httponly", explode("\r\n", $bag->__toString()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,13 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom`
`60`	`60`	`$this->secure = (Boolean) $secure;`
`61`	`61`	`$this->httpOnly = (Boolean) $httpOnly;`
`62`	`62`	`}`
`63`		`-`
	`63`	`+`
`64`	`64`	`public function __toString()`
`65`	`65`	`{`
`66`	`66`	`$str = urlencode($this->getName()).'=';`
`67`	`67`
`68`	`68`	`if ('' === (string) $this->getValue()) {`
`69`		`- $str .= 'deleted; expires='.gmdate("D, d-M-Y H:i:s T", time()-31536001);`
	`69`	`+ $str .= 'deleted; expires='.gmdate("D, d-M-Y H:i:s T", time() - 31536001);`
`70`	`70`	`} else {`
`71`	`71`	`$str .= urlencode($this->getValue());`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,7 @@ public function __toString()`
`44`	`44`	`$cookies .= 'Set-Cookie: '.$cookie."\r\n";`
`45`	`45`	`}`
`46`	`46`
`47`		`- return`
`48`		`- parent::__toString().`
`49`		`- $cookies;`
	`47`	`+ return parent::__toString().$cookies;`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -63,16 +63,16 @@ public function testCacheControlHeader()`
`63`	`63`	`$bag->set('Last-Modified', 'abcde');`
`64`	`64`	`$this->assertEquals('private, must-revalidate', $bag->get('Cache-Control'));`
`65`	`65`	`}`
`66`		`-`
	`66`	`+`
`67`	`67`	`public function testToStringIncludesCookieHeaders()`
`68`	`68`	`{`
`69`	`69`	`$bag = new ResponseHeaderBag(array());`
`70`	`70`	`$bag->setCookie(new Cookie('foo', 'bar'));`
`71`		`-`
	`71`	`+`
`72`	`72`	`$this->assertContains("Set-Cookie: foo=bar; path=/; httponly", explode("\r\n", $bag->__toString()));`
`73`		`-`
	`73`	`+`
`74`	`74`	`$bag->clearCookie('foo');`
`75`	`75`
`76`		`- $this->assertContains("Set-Cookie: foo=deleted; expires=Thu, 01 Jan 1970 00:00:00 GMT; httponly", explode("\r\n", $bag->__toString()));`
	`76`	`+ $this->assertContains("Set-Cookie: foo=deleted; expires=".gmdate("D, d-M-Y H:i:s T", time() - 31536001)."; httponly", explode("\r\n", $bag->__toString()));`
`77`	`77`	`}`
`78`	`78`	`}`