10000 Merge branch '2.8' into 3.1 · symfony/symfony@e3e1cce · GitHub
[go: up one dir, main page]
Skip to content

Commit e3e1cce

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.1
* 2.8: [ci] Update travis/appveyor [HttpFoundation] Validate/cast cookie expire time
2 parents d05e9e0 + 41539cf commit e3e1cce

File tree

5 files changed

+28
-13
lines changed

5 files changed

+28
-13
lines changed

‎.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ install:
8585
- if [[ ! $skip && $deps ]]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
8686
- if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
8787
- if [[ ! $skip ]]; then composer update; fi
88-
- if [[ ! $skip ]]; then COMPOSER_ROOT_VERSION= ./phpunit install; fi
88+
- if [[ ! $skip ]]; then ./phpunit install; fi
8989
- if [[ ! $skip && ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
9090

9191
script:
@@ -94,7 +94,7 @@ script:
9494
- if [[ ! $deps && ! $PHP = hhvm* ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi
9595
- if [[ ! $deps && $PHP = hhvm* ]]; then $PHPUNIT --exclude-group benchmark,intl-data; fi
9696
- if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
97-
- if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi
98-
- if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi
97+
- if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY' && echo -e "\\e[33mOK\\e[0m {}" || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1))'; fi
98+
- if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data && echo -e "\\e[33mOK\\e[0m {}" || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1))'; fi
9999
# Test the PhpUnit bridge using the original phpunit script
100100
- if [[ $deps = low ]]; then (cd src/Symfony/Bridge/PhpUnit && phpenv global 5.3 && php --version && composer update && phpunit); fi

‎appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ clone_depth: 1
33
clone_folder: c:\projects\symfony
44

55
cache:
6-
- c:\projects\symfony\composer.phar
6+
- composer.phar
77
- .phpunit -> phpunit
88

99
init:
@@ -44,13 +44,12 @@ install:
4444
- echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
4545
- copy /Y php.ini-max php.ini
4646
- cd c:\projects\symfony
47-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.2.1/composer.phar)
47+
- IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.3.0/composer.phar)
4848
- php composer.phar self-update
4949
- copy /Y .composer\* %APPDATA%\Composer\
5050
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
5151
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5252
- php composer.phar update --no-progress --ansi
53-
- SET COMPOSER_ROOT_VERSION=
5453
- php phpunit install
5554

5655
test_script:

‎phpunit

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/usr/bin/env php
22
<?php
33

4+
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/89cd0aab376105fb34e773e3dff641f68e3f9645
5+
46
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
57
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
68
exit(1);

‎src/Symfony/Component/HttpFoundation/Cookie.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
5858
} elseif (!is_numeric($expire)) {
5959
$expire = strtotime($expire);
6060

61-
if (false === $expire || -1 === $expire) {
61+
if (false === $expire) {
6262
throw new \InvalidArgumentException('The cookie expiration time is not valid.');
6363
}
6464
}
6565

6666
$this->name = $name;
6767
$this->value = $value;
6868
$this->domain = $domain;
69-
$this->expire = $expire;
69+
$this->expire = 0 < $expire ? (int) $expire : 0;
7070
$this->path = empty($path) ? '/' : $path;
7171
$this->secure = (bool) $secure;
7272
$this->httpOnly = (bool) $httpOnly;
@@ -87,7 +87,7 @@ public function __toString()
8787
} else {
8888
$str .= $this->isRaw() ? $this->getValue() : urlencode($this->getValue());
8989

90-
if ($this->getExpiresTime() !== 0) {
90+
if (0 !== $this->getExpiresTime()) {
9191
$str .= '; expires='.gmdate('D, d-M-Y H:i:s T', $this->getExpiresTime());
9292
}
9393
}

‎src/Symfony/Component/HttpFoundation/Tests/CookieTest.php

Lines changed: 18 additions & 4 deletions
57AE
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidChara
5252
*/
5353
public function testInvalidExpiration()
5454
{
55-
$cookie = new Cookie('MyCookie', 'foo', 'bar');
55+
new Cookie('MyCookie', 'foo', 'bar');
56+
}
57+
58+
public function testNegativeExpirationIsNotPossible()
59+
{
60+
$cookie = new Cookie('foo', 'bar', -100);
61+
62+
$this->assertSame(0, $cookie->getExpiresTime());
5663
}
5764

5865
public function testGetValue()
@@ -77,6 +84,13 @@ public function testGetExpiresTime()
7784
$this->assertEquals(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
7885
}
7986

87+
public function testGetExpiresTimeIsCastToInt()
88+
{
89+
$cookie = new Cookie('foo', 'bar', 3600.9);
90+
91+
$this->assertSame(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date as an integer');
92+
}
93+
8094
public function testConstructorWithDateTime()
8195
{
8296
$expire = new \DateTime();
@@ -143,13 +157,13 @@ public function testCookieIsCleared()
143157
public function testToString()
144158
{
145159
$cookie = new Cookie('foo', 'bar', strtotime('Fri, 20-May-2011 15:25:52 GMT'), '/', '.myfoodomain.com', true);
146-
$this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly', $cookie->__toString(), '->__toString() returns string representation of the cookie');
160+
$this->assertEquals('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure; httponly', (string) $cookie, '->__toString() returns string representation of the cookie');
147161

148162
$cookie = new Cookie('foo', null, 1, '/admin/', '.myfoodomain.com');
149-
$this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', $cookie->__toString(), '->__toString() returns string representation of a cleared cookie if value is NULL');
163+
$this->assertEquals('foo=deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; path=/admin/; domain=.myfoodomain.com; httponly', (string) $cookie, '->__toString() returns string representation of a cleared cookie if value is NULL');
150164

151165
$cookie = new Cookie('foo', 'bar', 0, '/', '');
152-
$this->assertEquals('foo=bar; path=/; httponly', $cookie->__toString());
166+
$this->assertEquals('foo=bar; path=/; httponly', (string) $coo 47BA kie);
153167
}
154168

155169
public function testRawCookie()

0 commit comments

Comments
 (0)
0