Skip to content

Commit d7547f2

Browse files
Merge branch '3.4'
* 3.4: [3.4] Remove useless docblocks [3.3] More docblock fixes [2.7] More docblock fixes [TwigBridge] Fix BC break due required twig environment Random fixes Docblock fixes [DI] Fix cannot bind env var Fix some signatures in PHP-DSLs [HttpKernel] Enhance deprecation message bumped Symfony version to 3.4.0 updated VERSION for 3.4.0-BETA3 updated CHANGELOG for 3.4.0-BETA3 [SecurityBundle] Fix the datacollector to properly support decision.object being null
2 parents ba3b177 + 2dbe17b commit d7547f2

File tree

69 files changed

+138
-228
lines changed

Some content is hidden

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

69 files changed

+138
-228
lines changed

CHANGELOG-3.4.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@ in 3.4 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.4.0...v3.4.1
99

10+
* 3.4.0-BETA3 (2017-11-05)
11+
12+
* bug #24531 [HttpFoundation] Fix forward-compat of NativeSessionStorage with PHP 7.2 (sroze)
13+
* bug #24828 [DI] Fix the "almost-circular refs" fix (nicolas-grekas)
14+
* bug #24665 Fix dump panel hidden when closing a dump (julienfalque)
15+
* bug #24802 [TwigBridge] [Bootstrap 4] Fix hidden errors (ostrolucky)
16+
* bug #24816 [Serializer] Fix extra attributes when no group specified (ogizanagi)
17+
* bug #24822 [DI] Fix "almost-circular" dependencies handling (nicolas-grekas)
18+
* bug #24821 symfony/form auto-enables symfony/validator, even when not present (weaverryan)
19+
* bug #24824 [FrameworkBundle][Config] fix: do not add resource checkers for no-debug (dmaicher)
20+
* bug #24814 [Intl] Make intl-data tests pass and save language aliases again (jakzal)
21+
* bug #24810 [Serializer] readd default argument value (xabbuh)
22+
* bug #24809 [Config] Fix dump of config references for deprecated nodes (chalasr)
23+
* bug #24796 [PhpUnitBridge] Fixed fatal error in CoverageListener when something goes wrong in Test::setUpBeforeClass (lyrixx)
24+
* bug #24774 [HttpKernel] Let the storage manage the session starts (sroze)
25+
* bug #24735 [VarDumper] fix trailling comma when dumping an exception (Simperfit)
26+
* bug #24770 [Validator] Fix TraceableValidator is reset on data collector instantiation (ogizanagi)
27+
* bug #24764 [HttpFoundation] add Early Hints to Reponse to fix test (Simperfit)
28+
* bug #24759 Removes \n or space when $context/$extra are empty (kirkmadera)
29+
* bug #24758 Throwing exception if redis and predis unavailable (aequasi)
30+
1031
* 3.4.0-BETA2 (2017-10-30)
1132

1233
* bug #24728 [Bridge\Twig] fix bootstrap checkbox_row to render properly & remove spaceless (arkste)

src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
6969
* only do anything if the parameter is present. (But regardless of the
7070
* value of that parameter.
7171
*
72-
* @var string
72+
* @var string|false
7373
*/
7474
protected $enabledParameter;
7575

src/Symfony/Bridge/Doctrine/Tests/Fixtures/Type/StringWrapper.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313

1414
class StringWrapper
1515
{
16-
/**
17-
* @var string
18-
*/
1916
private $string;
2017

2118
/**

src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ public function handleError($type, $msg, $file, $line, $context = array())
315315
}
316316

317317
/**
318-
* @param Test $test
318+
* @param TestCase $test
319319
*
320320
* @return bool
321321
*/

src/Symfony/Bridge/Twig/Command/DebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private function getLoaderPaths()
135135

136136
$loaderPaths = array();
137137
foreach ($loader->getNamespaces() as $namespace) {
138-
$paths = array_map(function ($path) use ($namespace) {
138+
$paths = array_map(function ($path) {
139139
if (null !== $this->projectDir && 0 === strpos($path, $this->projectDir)) {
140140
$path = ltrim(substr($path, strlen($this->projectDir)), DIRECTORY_SEPARATOR);
141141
}

src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TwigDataCollector extends DataCollector implements LateDataCollectorInterf
3131
private $twig;
3232
private $computed;
3333

34-
public function __construct(Profile $profile, Environment $twig)
34+
public function __construct(Profile $profile, Environment $twig = null)
3535
{
3636
$this->profile = $profile;
3737
$this->twig = $twig;
@@ -62,6 +62,10 @@ public function lateCollect()
6262
$this->data['profile'] = serialize($this->profile);
6363
$this->data['template_paths'] = array();
6464

65+
if (null === $this->twig) {
66+
return;
67+
}
68+
6569
$templateFinder = function (Profile $profile) use (&$templateFinder) {
6670
if ($profile->isTemplate()) {
6771
try {

src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public function formatFile($file, $line, $text = null)
196196
* @param string $file An absolute file path
197197
* @param int $line The line number
198198
*
199-
* @return string A link of false
199+
* @return string|false A link or false
200200
*/
201201
public function getFileLink($file, $line)
202202
{

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private function extractSupportedLoaders(array $loaders)
8080
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
8181
$supportedLoaders[] = $loader;
8282
} elseif ($loader instanceof LoaderChain) {
83-
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
83+
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
8484
}
8585
}
8686

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private function extractSupportedLoaders(array $loaders)
9191
if ($loader instanceof XmlFileLoader || $loader instanceof YamlFileLoader) {
9292
$supportedLoaders[] = $loader;
9393
} elseif ($loader instanceof LoaderChain) {
94-
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getDelegatedLoaders()));
94+
$supportedLoaders = array_merge($supportedLoaders, $this->extractSupportedLoaders($loader->getLoaders()));
9595
}
9696
}
9797

src/Symfony/Bundle/FrameworkBundle/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getKernel()
6262
/**
6363
* Gets the profile associated with the current Response.
6464
*
65-
* @return HttpProfile A Profile instance
65+
* @return HttpProfile|false A Profile instance
6666
*/
6767
public function getProfile()
6868
{

0 commit comments

Comments
 (0)