1
0
Fork 0
pull/2819/merge
Jordi Boggiano 2015-06-30 15:38:32 +01:00
parent 4d36622ada
commit 6a64041055
18 changed files with 14 additions and 20 deletions

View File

@ -60,6 +60,7 @@ class HtmlOutputFormatter extends OutputFormatter
$formatted = parent::format($message); $formatted = parent::format($message);
$clearEscapeCodes = '(?:39|49|0|22|24|25|27|28)'; $clearEscapeCodes = '(?:39|49|0|22|24|25|27|28)';
return preg_replace_callback("{\033\[([0-9;]+)m(.*?)\033\[(?:".$clearEscapeCodes.";)*?".$clearEscapeCodes."m}s", array($this, 'formatHtml'), $formatted); return preg_replace_callback("{\033\[([0-9;]+)m(.*?)\033\[(?:".$clearEscapeCodes.";)*?".$clearEscapeCodes."m}s", array($this, 'formatHtml'), $formatted);
} }

View File

@ -58,6 +58,7 @@ class ErrorHandler
if (isset($a['line'], $a['file'])) { if (isset($a['line'], $a['file'])) {
return '<warning> '.$a['file'].':'.$a['line'].'</warning>'; return '<warning> '.$a['file'].':'.$a['line'].'</warning>';
} }
return null; return null;
}, array_slice(debug_backtrace(), 2)))); }, array_slice(debug_backtrace(), 2))));
} }

View File

@ -94,6 +94,7 @@ class GitHub
if (!$token) { if (!$token) {
$this->io->writeError('<warning>No token given, aborting.</warning>'); $this->io->writeError('<warning>No token given, aborting.</warning>');
$this->io->writeError('You can also add it manually later by using "composer config github-oauth.github.com <token>"'); $this->io->writeError('You can also add it manually later by using "composer config github-oauth.github.com <token>"');
return false; return false;
} }

View File

@ -13,7 +13,6 @@
namespace Composer\Test\EventDispatcher; namespace Composer\Test\EventDispatcher;
use Composer\EventDispatcher\Event; use Composer\EventDispatcher\Event;
use Composer\EventDispatcher\EventDispatcher;
use Composer\Installer\InstallerEvents; use Composer\Installer\InstallerEvents;
use Composer\TestCase; use Composer\TestCase;
use Composer\Script\ScriptEvents; use Composer\Script\ScriptEvents;

View File

@ -14,7 +14,6 @@ namespace Composer\Test;
use Composer\Installer; use Composer\Installer;
use Composer\Console\Application; use Composer\Console\Application;
use Composer\Config;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Repository\ArrayRepository; use Composer\Repository\ArrayRepository;
use Composer\Repository\RepositoryManager; use Composer\Repository\RepositoryManager;

View File

@ -12,8 +12,6 @@
namespace Composer\Test\Package; namespace Composer\Test\Package;
use Composer\Package\BasePackage;
class BasePackageTest extends \PHPUnit_Framework_TestCase class BasePackageTest extends \PHPUnit_Framework_TestCase
{ {
public function testSetSameRepository() public function testSetSameRepository()

View File

@ -16,7 +16,6 @@ use Composer\Config;
use Composer\Package\Loader\RootPackageLoader; use Composer\Package\Loader\RootPackageLoader;
use Composer\Package\BasePackage; use Composer\Package\BasePackage;
use Composer\Test\Mock\ProcessExecutorMock; use Composer\Test\Mock\ProcessExecutorMock;
use Composer\Repository\RepositoryManager;
class RootPackageLoaderTest extends \PHPUnit_Framework_TestCase class RootPackageLoaderTest extends \PHPUnit_Framework_TestCase
{ {

View File

@ -12,7 +12,6 @@
namespace Composer\Test\Package\Loader; namespace Composer\Test\Package\Loader;
use Composer\Package;
use Composer\Package\Loader\ValidatingArrayLoader; use Composer\Package\Loader\ValidatingArrayLoader;
use Composer\Package\Loader\InvalidPackageException; use Composer\Package\Loader\InvalidPackageException;

View File

@ -12,7 +12,6 @@
namespace Composer\Test\Repository; namespace Composer\Test\Repository;
use Composer\Repository\ComposerRepository;
use Composer\IO\NullIO; use Composer\IO\NullIO;
use Composer\Test\Mock\FactoryMock; use Composer\Test\Mock\FactoryMock;
use Composer\TestCase; use Composer\TestCase;

View File

@ -13,7 +13,6 @@
namespace Composer\Test\Util; namespace Composer\Test\Util;
use Composer\Util\RemoteFilesystem; use Composer\Util\RemoteFilesystem;
use Installer\Exception;
class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{ {

View File

@ -13,7 +13,6 @@
namespace Composer; namespace Composer;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;
use Composer\Package\Package;
use Composer\Package\AliasPackage; use Composer\Package\AliasPackage;
use Composer\Package\LinkConstraint\VersionConstraint; use Composer\Package\LinkConstraint\VersionConstraint;
use Composer\Util\Filesystem; use Composer\Util\Filesystem;