diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  [Console] Display console application name even when no version set
  Remove empty statements.
This commit is contained in:
Fabien Potencier 2016-01-14 09:26:43 +01:00
commit 5c29e717a2
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;;
use Symfony\Component\DependencyInjection\Extension\Extension;
class FormLoginExtension extends Extension
{

2
src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Bundle\WebProfilerBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\Extension\Extension;;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Config\FileLocator;

8
src/Symfony/Component/Console/Application.php
View File

@ -309,8 +309,12 @@ class Application
*/
public function getLongVersion()
{
if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {
return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
if ('UNKNOWN' !== $this->getName()) {
if ('UNKNOWN' !== $this->getVersion()) {
return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
}
return sprintf('<info>%s</info>', $this->getName());
}
return '<info>Console Tool</info>';

2
src/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
View File

@ -52,7 +52,7 @@ class MockSplFileInfo extends \SplFileInfo
{
if (null === $this->type) {
return false !== strpos($this->getFilename(), 'file');
};
}
return self::TYPE_FILE === $this->type;
}