Permalink
Browse files

CS fixes

  • Loading branch information...
1 parent ef1f8a6 commit ef637c8f1a894157e2f012ad3571183f12fde19f @Seldaek Seldaek committed Aug 18, 2012
@@ -312,6 +312,7 @@ protected function getPath(Filesystem $filesystem, $relVendorPath, $vendorPath,
// path starts with vendor dir
return $vendorPath . substr($path, strlen($relVendorPath));
}
+
return strtr(getcwd(), '\\', '/').'/'.$path;
}
@@ -407,6 +408,7 @@ public static function getLoader()
$file .= <<<METHOD_FOOTER
\$loader->register();
$filesCode
+
return \$loader;
}
@@ -40,8 +40,8 @@ public static function dump($dirs, $file)
/**
* Iterate over all files in the given directory searching for classes
*
- * @param Iterator|string $dir The directory to search in or an iterator
- * @param string $whitelist Regex that matches against the file path
+ * @param Iterator|string $dir The directory to search in or an iterator
+ * @param string $whitelist Regex that matches against the file path
*
* @return array A class map array
*/
@@ -13,7 +13,6 @@
namespace Composer\Command;
use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Composer\Downloader\VcsDownloader;
@@ -146,8 +146,8 @@ public function compareByPriorityPreferInstalled(Pool $pool, array $installedMap
* Replace constraints are ignored. This method should only be used for
* prioritisation, not for actual constraint verification.
*
- * @param PackageInterface $source
- * @param PackageInterface $target
+ * @param PackageInterface $source
+ * @param PackageInterface $target
* @return bool
*/
protected function replaces(PackageInterface $source, PackageInterface $target)
@@ -524,7 +524,7 @@ private function disableProblem($why)
if (!$job) {
$why->disable();
-
+
return;
}
@@ -30,8 +30,8 @@ class DownloadManager
/**
* Initializes download manager.
*
- * @param bool $preferSource prefer downloading from source
- * @param Filesystem|null $filesystem custom Filesystem object
+ * @param bool $preferSource prefer downloading from source
+ * @param Filesystem|null $filesystem custom Filesystem object
*/
public function __construct($preferSource = false, Filesystem $filesystem = null)
{
@@ -154,16 +154,16 @@ protected function enforceCleanDirectory($path)
* Checks for changes to the local copy
*
* @param string $path package directory
- * @return string|null changes or null
+ * @return string|null changes or null
*/
abstract public function getLocalChanges($path);
/**
* Fetches the commit logs between two commits
*
- * @param string $fromReference the source reference
- * @param string $toReference the target reference
- * @param string $path the package path
+ * @param string $fromReference the source reference
+ * @param string $toReference the target reference
+ * @param string $path the package path
* @return string
*/
abstract protected function getCommitLogs($fromReference, $toReference, $path);
@@ -56,7 +56,7 @@ public function addInstaller(InstallerInterface $installer)
public function disableCustomInstallers()
{
foreach ($this->installers as $i => $installer) {
- if ( ! $installer instanceof InstallerInstaller) {
+ if (!$installer instanceof InstallerInstaller) {
continue;
}
@@ -27,7 +27,7 @@ public function __construct(LoaderInterface $loader)
}
/**
- * @param string|JsonFile $json A filename, json string or JsonFile instance to load the package from
+ * @param string|JsonFile $json A filename, json string or JsonFile instance to load the package from
* @return \Composer\Package\PackageInterface
*/
public function load($json)
@@ -22,7 +22,7 @@
/**
* Converts a package from an array to a real instance
*
- * @param array $package Package config
+ * @param array $package Package config
* @return \Composer\Package\PackageInterface
*/
public function load(array $package);
@@ -76,7 +76,7 @@ public function rename($source, $target)
return;
}
- throw new \RuntimeException(sprintf('Could not rename "%s" to "%s".', $source, $target));
+ throw new \RuntimeException(sprintf('Could not rename "%s" to "%s".', $source, $target));
}
}

0 comments on commit ef637c8

Please sign in to comment.