8000 Merge branch '2.8' into 3.2 · symfony/symfony@f154e67 · GitHub
[go: up one dir, main page]
Skip to content

Commit f154e67

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.2
* 2.8: CI fixes Improved how profiler errors are dispalyed on small screens
2 parents 94871fa + f7b3252 commit f154e67

File tree

5 files changed

+34
-9
lines changed

5 files changed

+34
-9
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | master / 2.7, 2.8 or 3.2 <!-- see comment below -->
3+
| Branch? | 3.4 or master / 2.7, 2.8, 3.2 or 3.3 <!-- see comment below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
66
| BC breaks? | yes/no
@@ -13,7 +13,8 @@
1313
<!--
1414
- Bug fixes must be submitted against the lowest branch where they apply
1515
(lowest branches are regularly merged to upper ones so they get the fixes too).
16-
- Features and deprecations must be submitted against the master branch.
16+
- Features and deprecations must be submitted against the 3.4,
17+
legacy code removals go to the master branch.
1718
- Please fill in this template according to the PR you're about to submit.
1819
- Replace this comment by a description of what your PR is solving.
1920
-->

‎.travis.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,12 @@ before_install:
8181
echo apc.enable_cli = 1 >> $INI
8282
echo extension = ldap.so >> $INI
8383
echo extension = redis.so >> $INI
84-
[[ $PHP = 5.* ]] && echo extension = mongo.so >> $INI
8584
[[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
85+
if [[ $PHP = 5.* ]]; then
86+
echo extension = mongo.so >> $INI
87+
elif [[ $PHP = 7.* ]]; then
88+
echo extension = mongodb.so >> $INI
89+
fi
8690
8791
# Matrix lines for intermediate PHP versions are skipped for pull requests
8892
if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
@@ -148,6 +152,10 @@ install:
148152
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
149153
if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
150154
155+
if [[ ! $skip && $PHP = 7.* ]]; then
156+
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
157+
fi
158+
151159
- if [[ ! $skip ]]; then $COMPOSER_UP; fi
152160
- if [[ ! $skip ]]; then ./phpunit install; fi
153161
- |

‎appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ install:
1919
- appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
2020
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.5.9-nts-Win32-VC11-x86.zip
2121
- 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
22-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x64.zip
22+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
2323
- cd ext
2424
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-4.0.10-5.5-nts-vc11-x86.zip
2525
- 7z x php_apcu-4.0.10-5.5-nts-vc11-x86.zip -y >nul
@@ -56,7 +56,7 @@ install:
5656

5757
test_script:
5858
- SET X=0
59-
- cd c:\php && 7z x php-7.1.3-Win32-VC14-x64.zip -y >nul && copy /Y php.ini-min php.ini
59+
- cd c:\php && 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul && copy /Y php.ini-min php.ini
6060
- cd c:\projects\symfony
6161
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
6262
- cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,18 @@ table.logs .metadata {
978978
display: block;
979979
}
980980

981+
#sidebar:not(:hover):not(.expanded) .label .count {
982+
border-radius: 50%;
983+
border: 1px solid #eee;
984+
height: 8px;
985+
min-width: 0;
986+
padding: 0;
987+
right: 4px;
988+
text-indent: -9999px;
989+
top: 50%;
990+
width: 8px;
991+
}
992+
981993
.visible-small {
982994
display: inherit;
983995
}

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ protected function setUp()
3131
{
3232
parent::setUp();
3333

34-
if (!extension_loaded('mongo') && !extension_loaded('mongodb')) {
34+
if (extension_loaded('mongodb')) {
35+
if (!class_exists('MongoDB\Client')) {
36+
$this->markTestSkipped('The mongodb/mongodb package is required.');
37+
}
38+
} elseif (!extension_loaded('mongo')) {
3539
$this->markTestSkipped('The Mongo or MongoDB extension is required.');
3640
}
3741

@@ -107,7 +111,7 @@ public function testRead()
107111

108112
if (phpversion('mongodb')) {
109113
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$gte']);
110-
$this->assertGreaterThanOrEqual(round(((int) $criteria[$this->options['expiry_field']]['$gte']) / 1000), $testTimeout);
114+
$this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
111115
} else {
112116
$this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$gte']);
113117
$this->assertGreaterThanOrEqual($criteria[$this->options['expiry_field']]['$gte']->sec, $testTimeout);
@@ -165,7 +169,7 @@ public function testWrite()
165169
$this->assertEquals('bar', $data[$this->options['data_field']]->getData());
166170
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
167171
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
168-
$this->assertGreaterThanOrEqual($expectedExpiry, round(((int) $data[$this->options['expiry_field']]) / 1000));
172+
$this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
169173
} else {
170174
$this->assertEquals('bar', $data[$this->options['data_field']]->bin);
171175
$this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
@@ -288,7 +292,7 @@ public function testGc()
288292
->will($this->returnCallback(function ($criteria) {
289293
if (phpversion('mongodb')) {
290294
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$lt']);
291-
$this->assertGreaterThanOrEqual(time() - 1, round(((int) $criteria[$this->options['expiry_field']]['$lt']) / 1000));
295+
4E43 $this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
292296
} else {
293297
$this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$lt']);
294298
$this->assertGreaterThanOrEqual(time() - 1, $criteria[$this->options['expiry_field']]['$lt']->sec);

0 commit comments

Comments
 (0)
0