Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 31f74ca

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4'
* 3.4: typo CI fixes Improved how profiler errors are dispalyed on small screens bumped Symfony version to 3.3.0 updated VERSION for 3.3.0-RC1 updated CHANGELOG for 3.3.0-RC1
2 parents 8514e22 + e9e19e7 commit 31f74ca
Copy full SHA for 31f74ca

File tree

5 files changed

+59
-7
lines changed
Filter options

5 files changed

+59
-7
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Copy file name to clipboardExpand all lines: .github/PULL_REQUEST_TEMPLATE.md
+3-2Lines 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

Copy file name to clipboardExpand all lines: .travis.yml
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ before_install:
7777
echo extension = ldap.so >> $INI
7878
echo extension = redis.so >> $INI
7979
echo extension = memcached.so >> $INI
80-
#echo extension = mongodb.so >> $INI
80+
echo extension = mongodb.so >> $INI
8181
8282
# Matrix lines for intermediate PHP versions are skipped for pull requests
8383
if [[ ! $deps && ! $PHP = $MIN_PHP && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
@@ -139,6 +139,10 @@ install:
139139
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
140140
if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
141141
142+
if [[ ! $skip ]]; then
143+
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
144+
fi
145+
142146
- if [[ ! $skip ]]; then $COMPOSER_UP; fi
143147
- if [[ ! $skip ]]; then ./phpunit install; fi
144148
- |

‎CHANGELOG-3.3.md

Copy file name to clipboardExpand all lines: CHANGELOG-3.3.md
+31Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,37 @@ in 3.3 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.3.0...v3.3.1
99

10+
* 3.3.0-RC1 (2017-05-17)
11+
12+
* bug #22715 [FrameworkBundle] remove Security deps from the require section (xabbuh)
13+
* bug #22613 [Process] Fix incorrectly calling PHP process when path contains space (maryo)
14+
* feature #22680 [DI] Fixing missing "exclude" functionality from PSR4 loader (weaverryan)
15+
* bug #22699 [TwigBundle] service workflow.twig_extension should stay public (ogizanagi)
16+
* feature #22708 Adding autowire alias for AuthenticationUtils (weaverryan)
17+
* bug #22695 [WebServerBundle] fix dependencies (xabbuh)
18+
* bug #22647 [VarDumper] Fix dumping of non-nested stubs (nicolas-grekas)
19+
* bug #22409 [Yaml] respect inline level when dumping objects as maps (goetas, xabbuh)
20+
* bug #22584 [Security] Avoid unnecessary route lookup for empty logout path (ro0NL)
21+
* bug #22642 [DX] Making the RegisterControllerArgumentLocatorsPass throw exception on bad types (weaverryan)
22+
* bug #22664 [Security] Fix TraceableAccessDecisionManager / DebugAccessDecisionManager BC layer (ogizanagi)
23+
* bug #22690 [Console] Fix errors not rethrown even if not handled by console.error listeners (chalasr)
24+
* bug #22681 Fixing a bug where abstract classes were wired with the prototype loader (weaverryan)
25+
* feature #22665 [DI] Do not throw autowiring exceptions for a service that will be removed (weaverryan)
26+
* bug #22669 [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice (ogizanagi)
27+
* bug #22676 [FrameworkBundle] Adding the extension XML (flug)
28+
* bug #22611 [FrameworkBundle] Fix "Locale class not found" in AboutCommand (rubenrua)
29+
* bug #22677 [DI] Fixed index args bug with ResolveNamedArgumentsPass (weaverryan)
30+
* bug #22652 [Workflow] Move twig extension registration to twig bundle (ogizanagi)
31+
* feature #22668 [FrameworkBundle] KernelTestCase: allow to provide the kernel class with a var (ogizanagi)
32+
* bug #22639 [WebLink][TwigBundle] Fix registration of the twig extension (ogizanagi)
33+
* bug #22658 Make the exception pages work when the WebProfilerBundle is not installed (javiereguiluz)
34+
* bug #22657 [DI] Fix Cannot declare class ...\DefinitionDecorator, because the name is already in use (ogizanagi)
35+
* feature #22624 debug:container --types (classes/interfaces) (weaverryan)
36+
* bug #22626 Fix missing parenthesis (yceruto)
37+
* bug #22621 [Config] Fix resource tracking with new GlobResource (nicolas-grekas)
38+
* feature #22385 [DX][FrameworkBundle] Show private aliases in debug:container (chalasr)
39+
* bug #22615 [DI] Defaults to public=false in all service config files (nicolas-grekas)
40+
1041
* 3.3.0-BETA1 (2017-05-01)
1142

1243
* feature #22530 Making tags under _defaults always apply (weaverryan)

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler.css.twig
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,18 @@ table.logs .metadata {
992992
display: block;
993993
}
994994

995+
#sidebar:not(:hover):not(.expanded) .label .count {
996+
border-radius: 50%;
997+
border: 1px solid #eee;
998+
height: 8px;
999+
min-width: 0;
1000+
padding: 0;
1001+
right: 4px;
1002+
text-indent: -9999px;
1003+
top: 50%;
1004+
width: 8px;
1005+
}
1006+
9951007
.visible-small {
9961008
display: inherit;
9971009
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+8-4Lines 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+
$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)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.