From 4441d5e5fba9d0547c8d9e814e65a0f76c8dfae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mudr=C3=A1k?= <david@moodle.com>
Date: Mon, 5 Oct 2015 11:23:06 +0200
Subject: [PATCH] MDL-49329 admin: Fix report on required core version in
 missing plugins

If the plugin was missing from disk, the required core version was
displayed as "Moodle {$a}" because the core dependency resolver always
returns an object.
---
 lib/classes/plugin_manager.php    |  5 +++++
 lib/tests/plugin_manager_test.php | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/classes/plugin_manager.php b/lib/classes/plugin_manager.php
index eddce7d5692..6c589a9ec44 100644
--- a/lib/classes/plugin_manager.php
+++ b/lib/classes/plugin_manager.php
@@ -794,6 +794,11 @@ class core_plugin_manager {
     public function resolve_requirements(\core\plugininfo\base $plugin, $moodleversion=null, $moodlebranch=null) {
         global $CFG;
 
+        if ($plugin->versiondisk === null) {
+            // Missing from disk, we have no version.php to read from.
+            return array();
+        }
+
         if ($moodleversion === null) {
             $moodleversion = $CFG->version;
         }
diff --git a/lib/tests/plugin_manager_test.php b/lib/tests/plugin_manager_test.php
index 7a99108adf6..c551cb7b53b 100644
--- a/lib/tests/plugin_manager_test.php
+++ b/lib/tests/plugin_manager_test.php
@@ -350,6 +350,7 @@ class core_plugin_manager_testcase extends advanced_testcase {
         // Prepare a fake pluginfo instance.
         $pluginfo = testable_plugininfo_base::fake_plugin_instance('fake', '/dev/null', 'one', '/dev/null/fake',
             'testable_plugininfo_base', $pluginman);
+        $pluginfo->versiondisk = 2015060600;
 
         // Test no $plugin->requires is specified in version.php.
         $pluginfo->versionrequires = null;
@@ -409,6 +410,12 @@ class core_plugin_manager_testcase extends advanced_testcase {
         $pluginfo->dependencies = array('foo_bar' => 2025010100);
         $reqs = $pluginman->resolve_requirements($pluginfo, 2015110900, 30);
         $this->assertEquals($pluginman::REQUIREMENT_UNAVAILABLE, $reqs['foo_bar']->availability);
+
+        // Plugin missing from disk - no version.php available.
+        $pluginfo = testable_plugininfo_base::fake_plugin_instance('fake', '/dev/null', 'missing', '/dev/null/fake',
+            'testable_plugininfo_base', $pluginman);
+        $pluginfo->versiondisk = null;
+        $this->assertEmpty($pluginman->resolve_requirements($pluginfo, 2015110900, 30));
     }
 
     public function test_missing_dependencies() {
@@ -416,8 +423,11 @@ class core_plugin_manager_testcase extends advanced_testcase {
 
         $one = testable_plugininfo_base::fake_plugin_instance('fake', '/dev/null', 'one', '/dev/null/fake',
             'testable_plugininfo_base', $pluginman);
+        $one->versiondisk = 2015070800;
+
         $two = testable_plugininfo_base::fake_plugin_instance('fake', '/dev/null', 'two', '/dev/null/fake',
             'testable_plugininfo_base', $pluginman);
+        $two->versiondisk = 2015070900;
 
         $pluginman->inject_testable_plugininfo('fake', 'one', $one);
         $pluginman->inject_testable_plugininfo('fake', 'two', $two);