From fcc178b05c8679838064ee4b39cbbf4553e679e3 Mon Sep 17 00:00:00 2001 From: Jean-Marie Simonet Date: Fri, 11 Aug 2017 08:36:41 +0200 Subject: [PATCH] Solving Notices when looking for updates --- libraries/src/Updater/Adapter/ExtensionAdapter.php | 8 ++++---- libraries/src/Updater/Update.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php index 63e3043704d9e..b6d645efa51db 100644 --- a/libraries/src/Updater/Adapter/ExtensionAdapter.php +++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php @@ -124,13 +124,13 @@ protected function _endElement($parser, $name) * * Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1) */ - $patchMinimumSupported = Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->min_dev_level; - $patchMaximumSupported = Version::PATCH_VERSION <= $this->currentUpdate->targetplatform->max_dev_level; + $patchMinimumSupported = !isset($this->currentUpdate->targetplatform->min_dev_level) || Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->min_dev_level; + $patchMaximumSupported = !isset($this->currentUpdate->targetplatform->max_dev_level) || Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->max_dev_level; if ($product == $this->currentUpdate->targetplatform['NAME'] && preg_match('/^' . $this->currentUpdate->targetplatform['VERSION'] . '/', JVERSION) - && ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $patchMinimumSupported) - && ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $patchMaximumSupported)) + && $patchMinimumSupported + && $patchMaximumSupported) { // Check if PHP version supported via tag, assume true if tag isn't present if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum, '>=')) diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php index 5a3dfb05f00bf..d342f84917fbf 100644 --- a/libraries/src/Updater/Update.php +++ b/libraries/src/Updater/Update.php @@ -323,14 +323,14 @@ public function _endElement($parser, $name) * * Check for optional min_dev_level and max_dev_level attributes to further specify targetplatform (e.g., 3.0.1) */ - $patchMinimumSupported = $this->get('jversion.dev_level', Version::PATCH_VERSION) >= $this->currentUpdate->targetplatform->min_dev_level; - $patchMaximumSupported = $this->get('jversion.dev_level', Version::PATCH_VERSION) <= $this->currentUpdate->targetplatform->max_dev_level; + $patchMinimumSupported = !isset($this->currentUpdate->targetplatform->min_dev_level) || Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->min_dev_level; + $patchMaximumSupported = !isset($this->currentUpdate->targetplatform->max_dev_level) || Version::PATCH_VERSION >= $this->currentUpdate->targetplatform->max_dev_level; if (isset($this->currentUpdate->targetplatform->name) && $product == $this->currentUpdate->targetplatform->name && preg_match('/^' . $this->currentUpdate->targetplatform->version . '/', $this->get('jversion.full', JVERSION)) - && ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $patchMinimumSupported) - && ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $patchMaximumSupported)) + && $patchMinimumSupported + && $patchMaximumSupported) { $phpMatch = false;