show install and composer version

CradlePHP · Apr 19, 2018 · 57ac351 · 57ac351
1 parent eda2571
commit 57ac351
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/controller.php b/src/controller.php
@@ -26,6 +26,23 @@
     // get the package config
     $config = $this->package('global')->config('packages');
 
+    // load composer lock
+    $composerLock = json_decode(
+        file_get_contents(
+            $this->package('global')->path('root') . '/composer.lock'
+        ),
+        true
+    );
+
+    // available composer packages
+    $composerPackages = [];
+
+    // iterate on each package on lock file
+    foreach($composerLock['packages'] as $composerPackage) {
+        // get the composer package name and version
+        $composerPackages[$composerPackage['name']] = $composerPackage['version'];
+    }
+
     // set package list action
     $request->setStage(0, 'list');
     // we just only need the data
@@ -114,6 +131,13 @@
                     unset($composer['type']);
                 }
 
+                // get composer installed version
+                $packages[$key]['composer_version'] = null;
+
+                if (isset($composerPackages[$key])) {
+                    $packages[$key]['composer_version'] = $composerPackages[$key];
+                }
+
                 // merge composer data
                 $packages[$key] = array_merge($packages[$key], $composer);
             }

diff --git a/src/template/package.html b/src/template/package.html
@@ -47,7 +47,8 @@ <h3 class="main-title">
                     <tr>
                         <th>Actions</th>
                         <th>Name</th>
-                        <th>Version</th>
+                        <th>Install Version</th>
+                        <th>Composer Version</th>
                         <th>Type</th>
                         <th>Last Status</th>
                     </tr>
@@ -120,6 +121,13 @@ <h3 class="main-title">
                                     Not Available
                                 {{/if}}
                             </td>
+                            <td>
+                                {{#if composer_version}}
+                                    {{composer_version}}
+                                {{else}}
+                                    Not Available
+                                {{/if}}
+                            </td>
                             <td>
                                 <span
                                     {{#when type '===' 'root'}}