1
0
Fork 0
pull/1008/merge
Jordi Boggiano 2012-08-18 16:18:41 +02:00
parent ef1f8a605f
commit ef637c8f1a
11 changed files with 17 additions and 16 deletions

View File

@ -312,6 +312,7 @@ EOF;
// path starts with vendor dir // path starts with vendor dir
return $vendorPath . substr($path, strlen($relVendorPath)); return $vendorPath . substr($path, strlen($relVendorPath));
} }
return strtr(getcwd(), '\\', '/').'/'.$path; return strtr(getcwd(), '\\', '/').'/'.$path;
} }
@ -407,6 +408,7 @@ REGISTER_AUTOLOAD;
$file .= <<<METHOD_FOOTER $file .= <<<METHOD_FOOTER
\$loader->register(); \$loader->register();
$filesCode $filesCode
return \$loader; return \$loader;
} }

View File

@ -40,8 +40,8 @@ class ClassMapGenerator
/** /**
* Iterate over all files in the given directory searching for classes * Iterate over all files in the given directory searching for classes
* *
* @param Iterator|string $dir The directory to search in or an iterator * @param Iterator|string $dir The directory to search in or an iterator
* @param string $whitelist Regex that matches against the file path * @param string $whitelist Regex that matches against the file path
* *
* @return array A class map array * @return array A class map array
*/ */

View File

@ -13,7 +13,6 @@
namespace Composer\Command; namespace Composer\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Composer\Downloader\VcsDownloader; use Composer\Downloader\VcsDownloader;

View File

@ -146,8 +146,8 @@ class DefaultPolicy implements PolicyInterface
* Replace constraints are ignored. This method should only be used for * Replace constraints are ignored. This method should only be used for
* prioritisation, not for actual constraint verification. * prioritisation, not for actual constraint verification.
* *
* @param PackageInterface $source * @param PackageInterface $source
* @param PackageInterface $target * @param PackageInterface $target
* @return bool * @return bool
*/ */
protected function replaces(PackageInterface $source, PackageInterface $target) protected function replaces(PackageInterface $source, PackageInterface $target)

View File

@ -524,7 +524,7 @@ class Solver
if (!$job) { if (!$job) {
$why->disable(); $why->disable();
return; return;
} }

View File

@ -30,8 +30,8 @@ class DownloadManager
/** /**
* Initializes download manager. * Initializes download manager.
* *
* @param bool $preferSource prefer downloading from source * @param bool $preferSource prefer downloading from source
* @param Filesystem|null $filesystem custom Filesystem object * @param Filesystem|null $filesystem custom Filesystem object
*/ */
public function __construct($preferSource = false, Filesystem $filesystem = null) public function __construct($preferSource = false, Filesystem $filesystem = null)
{ {

View File

@ -154,16 +154,16 @@ abstract class VcsDownloader implements DownloaderInterface
* Checks for changes to the local copy * Checks for changes to the local copy
* *
* @param string $path package directory * @param string $path package directory
* @return string|null changes or null * @return string|null changes or null
*/ */
abstract public function getLocalChanges($path); abstract public function getLocalChanges($path);
/** /**
* Fetches the commit logs between two commits * Fetches the commit logs between two commits
* *
* @param string $fromReference the source reference * @param string $fromReference the source reference
* @param string $toReference the target reference * @param string $toReference the target reference
* @param string $path the package path * @param string $path the package path
* @return string * @return string
*/ */
abstract protected function getCommitLogs($fromReference, $toReference, $path); abstract protected function getCommitLogs($fromReference, $toReference, $path);

View File

@ -56,7 +56,7 @@ class InstallationManager
public function disableCustomInstallers() public function disableCustomInstallers()
{ {
foreach ($this->installers as $i => $installer) { foreach ($this->installers as $i => $installer) {
if ( ! $installer instanceof InstallerInstaller) { if (!$installer instanceof InstallerInstaller) {
continue; continue;
} }

View File

@ -27,7 +27,7 @@ class JsonLoader
} }
/** /**
* @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 * @return \Composer\Package\PackageInterface
*/ */
public function load($json) public function load($json)

View File

@ -22,7 +22,7 @@ interface LoaderInterface
/** /**
* Converts a package from an array to a real instance * Converts a package from an array to a real instance
* *
* @param array $package Package config * @param array $package Package config
* @return \Composer\Package\PackageInterface * @return \Composer\Package\PackageInterface
*/ */
public function load(array $package); public function load(array $package);

View File

@ -76,7 +76,7 @@ class Filesystem
return; 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));
} }
} }