diff --git a/src/Composer/Command/SuggestsCommand.php b/src/Composer/Command/SuggestsCommand.php index 4bca2a71d..f3472d249 100644 --- a/src/Composer/Command/SuggestsCommand.php +++ b/src/Composer/Command/SuggestsCommand.php @@ -60,7 +60,7 @@ EOT // First assemble lookup list of packages that are installed, replaced or provided $installed = array(); - foreach($packages as $package) { + foreach ($packages as $package) { $installed[] = $package['name']; if (!empty($package['provide'])) { @@ -88,8 +88,9 @@ EOT continue; } foreach ($package['suggest'] as $suggestion => $reason) { - if (false === strpos('/', $suggestion) && !is_null($platform->findPackage($suggestion, '*'))) + if (false === strpos('/', $suggestion) && !is_null($platform->findPackage($suggestion, '*'))) { continue; + } if (!isset($installed[$suggestion])) { $suggesters[$packageName][$suggestion] = $reason; $suggested[$suggestion][$packageName] = $reason; @@ -114,6 +115,7 @@ EOT foreach (array_keys($suggested) as $suggestion) { $io->write(sprintf('%s', $suggestion)); } + return; } diff --git a/src/Composer/Downloader/DownloadManager.php b/src/Composer/Downloader/DownloadManager.php index 512379f2d..d18bb1ced 100644 --- a/src/Composer/Downloader/DownloadManager.php +++ b/src/Composer/Downloader/DownloadManager.php @@ -12,7 +12,6 @@ namespace Composer\Downloader; -use Composer\Config; use Composer\Package\PackageInterface; use Composer\IO\IOInterface; use Composer\Util\Filesystem; @@ -313,6 +312,7 @@ class DownloadManager if ('dist' === $preference || (!$package->isDev() && 'auto' === $preference)) { return 'dist'; } + return 'source'; } } diff --git a/src/Composer/Downloader/DvcsDownloaderInterface.php b/src/Composer/Downloader/DvcsDownloaderInterface.php index d27dcbcd1..7fbd4ee3e 100644 --- a/src/Composer/Downloader/DvcsDownloaderInterface.php +++ b/src/Composer/Downloader/DvcsDownloaderInterface.php @@ -25,7 +25,7 @@ interface DvcsDownloaderInterface * Checks for unpushed changes to a current branch * * @param PackageInterface $package package directory - * @param string $path package directory + * @param string $path package directory * @return string|null changes or null */ public function getUnpushedChanges(PackageInterface $package, $path); diff --git a/src/Composer/Downloader/PathDownloader.php b/src/Composer/Downloader/PathDownloader.php index afb3e5de3..29465df39 100644 --- a/src/Composer/Downloader/PathDownloader.php +++ b/src/Composer/Downloader/PathDownloader.php @@ -49,7 +49,7 @@ class PathDownloader extends FileDownloader } // Get the transport options with default values - $transportOptions = $package->getTransportOptions() + array('symlink'=>null); + $transportOptions = $package->getTransportOptions() + array('symlink' => null); // When symlink transport option is null, both symlink and mirror are allowed $currentStrategy = self::STRATEGY_SYMLINK; @@ -58,7 +58,7 @@ class PathDownloader extends FileDownloader if (true === $transportOptions['symlink']) { $currentStrategy = self::STRATEGY_SYMLINK; $allowedStrategies = array(self::STRATEGY_SYMLINK); - } elseif(false === $transportOptions['symlink']) { + } elseif (false === $transportOptions['symlink']) { $currentStrategy = self::STRATEGY_MIRROR; $allowedStrategies = array(self::STRATEGY_MIRROR); } diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php index 18a551748..a215f35eb 100644 --- a/src/Composer/Package/Loader/RootPackageLoader.php +++ b/src/Composer/Package/Loader/RootPackageLoader.php @@ -88,12 +88,12 @@ class RootPackageLoader extends ArrayLoader $config['source'] = array( 'type' => '', 'url' => '', - 'reference' => $commit + 'reference' => $commit, ); $config['dist'] = array( 'type' => '', 'url' => '', - 'reference' => $commit + 'reference' => $commit, ); } } diff --git a/src/Composer/Package/Version/VersionGuesser.php b/src/Composer/Package/Version/VersionGuesser.php index 709f647e0..e2f8d64dd 100644 --- a/src/Composer/Package/Version/VersionGuesser.php +++ b/src/Composer/Package/Version/VersionGuesser.php @@ -56,8 +56,8 @@ class VersionGuesser } /** - * @param array $packageConfig - * @param string $path Path to guess into + * @param array $packageConfig + * @param string $path Path to guess into * * @return array versionData, 'version' and 'commit' keys */ @@ -136,8 +136,8 @@ class VersionGuesser return $this->versionParser->normalize(trim($output)); } catch (\Exception $e) { } - } + return null; } @@ -236,9 +236,9 @@ class VersionGuesser } $version = $this->versionParser->normalize(trim($matches[1])); + return array('version' => $version, 'commit' => ''); } } } - } diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php index d0e951390..80881df90 100644 --- a/src/Composer/Util/Filesystem.php +++ b/src/Composer/Util/Filesystem.php @@ -639,6 +639,7 @@ class Filesystem * #define _S_IFREG 0x8000 */ $stat = lstat($junction); + return !($stat['mode'] & 0xC000); } diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php index 8a341ee5c..a69a10954 100644 --- a/src/Composer/Util/Perforce.php +++ b/src/Composer/Util/Perforce.php @@ -244,6 +244,7 @@ class Perforce return $value; } } + return null; } else { $command = 'echo $' . $name; diff --git a/tests/Composer/Test/Downloader/DownloadManagerTest.php b/tests/Composer/Test/Downloader/DownloadManagerTest.php index fa3e546d3..340717fbd 100644 --- a/tests/Composer/Test/Downloader/DownloadManagerTest.php +++ b/tests/Composer/Test/Downloader/DownloadManagerTest.php @@ -842,7 +842,7 @@ class DownloadManagerTest extends \PHPUnit_Framework_TestCase $manager->download($package, 'target_dir'); } - + /** * @covers Composer\Downloader\DownloadManager::resolvePackageInstallPreference */