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 694bd72

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: (44 commits) [FrameworkBundle] Add missing license headers Fix parent serialization of user object [DependencyInjection] fixed typo added condition to avoid skipping tests on JSON_PRETTY support add memcache, memcached, and mongodb extensions to run skipped tests [DependencyInjection] Fixed support for backslashes in service ids. fix #9356 [Security] Logger should manipulate the user reloaded from provider [FrameworkBundle] Added extra details in XMLDescriptor to improve container description fixed CS Crawler default namespace fix [BrowserKit] fixes #8311 CookieJar is totally ignorant of RFC 6265 edge cases [HttpFoundation] fixed constants that do exist in 2.3 (only in 2.4) fix 5528 let ArrayNode::normalizeValue respect order of value array provided fix #7243 allow 0 as arraynode name Fixed issue in BaseDateTimeTransformer when invalid timezone cause Transformation filed exception (closes #9403). BinaryFileResponse should also return 416 or 200 on some range-requets fix deprecated usage and clarify constructor defaults for number formatter Bumping dependency to ProxyManager to allow testing against the new 0.5.x branch changes Do normalization on tag options bumped Symfony version to 2.3.9 ...
2 parents 6a51831 + ef3ae9c commit 694bd72
Copy full SHA for 694bd72

File tree

Expand file treeCollapse file tree

77 files changed

+1142
-185
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

77 files changed

+1142
-185
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ php:
66
- 5.4
77
- 5.5
88

9+
services: mongodb
10+
911
before_script:
1012
- sudo apt-get install parallel
1113
- echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
14+
- echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
1215
- sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
16+
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
17+
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
1318
- COMPOSER_ROOT_VERSION=dev-master composer --prefer-source --dev install
1419

1520
script:

‎CHANGELOG-2.3.md

Copy file name to clipboardExpand all lines: CHANGELOG-2.3.md
+33Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,39 @@ in 2.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/v2.3.0...v2.3.1
99

10+
* 2.3.8 (2013-12-16)
11+
12+
* bug #9758 [Console] fixed TableHelper when cell value has new line (k-przybyszewski)
13+
* bug #9760 [Routing] Fix router matching pattern against multiple hosts (karolsojko)
14+
* bug #9674 [Form] rename validators.ua.xlf to validators.uk.xlf (craue)
15+
* bug #9722 [Validator]Fixed getting wrong msg when value is an object in Exception (aitboudad)
16+
* bug #9750 allow TraceableEventDispatcher to reuse event instance in nested events (evillemez)
17+
* bug #9718 [validator] throw an exception if isn't an instance of ConstraintValidatorInterface. (aitboudad)
18+
* bug #9716 Reset the box model to content-box in the web debug toolbar (stof)
19+
* bug #9711 [FrameworkBundle] Allowed "0" as a checkbox value in php templates (jakzal)
20+
* bug #9665 [Bridge/Doctrine] ORMQueryBuilderLoader - handled the scenario when no entity manager is passed with closure query builder (jakzal)
21+
* bug #9656 [DoctrineBridge] normalized class names in the ORM type guesser (fabpot)
22+
* bug #9647 use the correct class name to retrieve mapped class' metadata and reposi... (xabbuh)
23+
* bug #9648 [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler (fabpot)
24+
* bug #9643 [WebProfilerBundle] Fixed js escaping in time.html.twig (hason)
25+
* bug #9641 [Debug] Avoid notice from being "eaten" by fatal error. (fabpot)
26+
* bug #9639 Modified guessDefaultEscapingStrategy to not escape txt templates (fabpot)
27+
* bug #9314 [Form] Fix DateType for 32bits computers. (WedgeSama)
28+
* bug #9443 [FrameworkBundle] Fixed the registration of validation.xml file when the form is disabled (hason)
29+
* bug #9625 [HttpFoundation] Do not return an empty session id if the session was closed (Taluu)
30+
* bug #9637 [Validator] Replaced inexistent interface (jakzal)
31+
* bug #9605 Adjusting CacheClear Warmup method to namespaced kernels (rdohms)
32+
* bug #9610 Container::camelize also takes backslashes into consideration (ondrejmirtes)
33+
* bug #9447 [BrowserKit] fixed protocol-relative url redirection (jong99)
34+
* bug #9535 No Entity Manager defined exception (armetiz)
35+
* bug #9485 [Acl] Fix for issue #9433 (guilro)
36+
* bug #9516 [AclProvider] Fix incorrect behavior when partial results returned from cache (superdav42)
37+
* bug #9352 [Intl] make currency bundle merge fallback locales when accessing data, ... (shieldo)
38+
* bug #9537 [FrameworkBundle] Fix mistake in translation's service definition. (phpmike)
39+
* bug #9367 [Process] Check if the pipe array is empty before calling stream_select() (jfposton)
40+
* bug #9211 [Form] Fixed memory leak in FormValidator (bschussek)
41+
* bug #9469 [Propel1] re-factor Propel1 ModelChoiceList (havvg)
42+
1043
* 2.3.7 (2013-11-14)
1144

