Jordi Boggiano 9 years ago
parent
commit
0ed5b541a9

+ 4 - 2
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('<info>%s</info>', $suggestion));
             }
+
             return;
         }
 

+ 1 - 1
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';
             }
         }

+ 1 - 1
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);

+ 2 - 2
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);
         }

+ 2 - 2
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,
                 );
             }
         }

+ 4 - 4
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' => '');
             }
         }
     }
-
 }

+ 1 - 0
src/Composer/Util/Filesystem.php

@@ -639,6 +639,7 @@ class Filesystem
          * #define	_S_IFREG	0x8000
          */
         $stat = lstat($junction);
+
         return !($stat['mode'] & 0xC000);
     }
 

+ 1 - 0
src/Composer/Util/Perforce.php

@@ -244,6 +244,7 @@ class Perforce
                     return $value;
                 }
             }
+
             return null;
         } else {
             $command = 'echo $' . $name;

+ 1 - 1
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
      */