bf manage exception composer.json not exist

zendframework · Sep 13, 2013 · cdf23de · cdf23de
1 parent 7b6bafd
commit cdf23de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/module/ZfModule/src/ZfModule/Controller/IndexController.php b/module/ZfModule/src/ZfModule/Controller/IndexController.php
@@ -54,16 +54,17 @@ public function viewAction()
             $composerJson = $client->api('repos')->content($vendor, $module, 'composer.json');
             $composerConf = json_decode($composerJson);
             $composerConf = base64_decode($composerConf->content);
+            $composerConf = json_decode($composerConf, true);
         } catch(\Exception $e) {
-            $composerConf = 'No license file found for this Module';
+            $composerConf = 'No composer.json file found for this Module';
         }
 
         $viewModel = new ViewModel(array(
             'vendor' => $vendor,
             'module' => $module,
             'repository' => $repository,
             'readme' => base64_decode($readme->content),
-            'composerConf' => json_decode($composerConf, true),
+            'composerConf' => $composerConf,
             'license' => $license,
         ));
 

diff --git a/module/ZfModule/view/zf-module/index/view.phtml b/module/ZfModule/view/zf-module/index/view.phtml
@@ -14,7 +14,12 @@
                 <?php echo  $this->markdown($this->readme);?>
             </div>
             <div class="tab-pane" id="composer">
-                <?php echo $this->composerView($this->composerConf);?>
+                <?php if(is_array($composerConf)){
+                    echo $this->composerView($this->composerConf);
+                } else {
+                    echo $this->composerConf;
+                }
+                ?>
             </div>
             <div class="tab-pane" id="license">
                 <?php echo  $license;?>