Skip to content

Commit 8d7b498

Browse files
fabpotfabpot
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 parents 30fc4ee + 58ed076 commit 8d7b498

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
namespace Symfony\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
namespace Symfony\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
private static function hasColorSupport()
134134
{
135135
if ('\\' === DIRECTORY_SEPARATOR) {
136-
return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
136+
return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM');
137137
}
138138

139139
return defined('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
use Doctrine\Common\Annotations\AnnotationRegistry;
413
use Symfony\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
{% if datetime is not defined or false == datetime -%}
8181
<div {{ block('widget_container_attributes') -}}>
8282
{%- endif -%}
83-
{{- form_widget(form.hour) }}:{{ form_widget(form.minute) }}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
83+
{{- form_widget(form.hour) }}{% if with_minutes %}:{{ form_widget(form.minute) }}{% endif %}{% if with_seconds %}:{{ form_widget(form.second) }}{% endif %}
8484
{% if datetime is not defined or false == 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
private function findTemplatesInBundle(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 ($templates as $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
private function validate($content, $file = null)
102102
{
103-
$this->parser = new Parser();
103+
$parser = new Parser();
104104
try {
105-
$this->parser->parse($content);
105+
$parser->parse($content);
106106
} catch (ParseException $e) {
107107
return array('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
namespace Symfony\Bundle\FrameworkBundle\Tests\Command\CacheClearCommand;
413

514
use Symfony\Bundle\FrameworkBundle\Console\Application;

0 commit comments

Comments
 (0)