Added support for php dependencies in GPM blueprints

getgrav · Feb 17, 2018 · ccf0f9c · ccf0f9c
1 parent 79e580a
commit ccf0f9c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#new)
     * Added `Grav\Framework\Uri` classes extending PSR-7 `HTTP message UriInterface` implementation
+    * Added ability to have `php` version dependencies in GPM assets
 
 # v1.4.0-rc.2
 ## 02/15/2018

diff --git a/system/src/Grav/Common/GPM/GPM.php b/system/src/Grav/Common/GPM/GPM.php
@@ -719,8 +719,8 @@ public function getPackagesThatDependOnPackage($slug)
         foreach ($packages as $package_name => $package) {
             if (isset($package['dependencies'])) {
                 foreach ($package['dependencies'] as $dependency) {
-                    if (is_array($dependency)) {
-                        $dependency = array_keys($dependency)[0];
+                    if (is_array($dependency) && isset($dependency['name'])) {
+                        $dependency = $dependency['name'];
                     }
 
                     if ($dependency == $slug) {
@@ -835,6 +835,20 @@ public function getDependencies($packages)
                 continue;
             }
 
+            // Check PHP version
+            if ($dependency_slug == 'php') {
+                $current_php_version = phpversion();
+                if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
+                        $current_php_version) === 1
+                ) {
+                    //Needs a Grav update first
+                    throw new \Exception("<red>One of the packages require PHP " . $dependencies['php'] . ". Please update PHP to resolve this");
+                } else {
+                    unset($dependencies[$dependency_slug]);
+                    continue;
+                }
+            }
+
             //First, check for Grav dependency. If a dependency requires Grav > the current version, abort and tell.
             if ($dependency_slug == 'grav') {
                 if (version_compare($this->calculateVersionNumberFromDependencyVersion($dependencyVersionWithOperator),
@@ -1062,9 +1076,9 @@ public function calculateVersionNumberFromDependencyVersion($version)
         } elseif ($version == '') {
             return null;
         } elseif ($this->versionFormatIsNextSignificantRelease($version)) {
-            return substr($version, 1);
+            return trim(substr($version, 1));
         } elseif ($this->versionFormatIsEqualOrHigher($version)) {
-            return substr($version, 2);
+            return trim(substr($version, 2));
         } else {
             return $version;
         }

diff --git a/system/src/Grav/Console/Gpm/UninstallCommand.php b/system/src/Grav/Console/Gpm/UninstallCommand.php
@@ -185,7 +185,7 @@ private function uninstallPackage($slug, $package, $is_dependency = false)
                 if (is_array($dependency)) {
                     $dependency = $dependency['name'];
                 }
-                if ($dependency === 'grav') {
+                if ($dependency === 'grav' || $dependency === 'php') {
                     continue;
                 }