Skip to content

Commit 81c50d6

Browse files
Merge branch '2.3' into 2.7
* 2.3: [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill add readme files where missing Don't use reflections when possible [Form] Update form tests after the ICU data update [Intl] Update tests and the number formatter to match behaviour of the intl extension [Intl] Update the ICU data to version 55 [Intl] Fix the update-data.php script in preparation for ICU 5.5 Use constant instead of function call. fixed test name automatically generate safe fallback filename Conflicts: src/Symfony/Component/Debug/Debug.php src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
2 parents a1dc071 + 6d5dbf7 commit 81c50d6

File tree

661 files changed

+2166
-4094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

661 files changed

+2166
-4094
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"doctrine/common": "~2.4",
2121
"paragonie/random_compat": "~1.0",
2222
"symfony/polyfill-apcu": "~1.1",
23+
"symfony/polyfill-mbstring": "~1.1",
2324
"twig/twig": "~1.23|~2.0",
2425
"psr/log": "~1.0"
2526
},

src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ public function testChoicesForValuesOptimization()
796796

797797
$this->persist(array($entity1, $entity2));
798798

799-
$field = $this->factory->createNamed('name', 'Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
799+
$field = $this->factory->createNamed('name', 'entity', null, array(
800800
'em' => 'default',
801801
'class' => self::SINGLE_IDENT_CLASS,
802802
'choice_label' => 'name',
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Swiftmailer Bridge
2+
==================
3+
4+
Provides integration for [Swiftmailer](http://swiftmailer.org/) into the
5+
Symfony web development toolbar.
6+
7+
Resources
8+
---------
9+
10+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
11+
* [Report issues](https://github.com/symfony/symfony/issues) and
12+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
13+
in the [main Symfony repository](https://github.com/symfony/symfony)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FrameworkBundle
2+
===============
3+
4+
Resources
5+
---------
6+
7+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
8+
* [Report issues](https://github.com/symfony/symfony/issues) and
9+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
10+
in the [main Symfony repository](https://github.com/symfony/symfony)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SecurityBundle
2+
==============
3+
4+
Resources
5+
---------
6+
7+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
8+
* [Report issues](https://github.com/symfony/symfony/issues) and
9+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
10+
in the [main Symfony repository](https://github.com/symfony/symfony)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
TwigBundle
2+
==========
3+
4+
Resources
5+
---------
6+
7+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
8+
* [Report issues](https://github.com/symfony/symfony/issues) and
9+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
10+
in the [main Symfony repository](https://github.com/symfony/symfony)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
WebProfilerBundle
2+
=================
3+
4+
Resources
5+
---------
6+
7+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
8+
* [Report issues](https://github.com/symfony/symfony/issues) and
9+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
10+
in the [main Symfony repository](https://github.com/symfony/symfony)

src/Symfony/Component/Debug/Debug.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static function enable($errorReportingLevel = null, $displayErrors = true
4545
error_reporting(-1);
4646
}
4747

48-
if ('cli' !== php_sapi_name()) {
48+
if ('cli' !== PHP_SAPI) {
4949
ini_set('display_errors', 0);
5050
ExceptionHandler::register();
5151
} elseif ($displayErrors && (!ini_get('log_errors') || ini_get('error_log'))) {

src/Symfony/Component/DependencyInjection/Container.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,8 @@ public function initialized($id)
356356
public function getServiceIds()
357357
{
358358
$ids = array();
359-
$r = new \ReflectionClass($this);
360-
foreach ($r->getMethods() as $method) {
361-
if (preg_match('/^get(.+)Service$/', $method->name, $match)) {
359+
foreach (get_class_methods($this) as $method) {
360+
if (preg_match('/^get(.+)Service$/', $method, $match)) {
362361
$ids[] = self::underscore($match[1]);
363362
}
364363
}

src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
156156
$this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
157157
}
158158

159-
public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToNotCopy()
159+
public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
160160
{
161161
$sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
162162
$targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';

0 commit comments

Comments
 (0)