merged branch TrackIF/master (PR #7149)

fabpot · fabpot · commit 0fb397ccfb95 · 2013-02-22T07:39:07.000+01:00
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7149). Commits ------- 0c25d41 Expanded fault-tolerance for unusual cookie dates Discussion ---------- Expanded fault-tolerance for unusual cookie dates Building on pull #1793, this resolves situations where the Cookie's date field uses a numeric month. Also, expanding on the 7 most typical formats we fall-back to date_create() before throwing an exception. --------------------------------------------------------------------------- by vicb at 2013-02-21T17:30:28Z Please add some unit tests for the new formats. --------------------------------------------------------------------------- by ecaron at 2013-02-21T18:06:46Z Sorry for neglecting the unit tests, they've been updated (2 matching new common date formats, 1 uncommon date format, and changing the existing bad-date check to be more realistically bad.) I also changed from strtotime to date_create to match the existing DateTime::createFromFormat check (although in my cookiejar analysis leading to this pull requests, all the cookies I'd encountered had timezones in them.) I'm using date_create vs. constructing a DateTime so I can immediately rely on the return value. --------------------------------------------------------------------------- by ecaron at 2013-02-21T18:21:03Z @vicb The two Travis failures are against the master branch unrelated to my changes. Should I retarget this pull against 2.3, or what would you advise to get this pull accepted? --------------------------------------------------------------------------- by vicb at 2013-02-21T19:40:59Z The Travis failure come for a bug in PHPUnit (there is a Sf issue for that). There is no 2.3 branch yet (devs happen in master). @fabpot will decide wether this should be considered a a fix (and merge to former releases) or an enhancement which will be merged to 2.3. _(Could you please update the PR header which still refers to strtotime, thanks)_ --------------------------------------------------------------------------- by fabpot at 2013-02-21T21:37:15Z This should probably go into 2.0. Also, do you have a reference where those 7 formats are explained/described? --------------------------------------------------------------------------- by ecaron at 2013-02-21T23:10:38Z @fabpot I couldn't find a reference because the cookies that we're addressing are ones that are behaving outside the spec (at least what I understand from http://curl.haxx.se/rfc/cookie_spec.html), as pull #1793 began to address and this continues. The cases that I've added are ones that I have encountered over the weeks of using BrowserKit and Goutte.
diff --git a/src/Symfony/Component/BrowserKit/Cookie.php b/src/Symfony/Component/BrowserKit/Cookie.php
@@ -30,6 +30,8 @@ class Cookie
         'D, d M Y H:i:s T',
         'D, d-M-y H:i:s T',
         'D, d-M-Y H:i:s T',
+        'D, d-m-y H:i:s T',
+        'D, d-m-Y H:i:s T',
         'D M j G:i:s Y',
         'D M d H:i:s Y T',
     );
@@ -203,6 +205,11 @@ private static function parseDate($dateValue)
             }
         }
 
+        // attempt a fallback for unusual formatting
+        if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {
+            return $date->getTimestamp();
+        }
+
         throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));
     }
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/CookieTest.php b/src/Symfony/Component/BrowserKit/Tests/CookieTest.php
@@ -56,9 +56,12 @@ public function getExpireCookieStrings()
         return array(
             array('foo=bar; expires=Fri, 31-Jul-2020 08:49:37 GMT'),
             array('foo=bar; expires=Fri, 31 Jul 2020 08:49:37 GMT'),
+            array('foo=bar; expires=Fri, 31-07-2020 08:49:37 GMT'),
+            array('foo=bar; expires=Fri, 31-07-20 08:49:37 GMT'),
             array('foo=bar; expires=Friday, 31-Jul-20 08:49:37 GMT'),
             array('foo=bar; expires=Fri Jul 31 08:49:37 2020'),
             array('foo=bar; expires=\'Fri Jul 31 08:49:37 2020\''),
+            array('foo=bar; expires=Friday July 31st 2020, 08:49:37 GMT'),
         );
     }
 
@@ -86,7 +89,7 @@ public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
     public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()
     {
         $this->setExpectedException('InvalidArgumentException');
-        Cookie::FromString('foo=bar; expires=foo');
+        Cookie::FromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');
     }
 
     public function testFromStringThrowsAnExceptionIfUrlIsNotValid()

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ class Cookie`
`30`	`30`	`'D, d M Y H:i:s T',`
`31`	`31`	`'D, d-M-y H:i:s T',`
`32`	`32`	`'D, d-M-Y H:i:s T',`
	`33`	`+ 'D, d-m-y H:i:s T',`
	`34`	`+ 'D, d-m-Y H:i:s T',`
`33`	`35`	`'D M j G:i:s Y',`
`34`	`36`	`'D M d H:i:s Y T',`
`35`	`37`	`);`
`@@ -203,6 +205,11 @@ private static function parseDate($dateValue)`
`203`	`205`	`}`
`204`	`206`	`}`
`205`	`207`
	`208`	`+ // attempt a fallback for unusual formatting`
	`209`	`+ if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {`
	`210`	`+ return $date->getTimestamp();`
	`211`	`+ }`
	`212`	`+`
`206`	`213`	`throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));`
`207`	`214`	`}`
`208`	`215`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,12 @@ public function getExpireCookieStrings()`
`56`	`56`	`return array(`
`57`	`57`	`array('foo=bar; expires=Fri, 31-Jul-2020 08:49:37 GMT'),`
`58`	`58`	`array('foo=bar; expires=Fri, 31 Jul 2020 08:49:37 GMT'),`
	`59`	`+ array('foo=bar; expires=Fri, 31-07-2020 08:49:37 GMT'),`
	`60`	`+ array('foo=bar; expires=Fri, 31-07-20 08:49:37 GMT'),`
`59`	`61`	`array('foo=bar; expires=Friday, 31-Jul-20 08:49:37 GMT'),`
`60`	`62`	`array('foo=bar; expires=Fri Jul 31 08:49:37 2020'),`
`61`	`63`	`array('foo=bar; expires=\'Fri Jul 31 08:49:37 2020\''),`
	`64`	`+ array('foo=bar; expires=Friday July 31st 2020, 08:49:37 GMT'),`
`62`	`65`	`);`
`63`	`66`	`}`
`64`	`67`
`@@ -86,7 +89,7 @@ public function testFromStringThrowsAnExceptionIfCookieIsNotValid()`
`86`	`89`	`public function testFromStringThrowsAnExceptionIfCookieDateIsNotValid()`
`87`	`90`	`{`
`88`	`91`	`$this->setExpectedException('InvalidArgumentException');`
`89`		`- Cookie::FromString('foo=bar; expires=foo');`
	`92`	`+ Cookie::FromString('foo=bar; expires=Flursday July 31st 2020, 08:49:37 GMT');`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`public function testFromStringThrowsAnExceptionIfUrlIsNotValid()`