8000 Merge branch '2.3' into 2.6 · symfony/symfony@939c305 · GitHub
[go: up one dir, main page]
Skip to content

Commit 939c305

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.6
* 2.3: #15331 add infos about deprecated classes to UPGRADE-3.0 [Security] removed useless else condition in SwitchUserListener class. [travis] Tests deps=low with PHP 5.6 [Console] Fix console output with closed stdout
2 parents e338281 + 9943fd1 commit 939c305

File tree

4 files changed

+35
-8
lines changed

4 files changed

+35
-8
lines changed

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ matrix:
1515
- php: 5.4
1616
- php: 5.5
1717
- php: 5.6
18-
- php: 5.3
1918
env: deps=low
2019
- php: 5.6
2120
env: deps=high

‎UPGRADE-3.0.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,17 @@ UPGRADE FROM 2.x to 3.0
272272
```php
273273
echo $form->getErrors(true, false);
274274
```
275+
* The `Symfony\Component\Form\Extension\Core\ChoiceList\ChoiceList` class has been removed in
276+
favor of `Symfony\Component\Form\ChoiceList\ArrayChoiceList`.
277+
278+
* The `Symfony\Component\Form\Extension\Core\ChoiceList\LazyChoiceList` class has been removed in
279+
favor of `Symfony\Component\Form\ChoiceList\LazyChoiceList`.
280+
281+
* The `Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList` class has been removed in
282+
favor of `Symfony\Component\Form\ChoiceList\ArrayChoiceList`.
283+
284+
* The `Symfony\Component\Form\Extension\Core\ChoiceList\SimpleChoiceList` class has been removed in
285+
favor of `Symfony\Component\Form\ChoiceList\ArrayChoiceList`.
275286

276287
### FrameworkBundle
277288

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

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,9 @@ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface
4646
*/
4747
public function __construct($verbosity = self::VERBOSITY_NORMAL, $decorated = null, OutputFormatterInterface $formatter = null)
4848
{
49-
$outputStream = $this->hasStdoutSupport() ? 'php://stdout' : 'php://output';
50-
$errorStream = $this->hasStderrSupport() ? 'php://stderr' : 'php://output';
51-
52-
parent::__construct(fopen($outputStream, 'w'), $verbosity, $decorated, $formatter);
49+
parent::__construct($this->openOutputStream(), $verbosity, $decorated, $formatter);
5350

54-
$this->stderr = new StreamOutput(fopen($errorStream, 'w'), $verbosity, $decorated, $this->getFormatter());
51+
$this->stderr = new StreamOutput($this->openErrorStream(), $verbosity, $decorated, $this->getFormatter());
5552
}
5653

5754
/**
@@ -129,4 +126,24 @@ private function isRunningOS400()
129126
{
130127
return 'OS400' === php_uname('s');
131128
}
129+
130+
/**
131+
* @return resource
132+
*/
133+
private function openOutputStream()
134+
{
135+
$outputStream = $this->hasStdoutSupport() ? 'php://stdout' : 'php://output';
136+
137+
return @fopen($outputStream, 'w') ?: fopen('php://output', 'w');
138+
}
139+
140+
/**
141+
* @return resource
142+
*/
143+
private function openErrorStream()
144+
{
145+
$errorStream = $this->hasStderrSupport() ? 'php://stderr' : 'php://output';
146+
147+
return fopen($errorStream, 'w');
148+
}
132149
}

‎src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ private function attemptSwitchUser(Request $request)
118118
if (false !== $originalToken) {
119119
if ($token->getUsername() === $request->get($this->usernameParameter)) {
120120
return $token;
121-
} else {
122-
throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername()));
123121
}
122+
123+
throw new \LogicException(sprintf('You are already switched to "%s" user.', $token->getUsername()));
124124
}
125125

126126
if (false === $this->accessDecisionManager->decide($token, array($this->role))) {

0 commit comments

Comments
 (0)
0