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

Commit8d7b498

Browse files
committed
Merge branch '2.8'
* 2.8: (28 commits) Detect Mintty for color support on Windows Detect Mintty for color support on Windows [WebProfilerBundle] Fix search button click listener [Form][Type Date/Time] added choice_translation_domain option. Massively simplifying the BC and deprecated-throwing code thanks to suggestions by stof in#15870 Making all "debug" messages use the debug router Making GuardTokenInterface extend TokenInterface Updating behavior to not continue after an authenticator has set the response Add a group for tests of the finder against the FTP server Fix trigger_error calls Fix legacy security tests tweaking message related to configuration edge case that we want to be helpful with Minor tweaks - lowering the required security-http requirement and nulling out a test field Fix license headers Fix license headers Fix license headers Ensure the ClockMock is loaded before using it in the testsuite Allow serializer 3.0 in the PropertyInfo component Add the replace rules for the security-guard component Forbid serializing a Crawler ...
2 parents30fc4ee +58ed076 commit8d7b498

File tree

88 files changed

+742
-192
lines changed

Some content is hidden

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

88 files changed

+742
-192
lines changed

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"symfony/security":"2.99.99",
5353
"symfony/security-core":"self.version",
5454
"symfony/security-csrf":"self.version",
55+
"symfony/security-guard":"self.version",
5556
"symfony/security-http":"self.version",
5657
"symfony/security-bundle":"self.version",
5758
"symfony/serializer":"self.version",

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
/*
44
* 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-
*/
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+
*/
1111

