joomla/patchtester
33
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2025-02-03 04:18:25 +00:00
Code Issues Releases Activity

Added gate way to prevent reverting ci applied pulls with git option. Now they will be removed by ci automatically.

Browse Source
This commit is contained in:
datsepp 2019-09-12 15:25:46 +02:00
parent 4ffb145b61
commit f9eb75c1b7
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
administrator/components/com_patchtester/PatchTester/Model/PullModel.php
View File

@ -156,8 +156,7 @@ class PullModel extends AbstractModel
$params = ComponentHelper::getParams('com_patchtester'); $params = ComponentHelper::getParams('com_patchtester');
// Decide based on repository settings whether patch will be applied through Github or CIServer // Decide based on repository settings whether patch will be applied through Github or CIServer
if ((bool) $params->get('ci_switch', 1) && $params->get('repo', 'joomla-cms') === 'joomla-cms' if ((bool) $params->get('ci_switch', 1))
&& $params->get('org', 'joomla') === 'joomla')
{ {
return $this->applyWithCIServer($id); return $this->applyWithCIServer($id);
} }
@ -586,8 +585,7 @@ class PullModel extends AbstractModel
$params = ComponentHelper::getParams('com_patchtester'); $params = ComponentHelper::getParams('com_patchtester');
// Decide based on repository settings whether patch will be applied through Github or CIServer // Decide based on repository settings whether patch will be applied through Github or CIServer
if ((bool) $params->get('ci_switch', 1) && $params->get('repo', 'joomla-cms') === 'joomla-cms' if ((bool) $params->get('ci_switch', 1) || $id === $this->getPatchChain($id)->insert_id)
&& $params->get('org', 'joomla') === 'joomla')
{ {
return $this->revertWithCIServer($id); return $this->revertWithCIServer($id);
} }
@ -615,7 +613,7 @@ class PullModel extends AbstractModel
$testRecord = $this->getTestRecord($id); $testRecord = $this->getTestRecord($id);
// Get PatchChain as array, remove any EOL set by php // Get PatchChain as array, remove any EOL set by php
$patchChain = $this->getLastChain(); $patchChain = $this->getPatchChain(-1);
// Allow only reverts in order of the patch chain // Allow only reverts in order of the patch chain
if ($patchChain->insert_id != $id) if ($patchChain->insert_id != $id)
@ -862,7 +860,7 @@ class PullModel extends AbstractModel
* *
* @since 3.0 * @since 3.0
*/ */
private function getPatchChain() private function getPatchChains()
{ {
$db = $this->getDb(); $db = $this->getDb();
@ -877,22 +875,39 @@ class PullModel extends AbstractModel
} }
/** /**
* Returns the last value of the ci patch chain * Returns a chain by specific value, returns the last
* element on $id = -1 and the first on $id = null
*
* @param integer $id specific id of a pull
* *
* @return stdClass $chain last chain of the table * @return stdClass $chain last chain of the table
* *
* @since 3.0.0 * @since 3.0.0
*/ */
private function getLastChain() private function getPatchChain($id = null)
{ {
$db = $this->getDb(); $db = $this->getDb();
return $db->setQuery( $query = $db->getQuery(true)
$db->getQuery(true)
->select('*') ->select('*')
->from('#__patchtester_chain') ->from('#__patchtester_chain');
->order('id DESC'), 0, 1
)->loadObject(); if (!is_null($id) && $id !== -1)
{
$query = $query->where('insert_id =' . (int) $id);
}
if ($id === -1)
{
$query = $query->order('id DESC');
}
if (is_null($id))
{
$query = $query->order('id ASC');
}
return $db->setQuery($query,0,1)->loadObject();
} }
/** /**
@ -916,7 +931,7 @@ class PullModel extends AbstractModel
->where('chain.insert_id IS NULL') ->where('chain.insert_id IS NULL')
)->loadObjectList('pull_id'); )->loadObjectList('pull_id');
$appliedByCI = $this->getPatchChain(); $appliedByCI = $this->getPatchChains();
return ["git" => $appliedByGit, "ci" => $appliedByCI]; return ["git" => $appliedByGit, "ci" => $appliedByCI];
} }