1245
* bug #9499 Request::overrideGlobals() may call invalid ini value (denkiryokuhatsuden)

‎CONTRIBUTORS.md

Copy file name to clipboardExpand all lines: CONTRIBUTORS.md
+13-9Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Symfony2 is the result of the work of many people who made the code better
5858
- Bart van den Burg (burgov)
5959
- Antoine Hérault (herzult)
6060
- Toni Uebernickel (havvg)
61-
- Michel Weimerskirch (mweimerskirch)
6261
- Christian Raue
62+
- Michel Weimerskirch (mweimerskirch)
6363
- Arnaud Le Blanc (arnaud-lb)
6464
- marc.weistroff
6565
- Brice BERNARD (brikou)
@@ -68,10 +68,10 @@ Symfony2 is the result of the work of many people who made the code better
6868
- Włodzimierz Gajda (gajdaw)
6969
- Colin Frei
7070
- excelwebzone
71+
- Wouter De Jong (wouterj)
7172
- Kevin Bond (kbond)
7273
- Fabien Pennequin (fabienpennequin)
7374
- Jacob Dreesen (jdreesen)
74-
- Wouter De Jong (wouterj)
7575
- Adrien Brault (adrienbrault)
7676
- Michal Piotrowski (eventhorizon)
7777
- Robert Schönthal (digitalkaoz)
@@ -94,6 +94,7 @@ Symfony2 is the result of the work of many people who made the code better
9494
- Amal Raghav (kertz)
9595
- Jonathan Ingram (jonathaningram)
9696
- Artur Kotyrba
97+
- Ait Boudad Abdellatif (aitboudad)
9798
- Pablo Godel (pgodel)
9899
- Sebastiaan Stok (sstok)
99100
- Dmitrii Chekaliuk (lazyhammer)
@@ -113,7 +114,6 @@ Symfony2 is the result of the work of many people who made the code better
113114
- Guilherme Blanco (guilhermeblanco)
114115
- Martin Schuhfuß (usefulthink)
115116
- Thomas Rabaix (rande)
116-
- Ait Boudad Abdellatif (aitboudad)
117117
- Matthieu Bontemps (mbontemps)
118118
- Pierre Minnieur (pminnieur)
119119
- fivestar
@@ -141,6 +141,7 @@ Symfony2 is the result of the work of many people who made the code better
141141
- Alif Rachmawadi
142142
- Joseph Rouff (rouffj)
143143
- Félix Labrecque (woodspire)
144+
- Christian Flothmann (xabbuh)
144145
- GordonsLondon
145146
- Jan Sorgalla (jsor)
146147
- Ray
@@ -160,15 +161,16 @@ Symfony2 is the result of the work of many people who made the code better
160161
- Florian Klein (docteurklein)
161162
- Matthias Pigulla (mpdude)
162163
- Manuel Kiessling (manuelkiessling)
163-
- Christian Flothmann (xabbuh)
164164
- Bertrand Zuchuat (garfield-fr)
165+
- Gabor Toth (tgabi333)
165166
- Thomas Tourlourat (armetiz)
166167
- Andrey Esaulov (andremaha)
167168
- Grégoire Passault (gregwar)
168169
- Uwe Jäger (uwej711)
169170
- Aurelijus Valeiša (aurelijus)
170171
- Gustavo Piltcher
171172
- Stepan Tanasiychuk (stfalcon)
173+
- Luis Cordova (cordoval)
172174
- Bob den Otter (bopp)
173175
- Adrian Rudnik (kreischweide)
174176
- Francesc Rosàs (frosas)
@@ -182,6 +184,7 @@ Symfony2 is the result of the work of many people who made the code better
182184
- Vitaliy Zakharov (zakharovvi)
183185
- Gyula Sallai (salla)
184186
- Michele Orselli (orso)
187+
- Christian Gärtner (dagardner)
185188
- Tom Van Looy (tvlooy)
186189
- Peter Kruithof (pkruithof)
187190
- Felix Labrecque
@@ -196,7 +199,6 @@ Symfony2 is the result of the work of many people who made the code better
196199
- Atsuhiro KUBO (iteman)
197200
- sun (sun)
198201
- Lars Strojny
199-
- Gabor Toth (tgabi333)
200202
- Costin Bereveanu (schniper)
201203
- realmfoo
202204
- Tamas Szijarto
@@ -209,7 +211,6 @@ Symfony2 is the result of the work of many people who made the code better
209211
- Kai
210212
- Xavier HAUSHERR
211213
- Albert Jessurum (ajessu)
212-
- Luis Cordova (cordoval)
213214
- Laszlo Korte
214215
- Tiago Ribeiro (fixe)
215216
- Alessandro Desantis
@@ -235,7 +236,6 @@ Symfony2 is the result of the work of many people who made the code better
235236
- Olivier Dolbeau (odolbeau)
236237
- alquerci
237238
- vagrant
238-
- Christian Gärtner (dagardner)
239239
- Asier Illarramendi (doup)
240240
- Christoph Mewes (xrstf)
241241
- Vitaliy Tverdokhlib (vitaliytv)
@@ -276,6 +276,7 @@ Symfony2 is the result of the work of many people who made the code better
276276
- sasezaki
277277
- Denis Gorbachev (starfall)
278278
- Steven Surowiec
279+
- giulio de donato (liuggio)
279280
- Marek Kalnik (marekkalnik)
280281
- Chris Smith
281282
- Anthon Pang
@@ -406,7 +407,6 @@ Symfony2 is the result of the work of many people who made the code better
406407
- Timothée Barray (tyx)
407408
- Christian Morgan
408409
- Alexander Miehe (engerim)
409-
- giulio de donato (liuggio)
410410
- Titouan Galopin (tgalopin)
411411
- Don Pinkster
412412
- Maksim Muruev
@@ -419,6 +419,7 @@ Symfony2 is the result of the work of many people who made the code better
419419
- Arno Geurts
420420
- Adán Lobato (adanlobato)
421421
- Maks
422+
- Gábor Tóth
422423
- Daniel Cestari
423424
- Magnus Nordlander (magnusnordlander)
424425
- Mikhail Yurasov (mym)
@@ -575,6 +576,7 @@ Symfony2 is the result of the work of many people who made the code better
575576
- Rick Prent
576577
- Martin Eckhardt
577578
- Michael Dowling (mtdowling)
579+
- Nicolas Grekas (nicolas-grekas)
578580
- BilgeXA
579581
- Robert Queck
580582
- mlively
@@ -746,6 +748,7 @@ Symfony2 is the result of the work of many people who made the code better
746748
- Yorkie Chadwick (yorkie76)
747749
- Yanick Witschi
748750
- Ondrej Mirtes
751+
- Youpie
749752
- srsbiz
750753
- Nicolas A. Bérard-Nault
751754
- Gladhon
@@ -791,7 +794,6 @@ Symfony2 is the result of the work of many people who made the code better
791794
- Kaipi Yann
792795
- Sam Williams
793796
- James Michael DuPont
794-
- Gábor Tóth
795797
- Tammy D
796798
- Ondrej Slinták
797799
- vlechemin
@@ -800,8 +802,10 @@ Symfony2 is the result of the work of many people who made the code better
800802
- mieszko4
801803
- datibbaw
802804
- Norbert Orzechowicz
805+
- Markus Staab
803806
- Pierre-Louis LAUNAY
804807
- djama
808+
- Eduardo Conceição
805809
- Jon Cave
806810
- Sébastien HOUZE
807811
- Abdulkadir N. A.

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"monolog/monolog": "~1.3",
7474
"propel/propel1": "1.6.*",
7575
"ircmaxell/password-compat": "1.0.*",
76-
"ocramius/proxy-manager": ">=0.3.1,<0.5-dev"
76+
"ocramius/proxy-manager": ">=0.3.1,<0.6-dev"
7777
},
7878
"autoload": {
7979
"psr-0": { "Symfony\\": "src/" },

‎src/Symfony/Bridge/ProxyManager/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=5.3.3",
2020
"symfony/dependency-injection": "~2.3",
21-
"ocramius/proxy-manager": ">=0.3.1,<0.5-dev"
21+
"ocramius/proxy-manager": ">=0.3.1,<0.6-dev"
2222
},
2323
"autoload": {
2424
"psr-0": {

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
413

514
if (!defined('JSON_PRETTY_PRINT')) {

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
413

514
use Symfony\Component\DependencyInjection\Alias;

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+10-1Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
413

514
use Symfony\Component\Console\Helper\TableHelper;
@@ -242,7 +251,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
242251
$description[] = '<comment>Tags</comment>';
243252
foreach ($tags as $tagName => $tagData) {
244253
foreach ($tagData as $parameters) {
245-
$description[] = sprintf(' - %-30s (%s)', $tagName, implode(', ', array_map(function($key, $value) {
254+
$description[] = sprintf(' - %-30s (%s)', $tagName, implode(', ', array_map(function ($key, $value) {
246255
return sprintf('<info>%s</info>: %s', $key, $value);
247256
}, array_keys($parameters), array_values($parameters))));
248257
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
+26-1Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\FrameworkBundle\Console\Descriptor;
413

514
use Symfony\Component\DependencyInjection\Alias;
@@ -293,9 +302,25 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
293302
}
294303

295304
$serviceXML->setAttribute('class', $definition->getClass());
305+
306+
if ($definition->getFactoryClass()) {
307+
$serviceXML->setAttribute('factory-class', $definition->getFactoryClass());
308+
}
309+
310+
if ($definition->getFactoryService()) {
311+
$serviceXML->setAttribute('factory-service', $definition->getFactoryService());
312+
}
313+
314+
if ($definition->getFactoryMethod()) {
315+
$serviceXML->setAttribute('factory-method', $definition->getFactoryMethod());
316+
}
317+
296318
$serviceXML->setAttribute('scope', $definition->getScope());
297319
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
298320
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
321+
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
322+
$serviceXML->setAttribute('synchronized', $definition->isSynchronized() ? 'true' : 'false');
323+
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
299324
$serviceXML->setAttribute('file', $definition->getFile());
300325

301326
if (!$omitTags) {
@@ -310,7 +335,7 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
310335
foreach ($parameters as $name => $value) {
311336
$tagXML->appendChild($parameterXML = $dom->createElement('parameter'));
312337
$parameterXML->setAttribute('name', $name);
313-
$parameterXML->textContent = $value;
338+
$parameterXML->appendChild(new \DOMText($this->formatParameter($value)));
314339
}
315340
}
316341
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php
+9Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\FrameworkBundle\Console\Helper;
413

514
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\JsonDescriptor;

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/JsonDescriptorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/JsonDescriptorTest.php
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ class JsonDescriptorTest extends AbstractDescriptorTest
1717
{
1818
protected function setUp()
1919
{
20-
$this->markTestSkipped('Test skipped on PHP 5.3 as JSON_PRETTY_PRINT does not exist.');
20+
if (version_compare(phpversion(), '5.4.0', '<')) {
21+
$this->markTestSkipped('Test skipped on PHP 5.3 as JSON_PRETTY_PRINT does not exist.');
22+
}
2123
}
2224

2325
protected function getDescriptor()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.