joomla
/
patchtester
mirror of https://github.com/joomla-extensions/patchtester.git
31
0
Fork 0
Code Issues Releases Activity

Last codestyle I hope 

Signed-off-by: Roland Dalmulder <contact@rolandd.com>
This commit is contained in:
Roland Dalmulder 2023-08-25 22:58:31 +02:00
parent d167f62f73
commit 13d174d1b8
No known key found for this signature in database
GPG Key ID: 6D30CD38749A5B9E
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
administrator/components/com_patchtester/src/Model/PullModel.php
View File

@ -569,7 +569,8 @@ class PullModel extends BaseDatabaseModel
if ( if (
$file->action === 'modified' $file->action === 'modified'
&& !file_exists(JPATH_ROOT . '/' . $file->filename)) { && !file_exists(JPATH_ROOT . '/' . $file->filename)
) {
throw new RuntimeException( throw new RuntimeException(
Text::sprintf( Text::sprintf(
'COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S', 'COM_PATCHTESTER_FILE_MODIFIED_DOES_NOT_EXIST_S',
@ -881,9 +882,7 @@ class PullModel extends BaseDatabaseModel
} }
// If folder is empty, remove it as well // If folder is empty, remove it as well
if (count(glob(JPATH_ROOT . '/' . $filePath . '/*')) if (count(glob(JPATH_ROOT . '/' . $filePath . '/*')) === 0) {
=== 0
) {
Folder::delete(JPATH_ROOT . '/' . $filePath); Folder::delete(JPATH_ROOT . '/' . $filePath);
} }
} elseif (file_exists($backupsPath . '/' . $file)) { } elseif (file_exists($backupsPath . '/' . $file)) {
@ -1042,11 +1041,10 @@ class PullModel extends BaseDatabaseModel
break; break;
case 'renamed': case 'renamed':
$originalSrc = JPATH_COMPONENT . '/backups/' . md5( $originalSrc = JPATH_COMPONENT . '/backups/' . md5($file->originalFile) . '.txt';
$file->originalFile
) . '.txt';
$newSrc = JPATH_ROOT . '/' . $file->filename; $newSrc = JPATH_ROOT . '/' . $file->filename;
$dest = JPATH_ROOT . '/' . $file->originalFile; $dest = JPATH_ROOT . '/' . $file->originalFile;
if (!File::copy($originalSrc, $dest)) { if (!File::copy($originalSrc, $dest)) {
throw new RuntimeException( throw new RuntimeException(
Text::sprintf( Text::sprintf(