joomla/patchtester
31
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2024-06-03 14:10:47 +00:00
Code Issues Releases Activity

Reworked patchChain as json to store pull_id and db_id for checking later on on reverting or resetting.

Browse Source
This commit is contained in:
datsepp 2019-09-12 10:52:34 +02:00
parent a321ad0d2f
commit 3b1f1578da
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
administrator/components/com_patchtester/PatchTester/Controller/ResetController.php
View File

@ -47,7 +47,7 @@ class ResetController extends AbstractController
// Get PatchChain as array, remove any EOL set by php
$patchChainPath = $ciSettings->get('folder.backups') . '/' . $ciSettings->get('zip.chain.name');
$patchChain = array_reverse(explode(PHP_EOL, file_get_contents($patchChainPath)));
$patchChain = array_reverse(json_decode(file_get_contents($patchChainPath)));
// Check the applied patches in the database first
$appliedPatches = $testsModel->getAppliedPatches();
@ -55,7 +55,8 @@ class ResetController extends AbstractController
if (count($patchChain) && count($appliedPatches))
{
// Get only the pull_id and remove all occurrences with patchChain
$appliedPatches = array_map(function($patch) { return $patch->pull_id; }, $appliedPatches);
$appliedPatches = array_map(function($patch) { return $patch->id; }, $appliedPatches);
$patchChain = array_map(function($patch) { return $patch->id; }, $patchChain);
$appliedPatches = array_diff($appliedPatches, $patchChain);
}

2
administrator/components/com_patchtester/PatchTester/Helper.php
View File

@ -82,7 +82,7 @@ abstract class Helper
// Set name of the zip archive
$options->set('zip.name', 'build.zip');
$options->set('zip.log.name', 'deleted_files.log');
$options->set('zip.chain.name', 'patch_chain.log');
$options->set('zip.chain.name', 'patch_chain.json');
// Set temp archive for extracting and downloading files
$options->set('folder.temp', Factory::getConfig()->get('tmp_path'));

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

@ -316,19 +316,19 @@ class PullModel extends AbstractModel
// Clear temp folder and store applied patch in database
Folder::delete($tempPath);
$this->saveAppliedPatch($id, $files, $sha);
$lastInserted = $this->saveAppliedPatch($id, $files, $sha);
// Write or create patch chain for correct order of patching
if (!file_exists($patchChainPath) || filesize($patchChainPath) === 0)
{
File::write($patchChainPath, $id);
File::write($patchChainPath, json_encode([["id" => $lastInserted, "pull_id" => $id]]));
}
else
{
// Remove any from php set EOL in log file, add id and rewrite file
$patchChain = explode(PHP_EOL, file_get_contents($patchChainPath));
$patchChain[] = $id;
File::write($patchChainPath, implode(PHP_EOL, $patchChain));
$patchChain = json_decode(file_get_contents($patchChainPath));
$patchChain[] = ["id" => $lastInserted, "pull_id" => $id];
File::write($patchChainPath, json_encode($patchChain));
}
// Change the media version
@ -548,7 +548,7 @@ class PullModel extends AbstractModel
* @param array $fileList List of files
* @param string $sha sha-key from pull request
*
* @return void
* @return integer $id last inserted id
*
* @since 3.0
*/
@ -565,6 +565,7 @@ class PullModel extends AbstractModel
$db = $this->getDb();
$db->insertObject('#__patchtester_tests', $record);
$insertId = $db->insertid();
if (!is_null($sha))
{
@ -576,6 +577,8 @@ class PullModel extends AbstractModel
->where($db->quoteName('pull_id') . ' = ' . (int) $id)
)->execute();
}
return $insertId;
}
/**
@ -624,17 +627,17 @@ class PullModel extends AbstractModel
// Get PatchChain as array, remove any EOL set by php
$patchChainPath = $ciSettings->get('folder.backups') . '/' . $ciSettings->get('zip.chain.name');
$patchChain = array_reverse(explode(PHP_EOL, file_get_contents($patchChainPath)));
$patchChain = array_reverse(json_decode(file_get_contents($patchChainPath)));
// Allow only reverts in order of the patch chain
if ($patchChain[0] != $testRecord->pull_id)
if ($patchChain[0]->id != $id)
{
throw new \RuntimeException(Text::sprintf('COM_PATCHTESTER_NOT_IN_ORDER_OF_PATCHCHAIN', $patchChain[0]));
throw new \RuntimeException(Text::sprintf('COM_PATCHTESTER_NOT_IN_ORDER_OF_PATCHCHAIN', $patchChain[0]->pull_id));
}
else
{
array_shift($patchChain);
File::write($patchChainPath, implode(PHP_EOL, array_reverse($patchChain)));
File::write($patchChainPath, json_encode(array_reverse($patchChain)));
}
// We don't want to restore files from an older version
@ -831,7 +834,7 @@ class PullModel extends AbstractModel
$db->getQuery(true)
->update('#__patchtester_pulls')
->set('sha = ' . $db->quote(''))
->where($db->quoteName('pull_id') . ' = ' . (int) $testRecord->pull_id)
->where($db->quoteName('id') . ' = ' . (int) $testRecord->id)
)->execute();
// And delete the record from the tests table
@ -861,7 +864,7 @@ class PullModel extends AbstractModel
$db->getQuery(true)
->select('*')
->from('#__patchtester_tests')
->where('pull_id = ' . (int) $id)
->where('id = ' . (int) $id)
)->loadObject();
}
}

2
administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
View File

@ -63,7 +63,7 @@ foreach ($this->items as $i => $item) :
</td>
<td class="text-center">
<?php if ($item->applied) : ?>
<button type="button" class="btn btn-sm btn-success submitPatch" data-task="revert-<?php echo (int) $item->pull_id; ?>"><?php echo Text::_('COM_PATCHTESTER_REVERT_PATCH'); ?></button>
<button type="button" class="btn btn-sm btn-success submitPatch" data-task="revert-<?php echo (int) $item->applied; ?>"><?php echo Text::_('COM_PATCHTESTER_REVERT_PATCH'); ?></button>
<?php else : ?>
<button type="button" class="btn btn-sm btn-primary submitPatch" data-task="apply-<?php echo (int) $item->pull_id; ?>"><?php echo Text::_('COM_PATCHTESTER_APPLY_PATCH'); ?></button>
<?php endif; ?>