1212
namespaceSymfony\Bridge\Doctrine\Tests\DependencyInjection\CompilerPass;
1313

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
/*
44
* 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-
*/
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+
*/
1111

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

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static function register($mode = false)
133133
privatestaticfunctionhasColorSupport()
134134
{
135135
if ('\\' ===DIRECTORY_SEPARATOR) {
136-
returnfalse !==getenv('ANSICON') ||'ON' ===getenv('ConEmuANSI');
136+
returnfalse !==getenv('ANSICON') ||'ON' ===getenv('ConEmuANSI') ||'xterm' ===getenv('TERM');
137137
}
138138

139139
returndefined('STDOUT') &&function_exists('posix_isatty') && @posix_isatty(STDOUT);

‎src/Symfony/Bridge/PhpUnit/bootstrap.php

Lines 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
useDoctrine\Common\Annotations\AnnotationRegistry;
413
useSymfony\Bridge\PhpUnit\DeprecationErrorHandler;
514

‎src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
{%ifdatetimeis notdefinedorfalse==datetime -%}
8181
<div {{block('widget_container_attributes') -}}>
8282
{%-endif -%}
83-
{{- form_widget(form.hour) }}:{{ form_widget(form.minute) }}{%ifwith_seconds %}:{{ form_widget(form.second) }}{%endif %}
83+
{{- form_widget(form.hour) }}{%ifwith_minutes %}:{{ form_widget(form.minute) }}{%endif %}{%ifwith_seconds %}:{{ form_widget(form.second) }}{%endif %}
8484
{%ifdatetimeis notdefinedorfalse==datetime -%}
8585
</div>
8686
{%-endif -%}

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,12 @@ private function findTemplatesInFolder($dir)
9797
*/
9898
privatefunctionfindTemplatesInBundle(BundleInterface$bundle)
9999
{
100-
$templates =$this->findTemplatesInFolder($bundle->getPath().'/Resources/views');
101100
$name =$bundle->getName();
101+
$templates =array_merge(
102+
$this->findTemplatesInFolder($bundle->getPath().'/Resources/views'),
103+
$this->findTemplatesInFolder($this->rootDir.'/'.$name.'/views')
104+
);
105+
$templates =array_unique($templates);
102106

103107
foreach ($templatesas$i =>$template) {
104108
$templates[$i] =$template->set('bundle',$name);

‎src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
100100

101101
privatefunctionvalidate($content,$file =null)
102102
{
103-
$this->parser =newParser();
103+
$parser =newParser();
104104
try {
105-
$this->parser->parse($content);
105+
$parser->parse($content);
106106
}catch (ParseException$e) {
107107
returnarray('file' =>$file,'valid' =>false,'message' =>$e->getMessage());
108108
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ function ($template) { return $template->getLogicalName(); },
4646
$finder->findAllTemplates()
4747
);
4848

49-
$this->assertCount(6,$templates,'->findAllTemplates() find all templates in the bundles and global folders');
49+
$this->assertCount(7,$templates,'->findAllTemplates() find all templates in the bundles and global folders');
5050
$this->assertContains('BaseBundle::base.format.engine',$templates);
5151
$this->assertContains('BaseBundle::this.is.a.template.format.engine',$templates);
5252
$this->assertContains('BaseBundle:controller:base.format.engine',$templates);
53+
$this->assertContains('BaseBundle:controller:custom.format.engine',$templates);
5354
$this->assertContains('::this.is.a.template.format.engine',$templates);
5455
$this->assertContains('::resource.format.engine',$templates);
5556
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php

Lines 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
namespaceSymfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand;
413

514
useSymfony\Bundle\FrameworkBundle\Console\Application;

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php

Lines 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
namespaceSymfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand\Fixture;
413

514
useSymfony\Bundle\FrameworkBundle\FrameworkBundle;

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/BaseBundle/views/base.format.engine

Whitespace-only changes.

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/BaseBundle/views/controller/custom.format.engine

Whitespace-only changes.

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ConfigDump/bundles.php

Lines 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
useSymfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
413
useSymfony\Bundle\FrameworkBundle\FrameworkBundle;
514

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/bundles.php

Lines 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
useSymfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
413
useSymfony\Bundle\FrameworkBundle\FrameworkBundle;
514

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php

Lines 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
useSymfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
413
useSymfony\Bundle\FrameworkBundle\FrameworkBundle;
514

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/bundles.php

Lines 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
useSymfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
413
useSymfony\Bundle\FrameworkBundle\FrameworkBundle;
514

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
357357
),
358358
'my_entity_provider' =>array('entity' =>array('class' =>'SecurityBundle:User','property' =>'username')),
359359
))
360-
->disallowNewKeysInSubsequentConfigs()
361360
->isRequired()
362361
->requiresAtLeastOneElement()
363362
->useAttributeAsKey('name')

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private function determineEntryPoint($defaultEntryPointId, array $config)
9494
// explode if they've configured the entry_point, but there is already one
9595
if ($config['entry_point']) {
9696
thrownew \LogicException(sprintf(
97-
'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall',
97+
'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall (i.e. at the same level as "guard").',
9898
$config['entry_point']
9999
));
100100
}

‎src/Symfony/Bundle/SecurityBundle/Tests/DataCollector/SecurityDataCollectorTest.php

Lines 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
namespaceSymfony\Bundle\SecurityBundle\Tests\DataCollector;
413

514
useSymfony\Bundle\SecurityBundle\DataCollector\SecurityDataCollector;

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

Lines 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
namespaceSymfony\Bundle\SecurityBundle\Tests\Functional;
413

514
/*

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Acl/bundles.php

Lines 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
returnarray(
413
newDoctrine\Bundle\DoctrineBundle\DoctrineBundle(),
514
newSymfony\Bundle\SecurityBundle\SecurityBundle(),

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/bundles.php

Lines 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
returnarray(
413
newSymfony\Bundle\FrameworkBundle\FrameworkBundle(),
514
newSymfony\Bundle\SecurityBundle\SecurityBundle(),

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/FirewallEntryPoint/bundles.php

Lines 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
returnarray(
413
newSymfony\Bundle\FrameworkBundle\FrameworkBundle(),
514
newSymfony\Bundle\SecurityBundle\SecurityBundle(),

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/bundles.php

Lines 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
returnarray(
413
newSymfony\Bundle\SecurityBundle\SecurityBundle(),
514
newSymfony\Bundle\FrameworkBundle\FrameworkBundle(),

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/bundles.php

Lines 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
useSymfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\FormLoginBundle;
413
useSymfony\Bundle\TwigBundle\TwigBundle;
514
useSymfony\Bundle\SecurityBundle\SecurityBundle;

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,13 @@
390390
e.preventDefault();
391391
392392
var toggle=e.target||e.srcElement;
393+
394+
/* needed because when the toggle contains HTML contents, user can click*/
395+
/* on any of those elements instead of their parent '.sf-toggle' element*/
396+
while (!Sfjs.hasClass(toggle,'sf-toggle')) {
397+
toggle=toggle.parentNode;
398+
}
399+
393400
var element=document.querySelector(toggle.getAttribute('data-toggle-selector'));
394401
395402
Sfjs.toggleClass(element,'sf-toggle-hidden');

‎src/Symfony/Component/Console/Output/StreamOutput.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ protected function doWrite($message, $newline)
8989
*
9090
* Colorization is disabled if not supported by the stream:
9191
*
92-
* - Windows without Ansicon andConEmu
92+
* - Windows without Ansicon,ConEmu or Mintty
9393
* - non tty consoles
9494
*
9595
* @return bool true if the stream supports colorization, false otherwise
9696
*/
9797
protectedfunctionhasColorSupport()
9898
{
9999
if (DIRECTORY_SEPARATOR ==='\\') {
100-
returnfalse !==getenv('ANSICON') ||'ON' ===getenv('ConEmuANSI');
100+
returnfalse !==getenv('ANSICON') ||'ON' ===getenv('ConEmuANSI') ||'xterm' ===getenv('TERM');
101101
}
102102

103103
returnfunction_exists('posix_isatty') && @posix_isatty($this->stream);

‎src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
useSymfony\Component\Console\Output\StreamOutput;
1717
useSymfony\Component\Console\Tests;
1818

19+
require_once__DIR__.'/../ClockMock.php';
20+
1921
class ProgressBarTestextends \PHPUnit_Framework_TestCase
2022
{
2123
protectedfunctionsetUp()

‎src/Symfony/Component/Console/Tests/Style/SymfonyStyleTest.php

Lines 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
namespaceSymfony\Component\Console\Tests\Style;
413

514
usePHPUnit_Framework_TestCase;

‎src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public function process(ContainerBuilder $container)
4646
}
4747

4848
$this->currentId =$id;
49-
$this->currentDefinition =$definition;
5049

5150
$this->validateReferences($definition->getArguments());
5251
$this->validateReferences($definition->getMethodCalls());

0 commit comments

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