Merge branch '3.3' into 3.4
* 3.3: 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
This commit is contained in:
Nicolas Grekas
commit
e9e19e7f4d
5
.github/PULL_REQUEST_TEMPLATE.md
vendored
5
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,6 +1,6 @@
|
||||
| Q | A
|
||||
| ------------- | ---
|
||||
| Branch? | master / 2.7, 2.8 or 3.2 <!-- see comment below -->
|
||||
| Branch? | 3.4 or master / 2.7, 2.8, 3.2 or 3.3 <!-- see comment below -->
|
||||
| Bug fix? | yes/no
|
||||
| New feature? | yes/no <!-- don't forget updating src/**/CHANGELOG.md files -->
|
||||
| BC breaks? | yes/no
|
||||
@ -13,7 +13,8 @@
|
||||
<!--
|
||||
- Bug fixes must be submitted against the lowest branch where they apply
|
||||
(lowest branches are regularly merged to upper ones so they get the fixes too).
|
||||
- Features and deprecations must be submitted against the master branch.
|
||||
- Features and deprecations must be submitted against the 3.4,
|
||||
legacy code removals go to the master branch.
|
||||
- Please fill in this template according to the PR you're about to submit.
|
||||
- Replace this comment by a description of what your PR is solving.
|
||||
-->
|
||||
|
||||
10
.travis.yml
10
.travis.yml
@ -83,8 +83,12 @@ before_install:
|
||||
echo extension = ldap.so >> $INI
|
||||
echo extension = redis.so >> $INI
|
||||
echo extension = memcached.so >> $INI
|
||||
[[ $PHP = 5.* ]] && echo extension = mongo.so >> $INI
|
||||
[[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
|
||||
if [[ $PHP = 5.* ]]; then
|
||||
echo extension = mongo.so >> $INI
|
||||
elif [[ $PHP = 7.* ]]; then
|
||||
echo extension = mongodb.so >> $INI
|
||||
fi
|
||||
|
||||
# Matrix lines for intermediate PHP versions are skipped for pull requests
|
||||
if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
|
||||
@ -149,6 +153,10 @@ install:
|
||||
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
|
||||
if [[ ! $skip && $deps ]]; then mv composer.json.phpunit composer.json; fi
|
||||
|
||||
if [[ ! $skip && $PHP = 7.* ]]; then
|
||||
([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
|
||||
fi
|
||||
|
||||
- if [[ ! $skip ]]; then $COMPOSER_UP; fi
|
||||
- if [[ ! $skip ]]; then ./phpunit install; fi
|
||||
- |
|
||||
|
||||
@ -7,6 +7,37 @@ in 3.3 minor versions.
|
||||
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
|
||||
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.3.0...v3.3.1
|
||||
|
||||
* 3.3.0-RC1 (2017-05-17)
|
||||
|
||||
* bug #22715 [FrameworkBundle] remove Security deps from the require section (xabbuh)
|
||||
* bug #22613 [Process] Fix incorrectly calling PHP process when path contains space (maryo)
|
||||
* feature #22680 [DI] Fixing missing "exclude" functionality from PSR4 loader (weaverryan)
|
||||
* bug #22699 [TwigBundle] service workflow.twig_extension should stay public (ogizanagi)
|
||||
* feature #22708 Adding autowire alias for AuthenticationUtils (weaverryan)
|
||||
* bug #22695 [WebServerBundle] fix dependencies (xabbuh)
|
||||
* bug #22647 [VarDumper] Fix dumping of non-nested stubs (nicolas-grekas)
|
||||
* bug #22409 [Yaml] respect inline level when dumping objects as maps (goetas, xabbuh)
|
||||
* bug #22584 [Security] Avoid unnecessary route lookup for empty logout path (ro0NL)
|
||||
* bug #22642 [DX] Making the RegisterControllerArgumentLocatorsPass throw exception on bad types (weaverryan)
|
||||
* bug #22664 [Security] Fix TraceableAccessDecisionManager / DebugAccessDecisionManager BC layer (ogizanagi)
|
||||
* bug #22690 [Console] Fix errors not rethrown even if not handled by console.error listeners (chalasr)
|
||||
* bug #22681 Fixing a bug where abstract classes were wired with the prototype loader (weaverryan)
|
||||
* feature #22665 [DI] Do not throw autowiring exceptions for a service that will be removed (weaverryan)
|
||||
* bug #22669 [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice (ogizanagi)
|
||||
* bug #22676 [FrameworkBundle] Adding the extension XML (flug)
|
||||
* bug #22611 [FrameworkBundle] Fix "Locale class not found" in AboutCommand (rubenrua)
|
||||
* bug #22677 [DI] Fixed index args bug with ResolveNamedArgumentsPass (weaverryan)
|
||||
* bug #22652 [Workflow] Move twig extension registration to twig bundle (ogizanagi)
|
||||
* feature #22668 [FrameworkBundle] KernelTestCase: allow to provide the kernel class with a var (ogizanagi)
|
||||
* bug #22639 [WebLink][TwigBundle] Fix registration of the twig extension (ogizanagi)
|
||||
* bug #22658 Make the exception pages work when the WebProfilerBundle is not installed (javiereguiluz)
|
||||
* bug #22657 [DI] Fix Cannot declare class ...\DefinitionDecorator, because the name is already in use (ogizanagi)
|
||||
* feature #22624 debug:container --types (classes/interfaces) (weaverryan)
|
||||
* bug #22626 Fix missing parenthesis (yceruto)
|
||||
* bug #22621 [Config] Fix resource tracking with new GlobResource (nicolas-grekas)
|
||||
* feature #22385 [DX][FrameworkBundle] Show private aliases in debug:container (chalasr)
|
||||
* bug #22615 [DI] Defaults to public=false in all service config files (nicolas-grekas)
|
||||
|
||||
* 3.3.0-BETA1 (2017-05-01)
|
||||
|
||||
* feature #22530 Making tags under _defaults always apply (weaverryan)
|
||||
|
||||
@ -19,7 +19,7 @@ install:
|
||||
- appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
|
||||
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.5.9-nts-Win32-VC11-x86.zip
|
||||
- 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
|
||||
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x64.zip
|
||||
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
|
||||
- cd ext
|
||||
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-4.0.10-5.5-nts-vc11-x86.zip
|
||||
- 7z x php_apcu-4.0.10-5.5-nts-vc11-x86.zip -y >nul
|
||||
@ -56,7 +56,7 @@ install:
|
||||
|
||||
test_script:
|
||||
- SET X=0
|
||||
- cd c:\php && 7z x php-7.1.3-Win32-VC14-x64.zip -y >nul && copy /Y php.ini-min php.ini
|
||||
- cd c:\php && 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul && copy /Y php.ini-min php.ini
|
||||
- cd c:\projects\symfony
|
||||
- php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
|
||||
- cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini
|
||||
|
||||
@ -992,6 +992,18 @@ table.logs .metadata {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#sidebar:not(:hover):not(.expanded) .label .count {
|
||||
border-radius: 50%;
|
||||
border: 1px solid #eee;
|
||||
height: 8px;
|
||||
min-width: 0;
|
||||
padding: 0;
|
||||
right: 4px;
|
||||
text-indent: -9999px;
|
||||
top: 50%;
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
.visible-small {
|
||||
display: inherit;
|
||||
}
|
||||
|
||||
@ -31,7 +31,11 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
{
|
||||
parent::setUp();
|
||||
|
||||
if (!extension_loaded('mongo') && !extension_loaded('mongodb')) {
|
||||
if (extension_loaded('mongodb')) {
|
||||
if (!class_exists('MongoDB\Client')) {
|
||||
$this->markTestSkipped('The mongodb/mongodb package is required.');
|
||||
}
|
||||
} elseif (!extension_loaded('mongo')) {
|
||||
$this->markTestSkipped('The Mongo or MongoDB extension is required.');
|
||||
}
|
||||
|
||||
@ -107,7 +111,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
|
||||
if (phpversion('mongodb')) {
|
||||
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$gte']);
|
||||
$this->assertGreaterThanOrEqual(round(((int) $criteria[$this->options['expiry_field']]['$gte']) / 1000), $testTimeout);
|
||||
$this->assertGreaterThanOrEqual(round((string) $criteria[$this->options['expiry_field']]['$gte'] / 1000), $testTimeout);
|
||||
} else {
|
||||
$this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$gte']);
|
||||
$this->assertGreaterThanOrEqual($criteria[$this->options['expiry_field']]['$gte']->sec, $testTimeout);
|
||||
@ -165,7 +169,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
$this->assertEquals('bar', $data[$this->options['data_field']]->getData());
|
||||
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['time_field']]);
|
||||
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $data[$this->options['expiry_field']]);
|
||||
$this->assertGreaterThanOrEqual($expectedExpiry, round(((int) $data[$this->options['expiry_field']]) / 1000));
|
||||
$this->assertGreaterThanOrEqual($expectedExpiry, round((string) $data[$this->options['expiry_field']] / 1000));
|
||||
} else {
|
||||
$this->assertEquals('bar', $data[$this->options['data_field']]->bin);
|
||||
$this->assertInstanceOf('MongoDate', $data[$this->options['time_field']]);
|
||||
@ -288,7 +292,7 @@ class MongoDbSessionHandlerTest extends TestCase
|
||||
->will($this->returnCallback(function ($criteria) {
|
||||
if (phpversion('mongodb')) {
|
||||
$this->assertInstanceOf('MongoDB\BSON\UTCDateTime', $criteria[$this->options['expiry_field']]['$lt']);
|
||||
$this->assertGreaterThanOrEqual(time() - 1, round(((int) $criteria[$this->options['expiry_field']]['$lt']) / 1000));
|
||||
$this->assertGreaterThanOrEqual(time() - 1, round((string) $criteria[$this->options['expiry_field']]['$lt'] / 1000));
|
||||
} else {
|
||||
$this->assertInstanceOf('MongoDate', $criteria[$this->options['expiry_field']]['$lt']);
|
||||
$this->assertGreaterThanOrEqual(time() - 1, $criteria[$this->options['expiry_field']]['$lt']->sec);
|
||||
|
||||
Reference in New Issue
Block a user