8000 Merge branch '2.3' into 2.7 · symfony/symfony@5c29e71 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5c29e71

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: [Console] Display console application name even when no version set Remove empty statements.
2 parents 6a870f1 + 5781bbc commit 5c29e71

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use Symfony\Component\DependencyInjection\Reference;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
16-
use Symfony\Component\DependencyInjection\Extension\Extension;;
16+
use Symfony\Component\DependencyInjection\Extension\Extension;
1717

1818
class FormLoginExtension extends Extension
1919
{

src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bundle\WebProfilerBundle\DependencyInjection;
1313

14-
use Symfony\Component\DependencyInjection\Extension\Extension;;
14+
use Symfony\Component\DependencyInjection\Extension\Extension;
1515
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
1616
use Symfony\Component\DependencyInjection\ContainerBuilder;
1717
use Symfony\Component\Config\FileLocator;

src/Symfony/Component/Console/Application.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,12 @@ public function setVersion($version)
309309
*/
310310
public function getLongVersion()
311311
{
312-
if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {
313-
return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
312+
if ('UNKNOWN' !== $this->getName()) {
313+
if ('UNKNOWN' !== $this->getVersion()) {
314+
return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
315+
}
316+
317+
return sprintf('<info>%s</info>', $this->getName());
314318
}
315319

316320
return '<info>Console Tool</info>';

src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function isFile()
5252
{
5353
if (null === $this->type) {
5454
return false !== strpos($this->getFilename(), 'file');
55-
};
55+
}
5656

5757
return self::TYPE_FILE === $this->type;
5858
}

0 commit comments

Comments
 (0)
0