Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1fcc7c5

Browse files
fabpotfabpot
committed
Merge branch '2.4'
* 2.4: [HttpKernel] fixed regression introduced in 2.4 in the base DataCollector class. Added more unit tests coverage for the RequestDataCollector object. Fixed mistake in upgrade docu bumped Symfony version to 2.4.0 updated VERSION for 2.4.0-RC1 updated CHANGELOG for 2.4.0-RC1 Container::camelize also takes backslashes into consideration fixed typos fixed @ExpectedException class names Fix an issue when overriding Client::setServerParameters() and using the getContainer() method in it. fixed some typos fixed @ExpectedException class names Typo and better wording for german validator translation
2 parents 4aab341 + 990267f commit 1fcc7c5

File tree

48 files changed

+146
-102
lines changed

Some content is hidden

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

48 files changed

+146
-102
lines changed

‎CHANGELOG-2.4.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,44 @@ in 2.4 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.4.0...v2.4.1
99

10+
* 2.4.0-RC1 (2013-11-25)
11+
12+
* bug #9607 [HttpKernel] Fix a bug when using the kernel property in overridden method Client::setServerParameters() (gnutix)
13+
* bug #9597 [Security] Typos in Security's ExpressionLanguage (ovrflo)
14+
* feature #9587 [SecurityBundle] Added csrf_token_generator and csrf_token_id as new (shieldo)
15+
* feature #9578 [DomCrawler] Fixes `attr` method returning empty string for missing attributes (aik099)
16+
* bug #9565 [Debug] Fixed ClassNotFoundFatalErrorHandler which could cause a fatal error (jakzal)
17+
* bug #9525 Cache Warmup Breaks Namespaced Kernel (rdohms)
18+
* bug #9447 [BrowserKit] fixed protocol-relative url redirection (jong99)
19+
* bug #9535 No Entity Manager defined exception (armetiz)
20+
* bug #9485 [Acl] Fix for issue #9433 (guilro)
21+
* bug #9516 [AclProvider] Fix incorrect behavior when partial results returned from cache (superdav42)
22+
* feature #9546 [FrameworkBundle] use the new request_stack service in the GlobalVariables object (hhamon)
23+
* bug #9566 [Console] Revert BC-break for verbose option value (chEbba)
24+
* bug #9553 [FrameworkBundle] use the new request_stack service to get the Request object in the base Controller class (hhamon)
25+
* feature #9541 [Translation] make IdentityTranslater consistent with normal translator (Tobion)
26+
* bug #9536 [FrameworkBundle] Update 2 dependencies (currently broken) (asm89)
27+
* bug #9352 [Intl] make currency bundle merge fallback locales when accessing data, ... (shieldo)
28+
* bug #9537 [FrameworkBundle] Fix mistake in translation's service definition. (phpmike)
29+
* bug #9529 [ExpressionLanguage] Fixed conflict between punctation and range (WouterJ)
30+
* bug #9367 [Process] Check if the pipe array is empty before calling stream_select() (jfposton)
31+
* bug #9211 [Form] Fixed memory leak in FormValidator (bschussek)
32+
* bug #9469 [Propel1] re-factor Propel1 ModelChoiceList (havvg)
33+
* bug #9499 Request::overrideGlobals() may call invalid ini value (denkiryokuhatsuden)
34+
* feature #9494 made Router implement RequestMatcherInterface (fabpot)
35+
* bug #9420 [Console][ProgressHelper] Fix ProgressHelper redraw when redrawFreq is greater than 1 (giosh94mhz)
36+
* bug #9212 [Validator] Force Luhn Validator to only work with strings (Richtermeister)
37+
* bug #9476 Fixed bug with lazy services (peterrehm)
38+
* bug #9461 set mergeFallback to true, (ychadwick)
39+
* bug #9451 Fix bug with variable named context to securityContext (mieszko4)
40+
* feature #9434 moved logic for the session listeners into the HttpKernel component (fabpot)
41+
* bug #9431 [DependencyInjection] fixed YamlDumper did not make services private. (realityking)
42+
* bug #9332 [Config] Quoting reserved characters (WouterJ)
43+
* bug #9416 fixed issue with clone now the children of the original form are preserved and the clone form is given new children (yjv)
44+
* bug #9423 [Form] fix CsrfProviderAdapter (Tobion)
45+
* feature #9342 Add X-Debug-Url profiler url header (adrienbrault)
46+
* bug #9412 [HttpFoundation] added content length header to BinaryFileResponse (kbond)
47+
1048
* 2.4.0-BETA2 (2013-10-30)
1149

