mirror of
https://github.com/composer/composer
synced 2025-05-11 01:22:54 +00:00
php-cs-fixer
This commit is contained in:
parent
dc2f201152
commit
a245c4618b
18 changed files with 43 additions and 43 deletions
|
@ -125,6 +125,7 @@ class BaseDependencyCommand extends BaseCommand
|
|||
} else {
|
||||
$this->printTable($output, $results);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -16,7 +16,6 @@ use Composer\Factory;
|
|||
use Composer\Package\Loader\ValidatingArrayLoader;
|
||||
use Composer\Plugin\CommandEvent;
|
||||
use Composer\Plugin\PluginEvents;
|
||||
use Composer\Script\ScriptEvents;
|
||||
use Composer\Util\ConfigValidator;
|
||||
use Symfony\Component\Console\Input\InputArgument;
|
||||
use Symfony\Component\Console\Input\InputInterface;
|
||||
|
|
|
@ -59,7 +59,6 @@ class PathDownloader extends FileDownloader
|
|||
// Implement symlinks as NTFS junctions on Windows
|
||||
$this->filesystem->junction($realUrl, $path);
|
||||
$this->io->writeError(sprintf(' Junctioned from %s', $url));
|
||||
|
||||
} else {
|
||||
$shortestPath = $this->filesystem->findShortestPath($path, $realUrl);
|
||||
$fileSystem->symlink($shortestPath, $path);
|
||||
|
|
|
@ -30,7 +30,6 @@ use Composer\Installer\InstallationManager;
|
|||
use Composer\Installer\InstallerEvents;
|
||||
use Composer\Installer\NoopInstaller;
|
||||
use Composer\IO\IOInterface;
|
||||
use Composer\Json\JsonFile;
|
||||
use Composer\Package\AliasPackage;
|
||||
use Composer\Package\CompletePackage;
|
||||
use Composer\Package\Link;
|
||||
|
@ -40,7 +39,6 @@ use Composer\Package\PackageInterface;
|
|||
use Composer\Package\RootPackageInterface;
|
||||
use Composer\Repository\CompositeRepository;
|
||||
use Composer\Repository\InstalledArrayRepository;
|
||||
use Composer\Repository\InstalledFilesystemRepository;
|
||||
use Composer\Repository\PlatformRepository;
|
||||
use Composer\Repository\RepositoryInterface;
|
||||
use Composer\Repository\RepositoryManager;
|
||||
|
|
|
@ -23,12 +23,12 @@ class PharArchiver implements ArchiverInterface
|
|||
'zip' => \Phar::ZIP,
|
||||
'tar' => \Phar::TAR,
|
||||
'tar.gz' => \Phar::TAR,
|
||||
'tar.bz2' => \Phar::TAR
|
||||
'tar.bz2' => \Phar::TAR,
|
||||
);
|
||||
|
||||
protected static $compressFormats = array(
|
||||
'tar.gz' => \Phar::GZ,
|
||||
'tar.bz2' => \Phar::BZ2
|
||||
'tar.bz2' => \Phar::BZ2,
|
||||
);
|
||||
|
||||
/**
|
||||
|
|
|
@ -20,7 +20,7 @@ use ZipArchive;
|
|||
class ZipArchiver implements ArchiverInterface
|
||||
{
|
||||
protected static $formats = array(
|
||||
'zip' => 1
|
||||
'zip' => 1,
|
||||
);
|
||||
|
||||
/**
|
||||
|
@ -59,7 +59,8 @@ class ZipArchiver implements ArchiverInterface
|
|||
return isset(static::$formats[$format]) && $this->compressionAvailable();
|
||||
}
|
||||
|
||||
private function compressionAvailable() {
|
||||
private function compressionAvailable()
|
||||
{
|
||||
return class_exists('ZipArchive');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -16,7 +16,6 @@ use Composer\Config;
|
|||
use Composer\IO\IOInterface;
|
||||
use Composer\Json\JsonFile;
|
||||
use Composer\Package\Loader\ArrayLoader;
|
||||
use Composer\Package\Locker;
|
||||
use Composer\Package\Version\VersionGuesser;
|
||||
use Composer\Package\Version\VersionParser;
|
||||
use Composer\Util\ProcessExecutor;
|
||||
|
|
|
@ -620,6 +620,7 @@ class Filesystem
|
|||
}
|
||||
// Junctions have no link stat but are otherwise indistinguishable from real directories
|
||||
$stat = lstat($junction);
|
||||
|
||||
return ($stat['mode'] === 0);
|
||||
}
|
||||
|
||||
|
@ -639,6 +640,7 @@ class Filesystem
|
|||
throw new IOException(sprintf('%s is not a junction and thus cannot be removed as one', $junction));
|
||||
}
|
||||
$cmd = sprintf('rmdir /S /Q %s', ProcessExecutor::escape($junction));
|
||||
|
||||
return ($this->getProcess()->execute($cmd, $output) === 0);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
|
||||
/*
|
||||
* This file is part of Composer.
|
||||
*
|
||||
* (c) Nils Adermann <naderman@naderman.de>
|
||||
|
|
|
@ -16,7 +16,6 @@ use Composer\Package\Archiver\ZipArchiver;
|
|||
|
||||
class ZipArchiverTest extends ArchiverTest
|
||||
{
|
||||
|
||||
public function testZipArchive()
|
||||
{
|
||||
if (!class_exists('ZipArchive')) {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
|
||||
/*
|
||||
* This file is part of Composer.
|
||||
*
|
||||
* (c) Nils Adermann <naderman@naderman.de>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue