diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.4'

Browse Source 
* 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
This commit is contained in:
Fabien Potencier 2013-11-26 17:42:52 +01:00
commit 1fcc7c50e1
48 changed files with 145 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CHANGELOG-2.4.md
View File

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

4
UPGRADE-2.3.md
View File

@ -137,7 +137,7 @@ Form
```
$form = $factory->create('form');
$form->add($factory->createNamed('field', 'text', array(
$form->add($factory->createNamed('field', 'text', array(), array(
'auto_initialize' => false,
)));
```
@ -276,4 +276,4 @@ BrowserKit
If you were using responses with Location header and non-3xx Status Code,
you have to update your code to manually create another request to URL
grabbed from the Location header.
grabbed from the Location header.

2
src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueValidatorTest.php
View File

@ -358,7 +358,7 @@ class UniqueValidatorTest extends \PHPUnit_Framework_TestCase
public function testDedicatedEntityManagerNullObject()
{
$uniqueFields = array('name');
$entityManagerName = 'foo';
$entityManagerName = 'foo';
$registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');

4
src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
View File

@ -52,7 +52,7 @@ class FilesystemLoaderTest extends TestCase
}
/**
* @expectedException Twig_Error_Loader
* @expectedException \Twig_Error_Loader
*/
public function testTwigErrorIfLocatorThrowsInvalid()
{
@ -76,7 +76,7 @@ class FilesystemLoaderTest extends TestCase
}
/**
* @expectedException Twig_Error_Loader
* @expectedException \Twig_Error_Loader
*/
public function testTwigErrorIfLocatorReturnsFalse()
{

2
src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
View File

@ -189,7 +189,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testUnableToLoadClassException()
{

2
src/Symfony/Component/Config/Tests/Loader/LoaderTest.php
View File

@ -43,7 +43,7 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Config\Exception\FileLoaderLoadException
* @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException
*/
public function testResolveWhenResolverCannotFindLoader()
{

2
src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleStackTest.php
View File

@ -59,7 +59,7 @@ class OutputFormatterStyleStackTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testInvalidPop()
{

2
src/Symfony/Component/DependencyInjection/Container.php
View File

@ -525,7 +525,7 @@ class Container implements IntrospectableContainerInterface
*/
public static function camelize($id)
{
return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ '))), array(' ' => ''));
return strtr(ucwords(strtr($id, array('_' => ' ', '.' => '_ ', '\\' => '_ '))), array(' ' => ''));
}
/**

8
src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View File

@ -449,7 +449,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
/**
* @covers Symfony\Component\DependencyInjection\ContainerBuilder::merge
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testMergeLogicException()
{
@ -649,7 +649,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException BadMethodCallException
* @expectedException \BadMethodCallException
*/
public function testThrowsExceptionWhenSetServiceOnAFrozenContainer()
{
@ -661,7 +661,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException BadMethodCallException
* @expectedException \BadMethodCallException
*/
public function testThrowsExceptionWhenAddServiceOnAFrozenContainer()
{
@ -728,7 +728,7 @@ class ContainerBuilderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException BadMethodCallException
* @expectedException \BadMethodCallException
*/
public function testThrowsExceptionWhenSetDefinitionOnAFrozenContainer()
{

1
src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
View File

@ -51,6 +51,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
array('.foo', '_Foo'),
array('foo_', 'Foo'),
array('foo.', 'Foo_'),
array('foo\bar', 'Foo_Bar'),
);
}

4
src/Symfony/Component/DependencyInjection/Tests/DefinitionDecoratorTest.php
View File

@ -81,7 +81,7 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testReplaceArgumentShouldRequireIntegerIndex()
{
@ -106,7 +106,7 @@ class DefinitionDecoratorTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException OutOfBoundsException
* @expectedException \OutOfBoundsException
*/
public function testGetArgumentShouldCheckBounds()
{

4
src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
View File

@ -275,7 +275,7 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException OutOfBoundsException
* @expectedException \OutOfBoundsException
*/
public function testGetArgumentShouldCheckBounds()
{
@ -286,7 +286,7 @@ class DefinitionTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException OutOfBoundsException
* @expectedException \OutOfBoundsException
*/
public function testReplaceArgumentShouldCheckBounds()
{

4
src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
View File

@ -81,7 +81,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testExportParameters()
{
@ -121,7 +121,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
* @expectedExceptionMessage Service id "bar$" cannot be converted to a valid PHP method name.
*/
public function testAddServiceInvalidServiceId()

2
src/Symfony/Component/Finder/Expression/Expression.php
View File

@ -130,7 +130,7 @@ class Expression implements ValueInterface
public function getGlob()
{
if (self::TYPE_GLOB !== $this->value->getType()) {
throw new \LogicException('Regex cant be transformed to glob.');
throw new \LogicException('Regex can\'t be transformed to glob.');
}
return $this->value;

4
src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
View File

@ -38,7 +38,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider invalidNames
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
* @covers Symfony\Component\HttpFoundation\Cookie::__construct
*/
public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidCharacters($name)
@ -47,7 +47,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testInvalidExpiration()
{

18
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -669,18 +669,18 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$request->initialize(array('foo' => 'bar'));
$this->assertEquals('', $request->getHost(), '->getHost() return empty string if not initialized');
$request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.exemple.com'));
$this->assertEquals('www.exemple.com', $request->getHost(), '->getHost() from Host Header');
$request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.example.com'));
$this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header');
// Host header with port number
$request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.exemple.com:8080'));
$this->assertEquals('www.exemple.com', $request->getHost(), '->getHost() from Host Header with port number');
$request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.example.com:8080'));
$this->assertEquals('www.example.com', $request->getHost(), '->getHost() from Host Header with port number');
// Server values
$request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.exemple.com'));
$this->assertEquals('www.exemple.com', $request->getHost(), '->getHost() from server name');
$request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.example.com'));
$this->assertEquals('www.example.com', $request->getHost(), '->getHost() from server name');
$request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.exemple.com', 'HTTP_HOST' => 'www.host.com'));
$request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.example.com', 'HTTP_HOST' => 'www.host.com'));
$this->assertEquals('www.host.com', $request->getHost(), '->getHost() value from Host header has priority over SERVER_NAME ');
}
@ -739,7 +739,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testGetHostWithFakeHttpHostValue()
{
@ -896,7 +896,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
* @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
*/
public function testGetContentCantBeCalledTwiceWithResources($first, $second)

2
src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
View File

@ -724,7 +724,7 @@ class ResponseTest extends ResponseTestCase
}
/**
* @expectedException UnexpectedValueException
* @expectedException \UnexpectedValueException
* @dataProvider invalidContentProvider
*/
public function testSetContentInvalid($content)

4
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
View File

@ -49,7 +49,7 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testConstructorShouldThrowExceptionForInvalidMongo()
{
@ -57,7 +57,7 @@ class MongoDbSessionHandlerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testConstructorShouldThrowExceptionForMissingOptions()
{

2
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
View File

@ -97,7 +97,7 @@ class MockArraySessionStorageTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testUnstartedSave()
{

2
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
View File

@ -107,7 +107,7 @@ class MockFileSessionStorageTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testSaveWithoutStart()
{

5
src/Symfony/Component/HttpKernel/Client.php
View File

@ -43,10 +43,11 @@ class Client extends BaseClient
*/
public function __construct(HttpKernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null)
{
parent::__construct($server, $history, $cookieJar);
// These class properties must be set before calling the parent constructor, as it may depend on it.
$this->kernel = $kernel;
$this->followRedirects = false;
parent::__construct($server, $history, $cookieJar);
}
/**

2
src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
View File

@ -53,6 +53,6 @@ abstract class DataCollector implements DataCollectorInterface, \Serializable
$this->valueExporter = new ValueExporter();
}
$this->valueExporter->exportValue($var);
return $this->valueExporter->exportValue($var);
}
}

34
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
View File

@ -31,21 +31,23 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase
$c->collect($request, $response);
$this->assertSame('request',$c->getName());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag',$c->getRequestHeaders());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag',$c->getRequestServer());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag',$c->getRequestCookies());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag',$c->getRequestAttributes());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag',$c->getRequestRequest());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag',$c->getRequestQuery());
$this->assertEquals('html',$c->getFormat());
$this->assertEquals(array(),$c->getSessionAttributes());
$this->assertEquals('en',$c->getLocale());
$this->assertSame('request', $c->getName());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag', $c->getRequestHeaders());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestServer());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestCookies());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestAttributes());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestRequest());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\ParameterBag', $c->getRequestQuery());
$this->assertSame('html', $c->getFormat());
$this->assertSame('foobar', $c->getRoute());
$this->assertSame(array('name' => 'foo'), $c->getRouteParams());
$this->assertSame(array(), $c->getSessionAttributes());
$this->assertSame('en', $c->getLocale());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag',$c->getResponseHeaders());
$this->assertEquals('OK',$c->getStatusText());
$this->assertEquals(200,$c->getStatusCode());
$this->assertEquals('application/json',$c->getContentType());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\HeaderBag', $c->getResponseHeaders());
$this->assertSame('OK', $c->getStatusText());
$this->assertSame(200, $c->getStatusCode());
$this->assertSame('application/json', $c->getContentType());
}
/**
@ -138,7 +140,7 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase
foreach ($controllerTests as $controllerTest) {
$this->injectController($c, $controllerTest[1], $request);
$c->collect($request, $response);
$this->assertEquals($controllerTest[2], $c->getController(), sprintf('Testing: %s', $controllerTest[0]));
$this->assertSame($controllerTest[2], $c->getController(), sprintf('Testing: %s', $controllerTest[0]));
}
}
@ -150,6 +152,8 @@ class RequestDataCollectorTest extends \PHPUnit_Framework_TestCase
$request = Request::create('http://test.com/foo?bar=baz');
$request->attributes->set('foo', 'bar');
$request->attributes->set('_route', 'foobar');
$request->attributes->set('_route_params', array('name' => 'foo'));
$response = new Response();
$response->setStatusCode(200);

4
src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
View File

@ -42,7 +42,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testRenderWithUnknownRenderer()
{
@ -52,7 +52,7 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
* @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).
*/
public function testDeliverWithUnsuccessfulResponse()

4
src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
View File

@ -126,7 +126,7 @@ class EsiTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testProcessWhenNoSrcInAnEsi()
{
@ -166,7 +166,7 @@ class EsiTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testHandleWhenResponseIsNot200()
{

8
src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
View File

@ -24,7 +24,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
class HttpKernelTest extends \PHPUnit_Framework_TestCase
{
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testHandleWhenControllerThrowsAnExceptionAndRawIsTrue()
{
@ -34,7 +34,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testHandleWhenControllerThrowsAnExceptionAndRawIsFalseAndNoListenerIsRegistered()
{
@ -136,7 +136,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testHandleWhenTheControllerIsNotACallable()
{
@ -188,7 +188,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testHandleWhenTheControllerDoesNotReturnAResponse()
{

6
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -621,7 +621,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Process\Exception\LogicException
* @expectedException \Symfony\Component\Process\Exception\LogicException
*/
public function testSignalProcessNotRunning()
{
@ -641,7 +641,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testSignalWithWrongIntSignal()
{
@ -655,7 +655,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testSignalWithWrongNonIntSignal()
{

10
src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
View File

@ -94,7 +94,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testGetPidIsNullBeforeStart()
{
@ -102,7 +102,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testGetPidIsNullAfterRun()
{
@ -110,7 +110,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testExitCodeText()
{
@ -145,7 +145,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testSignal()
{
@ -153,7 +153,7 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testProcessWithoutTermSignalIsNotSignaled()
{

10
src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
View File

@ -46,7 +46,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testGetPid()
{
@ -54,7 +54,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testGetPidIsNullBeforeStart()
{
@ -62,7 +62,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testGetPidIsNullAfterRun()
{
@ -78,7 +78,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testSignal()
{
@ -86,7 +86,7 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testProcessWithoutTermSignalIsNotSignaled()
{

6
src/Symfony/Component/Process/Tests/SimpleProcessTest.php
View File

@ -104,7 +104,7 @@ class SimpleProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\LogicException
* @expectedException \Symfony\Component\Process\Exception\LogicException
*/
public function testSignalProcessNotRunning()
{
@ -113,7 +113,7 @@ class SimpleProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testSignalWithWrongIntSignal()
{
@ -122,7 +122,7 @@ class SimpleProcessTest extends AbstractProcessTest
}
/**
* @expectedException Symfony\Component\Process\Exception\RuntimeException
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testSignalWithWrongNonIntSignal()
{

2
src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
View File

@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
class AuthenticationProviderManagerTest extends \PHPUnit_Framework_TestCase
{
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testAuthenticateWithoutProviders()
{

2
src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememerMeTokenTest.php
View File

@ -53,7 +53,7 @@ class RememberMeTokenTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException PHPUnit_Framework_Error
* @expectedException \PHPUnit_Framework_Error
* @dataProvider getUserArguments
*/
public function testConstructorUserCannotBeNull($user)

2
src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
View File

@ -28,7 +28,7 @@ class UsernamePasswordTokenTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testSetAuthenticatedToTrue()
{

2
src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
View File

@ -47,7 +47,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testSetVotersEmpty()
{

2
src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
View File

@ -46,7 +46,7 @@ class BasePasswordEncoderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testMergePasswordAndSaltWithException()
{

2
src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
View File

@ -35,7 +35,7 @@ class MessageDigestPasswordEncoderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testEncodePasswordAlgorithmDoesNotExist()
{

2
src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
View File

@ -35,7 +35,7 @@ class Pbkdf2PasswordEncoderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testEncodePasswordAlgorithmDoesNotExist()
{

2
src/Symfony/Component/Security/Core/Tests/User/InMemoryProviderTest.php
View File

@ -42,7 +42,7 @@ class InMemoryUserProviderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testCreateUserAlreadyExist()
{

2
src/Symfony/Component/Security/Core/Tests/User/UserTest.php
View File

@ -17,7 +17,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
{
/**
* @covers Symfony\Component\Security\Core\User\User::__construct
* @expectedException InvalidArgumentException
* @expectedException \InvalidArgumentException
*/
public function testConstructorException()
{

2
src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
View File

@ -122,7 +122,7 @@ class LogoutListenerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testSuccessHandlerReturnsNonResponse()
{

2
src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
View File

@ -57,7 +57,7 @@ class X509AuthenticationListenerTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException Symfony\Component\Security\Core\Exception\BadCredentialsException
* @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
*/
public function testGetPreAuthenticatedDataNoUser()
{

2
src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
View File

@ -53,7 +53,7 @@ class XmlEncoderTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException UnexpectedValueException
* @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
* @expectedExceptionMessage Document types are not allowed.
*/
public function testDocTypeIsNotAllowed()

4
src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
View File

@ -125,7 +125,7 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testAddFallbackCatalogueWithCircularReference()
{
@ -137,7 +137,7 @@ class MessageCatalogueTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException LogicException
* @expectedException \LogicException
*/
public function testAddCatalogueWhenLocaleIsNotTheSameAsTheCurrentOne()
{

2
src/Symfony/Component/Translation/Tests/TranslatorTest.php
View File

@ -141,7 +141,7 @@ class TranslatorTest extends \PHPUnit_Framework_TestCase
}
/**
* @expectedException RuntimeException
* @expectedException \RuntimeException
*/
public function testWhenAResourceHasNoRegisteredLoader()
{

8
src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
View File

@ -248,7 +248,7 @@
</trans-unit>
<trans-unit id="65">
<source>This value should be equal to {{ compared_value }}.</source>
<target>Dieser Wert sollte übereinstimmen mit {{ compared_value }}.</target>
<target>Dieser Wert sollte gleich {{ compared_value }} sein.</target>
</trans-unit>
<trans-unit id="66">
<source>This value should be greater than {{ compared_value }}.</source>
@ -256,7 +256,7 @@
</trans-unit>
<trans-unit id="67">
<source>This value should be greater than or equal to {{ compared_value }}.</source>
<target>Dieser Wert sollte größer sein oder übereinstimmen mit {{ compared_value }}.</target>
<target>Dieser Wert sollte größer oder gleich {{ compared_value }} sein.</target>
</trans-unit>
<trans-unit id="68">
<source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source>
@ -268,7 +268,7 @@
</trans-unit>
<trans-unit id="70">
<source>This value should be less than or equal to {{ compared_value }}.</source>
<target>Dieser Wert sollte kleiner sein oder übereinstimmen mit {{ compared_value }}.</target>
<target>Dieser Wert sollte kleiner oder gleich {{ compared_value }} sein.</target>
</trans-unit>
<trans-unit id="71">
<source>This value should not be equal to {{ compared_value }}.</source>
@ -276,7 +276,7 @@
</trans-unit>
<trans-unit id="72">
<source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source>
<target>Dieser Wert sollte nicht identische sein mit {{ compared_value_type }} {{ compared_value }}.</target>
<target>Dieser Wert sollte nicht identisch sein mit {{ compared_value_type }} {{ compared_value }}.</target>
</trans-unit>
</body>
</file>

2
src/Symfony/Component/Yaml/Tests/Fixtures/YtsBasicTests.yml
View File

@ -56,7 +56,7 @@ test: Simple Mapping
brief: |
You can add a keyed list (also known as a dictionary or
hash) to your document by placing each member of the
list on a new line, with a colon seperating the key
list on a new line, with a colon separating the key
from its value. In YAML, this type of list is called
a mapping.
yaml: |

2
src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml
View File

@ -222,7 +222,7 @@ yaml: |
# Following node labeled SS
- &SS Sammy Sosa
rbi:
- *SS # Subsequent occurance
- *SS # Subsequent occurrence
- Ken Griffey
php: |
array(

4
src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml
View File

@ -226,11 +226,11 @@ brief: >
time zone.
yaml: |
iso8601: 2001-12-14t21:59:43.10-05:00
space seperated: 2001-12-14 21:59:43.10 -05:00
space separated: 2001-12-14 21:59:43.10 -05:00
php: |
array(
'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
'space seperated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
'space separated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
)
---
test: Date