public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #799 from lyrixx/psr 

Fixed PSR rules
pull/802/head
Jordi Boggiano 2012-06-14 03:40:37 -07:00
parent 330f56c0ec f4e9dd4fb8
commit 6f33d4e17f
22 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Composer/Test/Autoload/Fixtures/php5.4/traits.php
View File

@ -4,7 +4,8 @@ namespace {
}
class CFoo {
class CFoo
{
use TFoo;
}
}
@ -22,7 +23,8 @@ namespace Foo {
}
class CBar implements IBar {
class CBar implements IBar
{
use TBar, TFooBar;
}
}

2
tests/Composer/Test/ComposerTest.php
View File

@ -59,4 +59,4 @@ class ComposerTest extends TestCase
$this->assertSame($manager, $composer->getInstallationManager());
}
}
}

1
tests/Composer/Test/DependencyResolver/RequestTest.php
View File

@ -15,7 +15,6 @@ namespace Composer\Test\DependencyResolver;
use Composer\DependencyResolver\Request;
use Composer\DependencyResolver\Pool;
use Composer\Repository\ArrayRepository;
use Composer\DependencyResolver\Literal;
use Composer\Test\TestCase;
class RequestTest extends TestCase

3
tests/Composer/Test/DependencyResolver/SolverTest.php
View File

@ -12,15 +12,12 @@
namespace Composer\Test\DependencyResolver;
use Composer\Repository\ArrayRepository;
use Composer\Repository\PlatformRepository;
use Composer\Repository\ComposerRepository;
use Composer\DependencyResolver\DefaultPolicy;
use Composer\DependencyResolver\Pool;
use Composer\DependencyResolver\Request;
use Composer\DependencyResolver\Solver;
use Composer\DependencyResolver\SolverProblemsException;
use Composer\Package\Link;
use Composer\Package\LinkConstraint\VersionConstraint;
use Composer\Test\TestCase;
class SolverTest extends TestCase

2
tests/Composer/Test/Downloader/ArchiveDownloaderTest.php
View File

@ -12,8 +12,6 @@
namespace Composer\Test\Downloader;
use Composer\Util\Filesystem;
class ArchiveDownloaderTest extends \PHPUnit_Framework_TestCase
{
public function testGetFileName()

6
tests/Composer/Test/Downloader/FileDownloaderTest.php
View File

@ -21,6 +21,7 @@ class FileDownloaderTest extends \PHPUnit_Framework_TestCase
{
$io = $io ?: $this->getMock('Composer\IO\IOInterface');
$rfs = $rfs ?: $this->getMockBuilder('Composer\Util\RemoteFilesystem')->disableOriginalConstructor()->getMock();
return new FileDownloader($io, $rfs);
}
@ -96,6 +97,7 @@ class FileDownloaderTest extends \PHPUnit_Framework_TestCase
if (is_file($path.'/script.js')) {
unlink($path.'/script.js');
}
return $messages;
}))
;
@ -108,7 +110,7 @@ class FileDownloaderTest extends \PHPUnit_Framework_TestCase
if (is_dir($path)) {
$fs = new Filesystem();
$fs->removeDirectory($path);
} else if (is_file($path)) {
} elseif (is_file($path)) {
unset($path);
}
@ -146,7 +148,7 @@ class FileDownloaderTest extends \PHPUnit_Framework_TestCase
if (is_dir($path)) {
$fs = new Filesystem();
$fs->removeDirectory($path);
} else if (is_file($path)) {
} elseif (is_file($path)) {
unset($path);
}

1
tests/Composer/Test/Downloader/ZipDownloaderTest.php
View File

@ -12,7 +12,6 @@
namespace Composer\Test\Downloader;
use Composer\Util\Filesystem;
use Composer\Downloader\ZipDownloader;
class ZipDownloaderTest extends \PHPUnit_Framework_TestCase

1
tests/Composer/Test/FactoryTest.php
View File

@ -33,6 +33,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
{
$f = function() {
$repositories = func_get_args();
return array('repositories' => $repositories);
};

2
tests/Composer/Test/IO/NullIOTest.php
View File

@ -67,4 +67,4 @@ class NullIOTest extends TestCase
$this->assertEquals('foo', $io->askAndValidate('question', 'validator', false, 'foo'));
}
}
}

3
tests/Composer/Test/Installer/InstallerInstallerTest.php
View File

@ -147,6 +147,7 @@ class InstallerInstallerMock extends InstallerInstaller
public function getInstallPath(PackageInterface $package)
{
$version = $package->getVersion();
return __DIR__.'/Fixtures/installer-v'.$version[0].'/';
}
}
}

1
tests/Composer/Test/Installer/LibraryInstallerTest.php
View File

