Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commitf828aee

Browse files
committed
Merge branch '2.4'
* 2.4: fixed various inconsistencies reduced recursion when building DumperPrefixCollection renamed variables - making next change more readable removing dead code. [ExpressionLanguage] added some tests for the built-in constant() function [ExpressionLanguage] added some documentation about functions [DomCrawler] Fixed filterXPath() chaining [DomCrawler] Fixed incorrect handling of image inputs
2 parentsd0386e4 +e2ac5df commitf828aee

File tree

55 files changed

+147
-131
lines changed

Some content is hidden

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

55 files changed

+147
-131
lines changed

‎src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public function refreshUser(UserInterface $user)
9292
);
9393
}
9494

95-
if (null ===$refreshedUser =$this->repository->find($id)) {
95+
$refreshedUser =$this->repository->find($id);
96+
if (null ===$refreshedUser) {
9697
thrownewUsernameNotFoundException(sprintf('User with id %s not found',json_encode($id)));
9798
}
9899
}

‎src/Symfony/Bridge/Doctrine/Tests/Fixtures/AssociationEntity.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespaceSymfony\Bridge\Doctrine\Tests\Fixtures;
1313

14-
useDoctrine\ORM\MappingASORM;
14+
useDoctrine\ORM\MappingasORM;
1515

1616
/**
1717
* @ORM\Entity

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CompilerDebugDumpPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function process(ContainerBuilder $container)
2222
{
2323
$filesystem =newFilesystem();
2424
$filesystem->dumpFile(
25-
$this->getCompilerLogFilename($container),
25+
self::getCompilerLogFilename($container),
2626
implode("\n",$container->getCompiler()->getLog()),
2727
0666 & ~umask()
2828
);

‎src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/TemplateFinderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function testFindAllTemplates()
3737
->will($this->returnValue(array('BaseBundle' =>newBaseBundle())))
3838
;
3939

40-
$parser =newTemplateFilenameParser($kernel);
40+
$parser =newTemplateFilenameParser();
4141

4242
$finder =newTemplateFinder($kernel,$parser,__DIR__.'/../Fixtures/Resources');
4343

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testDefaultConfig()
3333
publicfunctiontestValidTrustedProxies($trustedProxies,$processedProxies)
3434
{
3535
$processor =newProcessor();
36-
$configuration =newConfiguration(array());
36+
$configuration =newConfiguration();
3737
$config =$processor->processConfiguration($configuration,array(array(
3838
'secret' =>'s3cr3t',
3939
'trusted_proxies' =>$trustedProxies
@@ -62,7 +62,7 @@ public function getTestValidTrustedProxiesData()
6262
publicfunctiontestInvalidTypeTrustedProxies()
6363
{
6464
$processor =newProcessor();
65-
$configuration =newConfiguration(array());
65+
$configuration =newConfiguration();
6666
$processor->processConfiguration($configuration,array(
6767
array(
6868
'secret' =>'s3cr3t',
@@ -77,7 +77,7 @@ public function testInvalidTypeTrustedProxies()
7777
publicfunctiontestInvalidValueTrustedProxies()
7878
{
7979
$processor =newProcessor();
80-
$configuration =newConfiguration(array());
80+
$configuration =newConfiguration();
8181
$processor->processConfiguration($configuration,array(
8282
array(
8383
'secret' =>'s3cr3t',

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected static function getKernelClass()
3737
{
3838
require_once__DIR__.'/app/AppKernel.php';
3939

40-
return'Symfony\Bundle\FrameworkBundle\Tests\Functional\AppKernel';
40+
return'Symfony\Bundle\FrameworkBundle\Tests\Functional\app\AppKernel';
4141
}
4242

4343
protectedstaticfunctioncreateKernel(array$options =array())

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespaceSymfony\Bundle\FrameworkBundle\Tests\Functional;
12+
namespaceSymfony\Bundle\FrameworkBundle\Tests\Functional\app;
1313

1414
// get the autoload file
1515
$dir =__DIR__;

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected static function getKernelClass()
3737
{
3838
require_once__DIR__.'/app/AppKernel.php';
3939

40-
return'Symfony\Bundle\SecurityBundle\Tests\Functional\AppKernel';
40+
return'Symfony\Bundle\SecurityBundle\Tests\Functional\app\AppKernel';
4141
}
4242

4343
protectedstaticfunctioncreateKernel(array$options =array())

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespaceSymfony\Bundle\SecurityBundle\Tests\Functional;
12+
namespaceSymfony\Bundle\SecurityBundle\Tests\Functional\app;
1313

1414
// get the autoload file
1515
$dir =__DIR__;

‎src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/ConfigurationTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
2222
publicfunctiontestConfigTree($options,$results)
2323
{
2424
$processor =newProcessor();
25-
$configuration =newConfiguration(array());
25+
$configuration =newConfiguration();
2626
$config =$processor->processConfiguration($configuration,array($options));
2727

2828
$this->assertEquals($results,$config);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp