CS fixes
parent
59648b12a4
commit
fc3c7838b2
|
@ -59,6 +59,7 @@ class ClassLoader
|
||||||
if (!empty($this->prefixesPsr0)) {
|
if (!empty($this->prefixesPsr0)) {
|
||||||
return call_user_func_array('array_merge', $this->prefixesPsr0);
|
return call_user_func_array('array_merge', $this->prefixesPsr0);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -300,7 +300,7 @@ class Config
|
||||||
* This should be used to read COMPOSER_ environment variables
|
* This should be used to read COMPOSER_ environment variables
|
||||||
* that overload config values.
|
* that overload config values.
|
||||||
*
|
*
|
||||||
* @param string $var
|
* @param string $var
|
||||||
* @return string|boolean
|
* @return string|boolean
|
||||||
*/
|
*/
|
||||||
private function getComposerEnv($var)
|
private function getComposerEnv($var)
|
||||||
|
|
|
@ -99,7 +99,8 @@ class Application extends BaseApplication
|
||||||
if ($name = $this->getCommandName($input)) {
|
if ($name = $this->getCommandName($input)) {
|
||||||
try {
|
try {
|
||||||
$commandName = $this->find($name)->getName();
|
$commandName = $this->find($name)->getName();
|
||||||
} catch (\InvalidArgumentException $e) {}
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if ($commandName !== 'self-update' && $commandName !== 'selfupdate') {
|
if ($commandName !== 'self-update' && $commandName !== 'selfupdate') {
|
||||||
if (time() > COMPOSER_DEV_WARNING_TIME) {
|
if (time() > COMPOSER_DEV_WARNING_TIME) {
|
||||||
|
|
|
@ -56,7 +56,6 @@ abstract class BasePackage implements PackageInterface
|
||||||
protected $repository;
|
protected $repository;
|
||||||
protected $transportOptions;
|
protected $transportOptions;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All descendants' constructors should call this parent constructor
|
* All descendants' constructors should call this parent constructor
|
||||||
*
|
*
|
||||||
|
|
|
@ -194,6 +194,6 @@ class CompletePackage extends Package implements CompletePackageInterface
|
||||||
*/
|
*/
|
||||||
public function getReplacementPackage()
|
public function getReplacementPackage()
|
||||||
{
|
{
|
||||||
return is_string($this->abandoned)? $this->abandoned : null;
|
return is_string($this->abandoned) ? $this->abandoned : null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ class AllFunctionalTest extends \PHPUnit_Framework_TestCase
|
||||||
if (defined('HHVM_VERSION')) {
|
if (defined('HHVM_VERSION')) {
|
||||||
$this->markTestSkipped('Building the phar does not work on HHVM.');
|
$this->markTestSkipped('Building the phar does not work on HHVM.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$fs = new Filesystem;
|
$fs = new Filesystem;
|
||||||
$fs->removeDirectory(dirname(self::$pharPath));
|
$fs->removeDirectory(dirname(self::$pharPath));
|
||||||
$fs->ensureDirectoryExists(dirname(self::$pharPath));
|
$fs->ensureDirectoryExists(dirname(self::$pharPath));
|
||||||
|
|
Loading…
Reference in New Issue