Permalink
Browse files

Merge pull request #799 from lyrixx/psr

Fixed PSR rules
  • Loading branch information...
Seldaek committed Jun 14, 2012
2 parents 330f56c + f4e9dd4 commit 6f33d4e17f527a1e328095d49be07da4e5aedc8a
@@ -4,7 +4,8 @@
}
- class CFoo {
+ class CFoo
+ {
use TFoo;
}
}
@@ -22,7 +23,8 @@ class CFoo {
}
- class CBar implements IBar {
+ class CBar implements IBar
+ {
use TBar, TFooBar;
}
}
@@ -59,4 +59,4 @@ public function testSetGetInstallationManager()
$this->assertSame($manager, $composer->getInstallationManager());
}
-}
+}
@@ -15,7 +15,6 @@
use Composer\DependencyResolver\Request;
use Composer\DependencyResolver\Pool;
use Composer\Repository\ArrayRepository;
-use Composer\DependencyResolver\Literal;
use Composer\Test\TestCase;
class RequestTest extends TestCase
@@ -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
@@ -12,8 +12,6 @@
namespace Composer\Test\Downloader;
-use Composer\Util\Filesystem;
-
class ArchiveDownloaderTest extends \PHPUnit_Framework_TestCase
{
public function testGetFileName()
@@ -21,6 +21,7 @@ protected function getDownloader($io = null, $rfs = null)
{
$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 @@ public function testDownloadButFileIsUnsaved()
if (is_file($path.'/script.js')) {
unlink($path.'/script.js');
}
+
return $messages;
}))
;
@@ -108,7 +110,7 @@ public function testDownloadButFileIsUnsaved()
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 @@ public function testDownloadFileWithInvalidChecksum()
if (is_dir($path)) {
$fs = new Filesystem();
$fs->removeDirectory($path);
- } else if (is_file($path)) {
+ } elseif (is_file($path)) {
unset($path);
}
@@ -12,7 +12,6 @@
namespace Composer\Test\Downloader;
-use Composer\Util\Filesystem;
use Composer\Downloader\ZipDownloader;
class ZipDownloaderTest extends \PHPUnit_Framework_TestCase
@@ -33,6 +33,7 @@ public function dataAddPackagistRepository()
{
$f = function() {
$repositories = func_get_args();
+
return array('repositories' => $repositories);
};
@@ -67,4 +67,4 @@ public function testAskAndValidate()
$this->assertEquals('foo', $io->askAndValidate('question', 'validator', false, 'foo'));
}
-}
+}
@@ -147,6 +147,7 @@ class InstallerInstallerMock extends InstallerInstaller
public function getInstallPath(PackageInterface $package)
{
$version = $package->getVersion();
+
return __DIR__.'/Fixtures/installer-v'.$version[0].'/';
}
-}
+}
@@ -13,7 +13,6 @@
namespace Composer\Test\Installer;
use Composer\Installer\LibraryInstaller;
-use Composer\DependencyResolver\Operation;
use Composer\Util\Filesystem;
use Composer\Test\TestCase;
@@ -17,7 +17,6 @@
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;
@@ -13,7 +13,6 @@
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;
@@ -16,7 +16,7 @@
class VersionConstraintTest extends \PHPUnit_Framework_TestCase
{
- static public function successfulVersionMatches()
+ public static function successfulVersionMatches()
{
return array(
// require provide
@@ -41,7 +41,7 @@ public function testVersionMatchSucceeds($requireOperator, $requireVersion, $pro
$this->assertTrue($versionRequire->matches($versionProvide));
}
- static public function failingVersionMatches()
+ public static function failingVersionMatches()
{
return array(
// require provide
@@ -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 @@ protected function tearDown()
$this->repository = null;
$this->remoteFilesystem = null;
}
-}
+}
@@ -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
@@ -15,7 +15,6 @@
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 @@ protected function initialize()
$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;
}
@@ -56,4 +56,4 @@ public static function call()
{
throw new \RuntimeException();
}
-}
+}
@@ -49,6 +49,7 @@ protected function getPackage($name, $version)
protected function getAliasPackage($package, $version)
{
$normVersion = self::getVersionParser()->normalize($version);
+
return new AliasPackage($package, $normVersion, $version);
}
@@ -13,7 +13,6 @@
namespace Composer\Test\Util;
use Composer\Util\RemoteFilesystem;
-use Composer\Test\TestCase;
class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
{
@@ -91,4 +91,4 @@ public function testInvalidArgument($invalidArgument)
$validator = new SpdxLicenseIdentifier();
$validator->validate($invalidArgument);
}
-}
+}
@@ -46,4 +46,4 @@ public function testInteractiveString()
$svn->getCommand('svn ls', $url)
);
}
-}
+}

0 comments on commit 6f33d4e

Please sign in to comment.