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

Fixed path checking on Windows #262

Browse Source 
Turn off CI server by default
Changed CI server port
Removed left over from patch chain

Signed-off-by: Roland Dalmulder <contact@rolandd.com>
This commit is contained in:
Roland Dalmulder 2020-04-04 14:04:47 +02:00
parent 63d99d3e20
commit 5c6b278628
No known key found for this signature in database
GPG Key ID: FD49814C56AE3AF9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,6 +426,8 @@ class PullModel extends AbstractModel
*/ */
private function checkFilesExist(array $files, string $path): bool private function checkFilesExist(array $files, string $path): bool
{ {
$path = Path::clean($path);
foreach ($files as $file) foreach ($files as $file)
{ {
if (is_array($file)) if (is_array($file))
@ -700,7 +702,7 @@ class PullModel extends AbstractModel
* *
* @since 3.0.0 * @since 3.0.0
*/ */
protected function parseFileList(stdClass $files): array private function parseFileList(array $files): array
{ {
$parsedFiles = array(); $parsedFiles = array();
@ -777,7 +779,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) || $id === $this->getPatchChain($id)->insert_id)) if ((bool) $params->get('ci_switch', 1))
{ {
return $this->revertWithCIServer($id); return $this->revertWithCIServer($id);
} }

4
administrator/components/com_patchtester/config.xml
View File

@ -106,7 +106,7 @@
label="COM_PATCHTESTER_FIELD_CI_SERVER_NAME" label="COM_PATCHTESTER_FIELD_CI_SERVER_NAME"
description="COM_PATCHTESTER_FIELD_CI_SERVER_NAME_DESC" description="COM_PATCHTESTER_FIELD_CI_SERVER_NAME_DESC"
autocomplete="off" autocomplete="off"
default="https://ci.joomla.org:444" default="https://ci.joomla.org"
/> />
<field <field
@ -114,7 +114,7 @@
type="list" type="list"
label="COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH" label="COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH"
description="COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_DESC" description="COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_DESC"
default="1" default="0"
> >
<option value="1">COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_ON</option> <option value="1">COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_ON</option>
<option value="0">COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_OFF</option> <option value="0">COM_PATCHTESTER_FIELD_CI_SERVER_SWITCH_OPTION_OFF</option>