Reverted some changes f.e. white-spaces between separators in ini files and already removed new lines, changed to single quotes instead of double quotes where necessary, reformatted config and template files and reverted changes in composer.json file.

2025-02-10 23:48:25 +00:00 · 2019-09-30 12:13:48 +02:00 · 2019-09-30 12:13:48 +02:00 · 5a19d0a2a3
commit 5a19d0a2a3
parent 81f76e4251
8 changed files with 349 additions and 329 deletions
--- a/administrator/components/com_patchtester/PatchTester/Controller/ResetController.php
+++ b/administrator/components/com_patchtester/PatchTester/Controller/ResetController.php
@ -44,12 +44,12 @@ class ResetController extends AbstractController
 			// Check the applied patches in the database first
 			$appliedPatches = $pullModel->getPatchesDividedInProcs();

-			if (count($appliedPatches["git"]))
+			if (count($appliedPatches['git']))
 			{
 				$revertErrored = false;

 				// Let's try to cleanly revert all applied patches
-				foreach ($appliedPatches["git"] as $patch)
+				foreach ($appliedPatches['git'] as $patch)
 				{
 					try
 					{
@ -62,12 +62,12 @@ class ResetController extends AbstractController
 				}
 			}

-			if (count($appliedPatches["ci"]))
+			if (count($appliedPatches['ci']))
 			{
 				$revertErrored = false;

 				// Let's try to cleanly revert all applied patches with ci
-				foreach ($appliedPatches["ci"] as $patch)
+				foreach ($appliedPatches['ci'] as $patch)
 				{
 					try
 					{
--- a/administrator/components/com_patchtester/PatchTester/Model/PullModel.php
+++ b/administrator/components/com_patchtester/PatchTester/Model/PullModel.php
@ -937,7 +937,7 @@ class PullModel extends AbstractModel

 		$appliedByCI = $this->getPatchChains();

-		return ["git" => $appliedByGit, "ci" => $appliedByCI];
+		return array('git' => $appliedByGit, 'ci' => $appliedByCI);
 	}

 	/**
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@ -11,40 +11,54 @@ use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;

 /** @var  \PatchTester\View\Pulls\PullsHtmlView $this */
+
 HTMLHelper::_('behavior.core');
 HTMLHelper::_('bootstrap.tooltip');
 HTMLHelper::_('formbehavior.chosen', 'select');
 HTMLHelper::_('stylesheet', 'com_patchtester/octicons.css', array('version' => '3.5.0', 'relative' => true));
 HTMLHelper::_('script', 'com_patchtester/patchtester.js', array('version' => 'auto', 'relative' => true));
+
 $listOrder = $this->escape($this->state->get('list.fullordering', 'a.pull_id DESC'));
 $filterApplied = $this->escape($this->state->get('filter.applied'));
 $filterBranch = $this->escape($this->state->get('filter.branch'));
 $filterRtc = $this->escape($this->state->get('filter.rtc'));
 ?>
-<form action="<?php echo Route::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm" id="adminForm" data-order="<?php echo $listOrder; ?>">
+<form action="<?php echo Route::_('index.php?option=com_patchtester&view=pulls'); ?>" method="post" name="adminForm"
+	  id="adminForm" data-order="<?php echo $listOrder; ?>">
 	<div id="j-main-container">
 		<div id="filter-bar" class="btn-toolbar">
 			<div class="filter-search btn-group pull-left">
-                <label for="filter_search" class="element-invisible"><?php echo Text::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?></label>
-                <input type="text" name="filter_search" placeholder="<?php echo Text::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo Text::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>" />
+				<label for="filter_search"
+					   class="element-invisible"><?php echo Text::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?></label>
+				<input type="text" name="filter_search"
+					   placeholder="<?php echo Text::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>"
+					   id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>"
+					   title="<?php echo Text::_('COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION'); ?>"/>
 			</div>
 			<div class="btn-group pull-left hidden-phone">
-                <button class="btn tip hasTooltip" type="submit" title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
-                <button class="btn tip hasTooltip" type="button" onclick="document.getElementById('filter_search').value='';this.form.submit();" title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
+				<button class="btn tip hasTooltip" type="submit"
+						title="<?php echo Text::_('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+				<button class="btn tip hasTooltip" type="button"
+						onclick="document.getElementById('filter_search').value='';this.form.submit();"
+						title="<?php echo Text::_('JSEARCH_FILTER_CLEAR'); ?>"><i class="icon-remove"></i></button>
 			</div>
 			<div class="btn-group pull-right hidden-phone">
-                <label for="limit" class="element-invisible"><?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
+				<label for="limit"
+					   class="element-invisible"><?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
 				<?php echo $this->pagination->getLimitBox(); ?>
 			</div>
 			<div class="btn-group pull-right">
-                <label for="list_fullordering" class="element-invisible"><?php echo Text::_('JGLOBAL_SORT_BY'); ?></label>
-                <select name="list_fullordering" id="list_fullordering" class="input-medium" onchange="this.form.submit();">
+				<label for="list_fullordering"
+					   class="element-invisible"><?php echo Text::_('JGLOBAL_SORT_BY'); ?></label>
+				<select name="list_fullordering" id="list_fullordering" class="input-medium"
+						onchange="this.form.submit();">
 					<option value=""><?php echo Text::_('JGLOBAL_SORT_BY'); ?></option>
 					<?php echo HTMLHelper::_('select.options', $this->getSortFields(), 'value', 'text', $listOrder); ?>
 				</select>
 			</div>
 			<div class="btn-group pull-right">
-                <label for="filter_applied" class="element-invisible"><?php echo Text::_('JSEARCH_TOOLS_DESC'); ?></label>
+				<label for="filter_applied"
+					   class="element-invisible"><?php echo Text::_('JSEARCH_TOOLS_DESC'); ?></label>
 				<select name="filter_applied" class="input-medium" onchange="this.form.submit();">
 					<option value=""><?php echo Text::_('COM_PATCHTESTER_FILTER_APPLIED_PATCHES'); ?></option>
 					<option value="yes"<?php if ($filterApplied == 'yes') echo ' selected="selected"'; ?>><?php echo Text::_('COM_PATCHTESTER_APPLIED'); ?></option>
@ -60,7 +74,8 @@ $filterRtc     = $this->escape($this->state->get('filter.rtc'));
 				</select>
 			</div>
 			<div class="btn-group pull-right">
-                <label for="filter_branch" class="element-invisible"><?php echo Text::_('JSEARCH_TOOLS_DESC'); ?></label>
+				<label for="filter_branch"
+					   class="element-invisible"><?php echo Text::_('JSEARCH_TOOLS_DESC'); ?></label>
 				<select name="filter_branch" class="input-medium" onchange="this.form.submit();">
 					<option value=""><?php echo Text::_('COM_PATCHTESTER_FILTER_BRANCH'); ?></option>
 					<?php echo HTMLHelper::_('select.options', $this->branches, 'text', 'text', $filterBranch, false); ?>
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
@ -9,8 +9,10 @@
 use Joomla\CMS\Language\Text;

 /** @var \PatchTester\View\DefaultHtmlView $this */
+
 foreach ($this->items as $i => $item) :
 	$status = '';
+
 	if ($item->applied) :
 		$status = ' class="success"';
 	endif;
@ -20,7 +22,8 @@ foreach ($this->items as $i => $item) :
 			<?php echo $item->pull_id; ?>
 		</td>
 		<td>
-            <span class="hasTooltip" title="<strong>Info</strong><br/><?php echo $this->escape($item->description); ?>"><?php echo $this->escape($item->title); ?></span>
+			<span class="hasTooltip"
+				  title="<strong>Info</strong><br/><?php echo $this->escape($item->description); ?>"><?php echo $this->escape($item->title); ?></span>
 			<?php if ($item->applied) : ?>
 				<div class="small">
 					<span class="label label-info"><?php echo Text::sprintf('COM_PATCHTESTER_APPLIED_COMMIT_SHA', substr($item->sha, 0, 10)); ?></span>
@ -44,7 +47,9 @@ foreach ($this->items as $i => $item) :
 		</td>
 		<?php if ($this->trackerAlias !== false) : ?>
 			<td class="center">
-                <a class="btn btn-small btn-warning" href="https://issues.joomla.org/tracker/<?php echo $this->trackerAlias; ?>/<?php echo $item->pull_id; ?>" target="_blank">
+				<a class="btn btn-small btn-warning"
+				   href="https://issues.joomla.org/tracker/<?php echo $this->trackerAlias; ?>/<?php echo $item->pull_id; ?>"
+				   target="_blank">
 					<i class="icon-joomla"></i> <?php echo Text::_('COM_PATCHTESTER_JISSUE'); ?>
 				</a>
 			</td>
@ -62,9 +67,12 @@ foreach ($this->items as $i => $item) :
 		</td>
 		<td class="center">
 			<?php if ($item->applied) : ?>
-                <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><br />
+				<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>
+				<br/>
 			<?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>
+				<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; ?>
 		</td>
 	</tr>
--- a/administrator/components/com_patchtester/config.xml
+++ b/administrator/components/com_patchtester/config.xml
@ -17,9 +17,7 @@
 		>
 			<option value="joomla:joomla-cms">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_JOOMLA_CMS</option>
 			<option value="joomla-extensions:patchtester">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_PATCHTESTER</option>
-			<option value="joomla-extensions:install-from-web-client">
-				COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB
-			</option>
+			<option value="joomla-extensions:install-from-web-client">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_INSTALL_FROM_WEB</option>
 			<option value="joomla-extensions:weblinks">COM_PATCHTESTER_FIELD_REPOSITORY_OPTION_WEBLINKS</option>
 			<option value="custom">COM_PATCHTESTER_FIELD_REPOSITORY_CUSTOM</option>
 		</field>
@ -59,7 +57,6 @@
            description="COM_PATCHTESTER_FIELD_GH_AUTH_DESC"
            default=""
            onchange="jQuery('#jform_gh_user, #jform_gh_password, #jform_gh_token').val('');"
-
 		>
 			<option value="">JNONE</option>
 			<option value="credentials">COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_CREDENTIALS</option>
--- a/administrator/components/com_patchtester/language/de-DE/de-DE.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/de-DE/de-DE.com_patchtester.ini
@ -105,6 +105,3 @@ COM_PATCHTESTER_TOOLBAR_FETCH_DATA = "Daten abrufen"
 COM_PATCHTESTER_TOOLBAR_RESET="Zurücksetzen"
 COM_PATCHTESTER_ZIP_DOES_NOT_EXIST="Der Patch konnte nicht angewendet werden, weil er nicht vom Server heruntergeladen werden konnte."
 COM_PATCHTESTER_ZIP_EXTRACT_FAILED="Der Patch konnte nicht angewendet werden, weil nicht entpackt werden konnte."
-
-
-
--- a/administrator/templates/atum/html/com_patchtester/pulls/default_items.php
+++ b/administrator/templates/atum/html/com_patchtester/pulls/default_items.php
@ -33,7 +33,9 @@ foreach ($this->items as $i => $item) :
 					</a>
 				</div>
 				<div class="col-md-auto">
-                    <a class="badge badge-info" href="https://issues.joomla.org/tracker/<?php echo $this->trackerAlias; ?>/<?php echo $item->pull_id; ?>" target="_blank">
+					<a class="badge badge-info"
+					   href="https://issues.joomla.org/tracker/<?php echo $this->trackerAlias; ?>/<?php echo $item->pull_id; ?>"
+					   target="_blank">
 						<?php echo Text::_('COM_PATCHTESTER_VIEW_ON_JOOMLA_ISSUE_TRACKER'); ?>
 					</a>
 				</div>
@ -63,9 +65,11 @@ 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->applied; ?>"><?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>
+				<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; ?>
 		</td>
 	</tr>
--- a/composer.json
+++ b/composer.json
@ -9,8 +9,7 @@
        "vendor-dir": "administrator/components/com_patchtester/vendor"
    },
    "require": {
-        "php": "^7.0",
-      "ext-json": "*"
+        "php": "^5.3.10|^7.0"
    },
    "require-dev": {
        "php": "^5.6|^7.0",