Przeglądaj źródła

Fix undefined var error, fixes #2241

Jordi Boggiano 11 lat temu
rodzic
commit
0eb2821733
1 zmienionych plików z 4 dodań i 4 usunięć
  1. 4 4
      src/Composer/Command/ShowCommand.php

+ 4 - 4
src/Composer/Command/ShowCommand.php

@@ -68,8 +68,9 @@ EOT
         // init repos
         // init repos
         $platformRepo = new PlatformRepository;
         $platformRepo = new PlatformRepository;
 
 
+        $composer = $this->getComposer(false);
         if ($input->getOption('self')) {
         if ($input->getOption('self')) {
-            $package = $this->getComposer(false)->getPackage();
+            $package = $this->getComposer()->getPackage();
             $repos = $installedRepo = new ArrayRepository(array($package));
             $repos = $installedRepo = new ArrayRepository(array($package));
         } elseif ($input->getOption('platform')) {
         } elseif ($input->getOption('platform')) {
             $repos = $installedRepo = $platformRepo;
             $repos = $installedRepo = $platformRepo;
@@ -77,15 +78,14 @@ EOT
             $repos = $installedRepo = $this->getComposer()->getRepositoryManager()->getLocalRepository();
             $repos = $installedRepo = $this->getComposer()->getRepositoryManager()->getLocalRepository();
         } elseif ($input->getOption('available')) {
         } elseif ($input->getOption('available')) {
             $installedRepo = $platformRepo;
             $installedRepo = $platformRepo;
-            if ($composer = $this->getComposer(false)) {
+            if ($composer) {
                 $repos = new CompositeRepository($composer->getRepositoryManager()->getRepositories());
                 $repos = new CompositeRepository($composer->getRepositoryManager()->getRepositories());
             } else {
             } else {
                 $defaultRepos = Factory::createDefaultRepositories($this->getIO());
                 $defaultRepos = Factory::createDefaultRepositories($this->getIO());
                 $repos = new CompositeRepository($defaultRepos);
                 $repos = new CompositeRepository($defaultRepos);
                 $output->writeln('No composer.json found in the current directory, showing available packages from ' . implode(', ', array_keys($defaultRepos)));
                 $output->writeln('No composer.json found in the current directory, showing available packages from ' . implode(', ', array_keys($defaultRepos)));
             }
             }
-        } elseif ($composer = $this->getComposer(false)) {
-            $composer = $this->getComposer();
+        } elseif ($composer) {
             $localRepo = $composer->getRepositoryManager()->getLocalRepository();
             $localRepo = $composer->getRepositoryManager()->getLocalRepository();
             $installedRepo = new CompositeRepository(array($localRepo, $platformRepo));
             $installedRepo = new CompositeRepository(array($localRepo, $platformRepo));
             $repos = new CompositeRepository(array_merge(array($installedRepo), $composer->getRepositoryManager()->getRepositories()));
             $repos = new CompositeRepository(array_merge(array($installedRepo), $composer->getRepositoryManager()->getRepositories()));