Skip to content

Commit

Permalink
fix drone errors after joomla#17481
Browse files Browse the repository at this point in the history
  • Loading branch information
zero-24 committed Aug 13, 2017
1 parent 81dc289 commit a727cac
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions libraries/src/Updater/Adapter/ExtensionAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,10 @@ 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 = !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;
$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)
Expand Down
7 changes: 5 additions & 2 deletions libraries/src/Updater/Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,11 @@ 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)
*/
$patchVersion = $this->get('jversion.dev_level', Version::PATCH_VERSION);
$patchMinimumSupported = !isset($this->currentUpdate->targetplatform->min_dev_level) || $patchVersion >= $this->currentUpdate->targetplatform->min_dev_level;
$patchMaximumSupported = !isset($this->currentUpdate->targetplatform->max_dev_level) || $patchVersion <= $this->currentUpdate->targetplatform->max_dev_level;
$patchMinimumSupported = !isset($this->currentUpdate->targetplatform->min_dev_level)
|| $patchVersion >= $this->currentUpdate->targetplatform->min_dev_level;

$patchMaximumSupported = !isset($this->currentUpdate->targetplatform->max_dev_level)
|| $patchVersion <= $this->currentUpdate->targetplatform->max_dev_level;

if (isset($this->currentUpdate->targetplatform->name)
&& $product == $this->currentUpdate->targetplatform->name
Expand Down

0 comments on commit a727cac

Please sign in to comment.