Skip to content

Commit 8a55cad

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [FrameworkBundle] Fix third level headers for MarkdownDescriptor [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.7.24 updated VERSION for 2.7.23 update CONTRIBUTORS for 2.7.23 updated CHANGELOG for 2.7.23 [FrameworkBundle] Skip test if xdebug.file_link_format is defined.
2 parents 7b9c074 + 54c169b commit 8a55cad

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

Data/Generator/AbstractDataGenerator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ public function __construct(GenrbCompiler $compiler, $dirName)
4242
$this->dirName = $dirName;
4343
}
4444

45-
/**
46-
* {@inheritdoc}
47-
*/
4845
public function generateData(GeneratorConfig $config)
4946
{
5047
$filesystem = new Filesystem();

Data/Generator/LocaleDataGenerator.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ public function __construct($dirName, LanguageDataProvider $languageDataProvider
5757
$this->regionDataProvider = $regionDataProvider;
5858
}
5959

60-
/**
61-
* {@inheritdoc}
62-
*/
6360
public function generateData(GeneratorConfig $config)
6461
{
6562
$filesystem = new Filesystem();

0 commit comments

Comments
 (0)