From 68a183c05ce308f91c640a48bb721f0ed69ae5a2 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Wed, 9 Mar 2016 19:40:23 +0100 Subject: [PATCH] getDependenciesNeededToInstall accepts an array to ease transition to handling multiple packages --- classes/admin.php | 9 +++++---- classes/controller.php | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/classes/admin.php b/classes/admin.php index 3a348291..5884717a 100644 --- a/classes/admin.php +++ b/classes/admin.php @@ -523,21 +523,22 @@ class Admin } /** - * Get an array of dependencies needed to be installed or updated for a package + * Get an array of dependencies needed to be installed or updated for a list of packages * to be installed. * - * @param string $slug The package slug + * @param array $packages The packages slugs * * @return array|bool */ - public function getDependenciesNeededToInstall($slug) + public function getDependenciesNeededToInstall($packages) { $gpm = $this->gpm(); if (!$gpm) { return false; } - $dependencies = $this->gpm->getDependencies([$slug]); + $dependencies = $this->gpm->getDependencies($packages); + return $dependencies; } diff --git a/classes/controller.php b/classes/controller.php index 44413719..cd561cbd 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -266,7 +266,7 @@ class AdminController $data = $this->post; $package = isset($data['package']) ? $data['package'] : ''; - $dependencies = $this->admin->getDependenciesNeededToInstall($package); + $dependencies = $this->admin->getDependenciesNeededToInstall([$package]); $this->admin->json_response = ['status' => 'success', 'dependencies' => $dependencies]; @@ -286,7 +286,7 @@ class AdminController require_once __DIR__ . '/gpm.php'; - $dependencies = $this->admin->getDependenciesNeededToInstall($package); + $dependencies = $this->admin->getDependenciesNeededToInstall([$package]); $result = \Grav\Plugin\Admin\Gpm::install(array_keys($dependencies), ['theme' => ($type == 'theme')]);