1250
* bug #9408 [Form] Fixed failing FormDataExtractorTest (bschussek)

‎UPGRADE-2.3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Form
137137

138138
```
139139
$form = $factory->create('form');
140-
$form->add($factory->createNamed('field', 'text', array(
140+
$form->add($factory->createNamed('field', 'text', array(), array(
141141
'auto_initialize' => false,
142142
)));
143143
```
@@ -276,4 +276,4 @@ BrowserKit
276276

277277
If you were using responses with Location header and non-3xx Status Code,
278278
you have to update your code to manually create another request to URL
279-
grabbed from the Location header.
279+
grabbed from the Location header.

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public function testAssociatedCompositeEntity()
358358
public function testDedicatedEntityManagerNullObject()
359359
{
360360
$uniqueFields = array('name');
361-
$entityManagerName = 'foo';
361+
$entityManagerName = 'foo';
362362

363363
$registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
364364

‎src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function testExists()
5252
}
5353

5454
/**
55-
* @expectedException Twig_Error_Loader
55+
* @expectedException \Twig_Error_Loader
5656
*/
5757
public function testTwigErrorIfLocatorThrowsInvalid()
5858
{
@@ -76,7 +76,7 @@ public function testTwigErrorIfLocatorThrowsInvalid()
7676
}
7777

7878
/**
79-
* @expectedException Twig_Error_Loader
79+
* @expectedException \Twig_Error_Loader
8080
*/
8181
public function testTwigErrorIfLocatorReturnsFalse()
8282
{

‎src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function getFixNamespaceDeclarationsDataWithoutTokenizer()
189189
}
190190

191191
/**
192-
* @expectedException InvalidArgumentException
192+
* @expectedException \InvalidArgumentException
193193
*/
194194
public function testUnableToLoadClassException()
195195
{

‎src/Symfony/Component/Config/Tests/Loader/LoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testResolve()
4343
}
4444

4545
/**
46-
* @expectedException Symfony\Component\Config\Exception\FileLoaderLoadException
46+
* @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException
4747
*/
4848
public function testResolveWhenResolverCannotFindLoader()
4949
{

‎src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleStackTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function testPopNotLast()
5959
}
6060

6161
/**
62-
* @expectedException InvalidArgumentException
62+
* @expectedException \InvalidArgumentException
6363
*/
6464
public function testInvalidPop()
6565
{

‎src/Symfony/Component/DependencyInjection/Container.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ public function isScopeActive($name)
525525
*/
526526
public static function camelize($id)
527527
{
528-
return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ '))), array(' ' => ''));
528+
return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ ', '\\' => '_ '))), array(' ' => ''));
529529
}
530530

531531
/**

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ public function testMerge()
449449

450450
/**
451451
* @covers Symfony\Component\DependencyInjection\ContainerBuilder::merge
452-
* @expectedException LogicException
452+
* @expectedException \LogicException
453453
*/
454454
public function testMergeLogicException()
455455
{
@@ -649,7 +649,7 @@ public function testPrivateServiceUser()
649649
}
650650

651651
/**
652-
* @expectedException BadMethodCallException
652+
* @expectedException \BadMethodCallException
653653
*/
654654
public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
655655
{
@@ -661,7 +661,7 @@ public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
661661
}
662662

663663
/**
664-
* @expectedException BadMethodCallException
664+
* @expectedException \BadMethodCallException
665665
*/
666666
public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()
667667
{
@@ -728,7 +728,7 @@ public function testSynchronizedServiceWithScopes()
728728
}
729729

730730
/**
731-
* @expectedException BadMethodCallException
731+
* @expectedException \BadMethodCallException
732732
*/
733733
public function testThrowsExceptionWhenSetDefinitionOnAFrozenContainer()
734734
{

‎src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function dataForTestCamelize()
5151
array('.foo', '_Foo'),
5252
array('foo_', 'Foo'),
5353
array('foo.', 'Foo_'),
54+
array('foo\bar', 'Foo_Bar'),
5455
);
5556
}
5657

0 commit comments

Comments
 (0)