Browse Source

Add support for info/warnings in every json file loaded by ComposerRepo

Jordi Boggiano 8 years ago
parent
commit
11ce391222
1 changed files with 14 additions and 4 deletions
  1. 14 4
      src/Composer/Repository/ComposerRepository.php

+ 14 - 4
src/Composer/Repository/ComposerRepository.php

@@ -502,10 +502,6 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
             }
         }
 
-        if (!empty($data['warning'])) {
-            $this->io->writeError('<warning>Warning from '.$this->url.': '.$data['warning'].'</warning>');
-        }
-
         if (!empty($data['providers-lazy-url'])) {
             $this->lazyProvidersUrl = $this->canonicalizeUrl($data['providers-lazy-url']);
             $this->hasProviders = true;
@@ -682,6 +678,13 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
                 }
 
                 $data = JsonFile::parseJson($json, $filename);
+                if (!empty($data['warning'])) {
+                    $this->io->writeError('<warning>Warning from '.$this->url.': '.$data['warning'].'</warning>');
+                }
+                if (!empty($data['info'])) {
+                    $this->io->writeError('<info>Info from '.$this->url.': '.$data['info'].'</info>');
+                }
+
                 if ($cacheKey) {
                     if ($storeLastModifiedTime) {
                         $lastModifiedDate = $rfs->findHeaderValue($rfs->getLastHeaders(), 'last-modified');
@@ -745,6 +748,13 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
                 }
 
                 $data = JsonFile::parseJson($json, $filename);
+                if (!empty($data['warning'])) {
+                    $this->io->writeError('<warning>Warning from '.$this->url.': '.$data['warning'].'</warning>');
+                }
+                if (!empty($data['info'])) {
+                    $this->io->writeError('<info>Info from '.$this->url.': '.$data['info'].'</info>');
+                }
+
                 $lastModifiedDate = $rfs->findHeaderValue($rfs->getLastHeaders(), 'last-modified');
                 if ($lastModifiedDate) {
                     $data['last-modified'] = $lastModifiedDate;