@ -13,7 +13,6 @@
namespace Composer\Test\Installer;
use Composer\Installer\LibraryInstaller;
use Composer\DependencyResolver\Operation;
use Composer\Util\Filesystem;
use Composer\Test\TestCase;

1
tests/Composer/Test/InstallerTest.php
View File

@ -17,7 +17,6 @@ use Composer\Config;
use Composer\Json\JsonFile;
use Composer\Repository\ArrayRepository;
use Composer\Repository\RepositoryManager;
use Composer\Repository\RepositoryInterface;
use Composer\Package\PackageInterface;
use Composer\Package\Link;
use Composer\Package\Locker;

1
tests/Composer/Test/Mock/InstallationManagerMock.php
View File

@ -13,7 +13,6 @@ namespace Composer\Test\Mock;
use Composer\Installer\InstallationManager;
use Composer\Repository\RepositoryInterface;
use Composer\DependencyResolver\Operation\OperationInterface;
use Composer\DependencyResolver\Operation\InstallOperation;
use Composer\DependencyResolver\Operation\UpdateOperation;
use Composer\DependencyResolver\Operation\UninstallOperation;

4
tests/Composer/Test/Package/LinkConstraint/VersionConstraintTest.php
View File

@ -16,7 +16,7 @@ use Composer\Package\LinkConstraint\VersionConstraint;
class VersionConstraintTest extends \PHPUnit_Framework_TestCase
{
static public function successfulVersionMatches()
public static function successfulVersionMatches()
{
return array(
// require provide
@ -41,7 +41,7 @@ class VersionConstraintTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($versionRequire->matches($versionProvide));
}
static public function failingVersionMatches()
public static function failingVersionMatches()
{
return array(
// require provide

5
tests/Composer/Test/Repository/PearRepositoryTest.php
View File

@ -12,7 +12,6 @@
namespace Composer\Repository;
use Composer\Repository\FilesystemRepository;
use Composer\Test\TestCase;
/**
@ -33,7 +32,7 @@ class PearRepositoryTest extends TestCase
/**
* @dataProvider repositoryDataProvider
* @param string $url
* @param array $expectedPackages
* @param array $expectedPackages
*/
public function testRepositoryRead($url, array $expectedPackages)
{
@ -126,4 +125,4 @@ class PearRepositoryTest extends TestCase
$this->repository = null;
$this->remoteFilesystem = null;
}
}
}

1
tests/Composer/Test/Repository/Vcs/SvnDriverTest.php
View File

@ -13,7 +13,6 @@
namespace Composer\Test\Repository\Vcs;
use Composer\Repository\Vcs\SvnDriver;
use Composer\IO\NullIO;
use Composer\Config;
class SvnDriverTest extends \PHPUnit_Framework_TestCase

3
tests/Composer/Test/Repository/VcsRepositoryTest.php
View File

@ -15,7 +15,6 @@ namespace Composer\Test\Repository;
use Symfony\Component\Process\ExecutableFinder;
use Composer\Package\Dumper\ArrayDumper;
use Composer\Repository\VcsRepository;
use Composer\Repository\Vcs\GitDriver;
use Composer\Util\Filesystem;
use Composer\Util\ProcessExecutor;
use Composer\IO\NullIO;
@ -37,10 +36,12 @@ class VcsRepositoryTest extends \PHPUnit_Framework_TestCase
$locator = new ExecutableFinder();
if (!$locator->find('git')) {
$this->skipped = 'This test needs a git binary in the PATH to be able to run';
return;
}
if (!mkdir(self::$gitRepo) || !chdir(self::$gitRepo)) {
$this->skipped = 'Could not create and move into the temp git repo '.self::$gitRepo;
return;
}

2
tests/Composer/Test/Script/EventDispatcherTest.php
View File

@ -56,4 +56,4 @@ class EventDispatcherTest extends TestCase
{
throw new \RuntimeException();
}
}
}

1
tests/Composer/Test/TestCase.php
View File

@ -49,6 +49,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
protected function getAliasPackage($package, $version)
{
$normVersion = self::getVersionParser()->normalize($version);
return new AliasPackage($package, $normVersion, $version);
}

1
tests/Composer/Test/Util/RemoteFilesystemTest.php
View File

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

2
tests/Composer/Test/Util/SpdxLicenseIdentifierTest.php
View File

@ -91,4 +91,4 @@ class SpdxLicenseIdentifierTest extends TestCase
$validator = new SpdxLicenseIdentifier();
$validator->validate($invalidArgument);
}
}
}

2
tests/Composer/Test/Util/SvnTest.php
View File

@ -46,4 +46,4 @@ class SvnTest
$svn->getCommand('svn ls', $url)
);
}
}
}