Merge branch 'master' of github.com:joomla-extensions/patchtester

2024-12-22 19:09:00 +00:00 · 2015-12-05 12:03:27 -05:00 · 2015-12-05 12:03:27 -05:00 · d1111be051
commit d1111be051
parent 76de1805ff c6f100266c
11 changed files with 37 additions and 16 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,18 +1,24 @@
+# Forces new Travis-CI Infrastructure
+sudo: false
+
 language: php

-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
+env:
+  global:
+    - RUN_PHPCS="no"

 matrix:
-  allow_failures:
+  include:
+    - php: 5.3
+      env: RUN_PHPCS="yes"
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
    - php: 7.0

 before_script:
+  # Make sure all dev dependencies are installed
  - composer install

 script:
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla --ignore=./*tmpl/* administrator/components/com_patchtester; fi"
+  - if [ "$RUN_PHPCS" == "yes" ]; then vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla --ignore=./*tmpl/* administrator/components/com_patchtester; fi
--- a/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php
+++ b/administrator/components/com_patchtester/PatchTester/Model/PullsModel.php
@ -350,7 +350,8 @@ class PullsModel extends \JModelDatabase
 				$pull->number,
 				$this->getDb()->quote($pull->title),
 				$this->getDb()->quote(\JHtml::_('string.truncate', $pull->body, 100)),
-				$this->getDb()->quote($pull->html_url)
+				$this->getDb()->quote($pull->html_url),
+				$this->getDb()->quote($pull->head->sha)
 			);

 			$data[] = implode($pullData, ',');
@ -364,7 +365,8 @@ class PullsModel extends \JModelDatabase
 						$this->getDb()->quoteName('pull_id'),
 						$this->getDb()->quoteName('title'),
 						$this->getDb()->quoteName('description'),
-						$this->getDb()->quoteName('pull_url')
+						$this->getDb()->quoteName('pull_url'),
+						$this->getDb()->quoteName('sha')
 					)
 				)
 				->values($data)
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default.php
@ -97,6 +97,9 @@ $sortFields    = $this->getSortFields();
 					<th class="nowrap">
 						<?php echo \JText::_('JGLOBAL_TITLE'); ?>
 					</th>
+					<th class="nowrap">
+						<?php echo \JText::_('COM_PATCHTESTER_SHA'); ?>
+					</th>
 					<th width="8%" class="nowrap center">
 						<?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
 					</th>
--- a/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
+++ b/administrator/components/com_patchtester/PatchTester/View/Pulls/tmpl/default_items.php
@ -22,6 +22,9 @@ foreach ($this->items as $i => $item) :
 	<td>
 		<span class="hasTooltip" title="<strong>Info</strong><br/><?php echo $this->escape($item->description); ?>"><?php echo $this->escape($item->title); ?></span>
 	</td>
+	<td>
+		<?php echo substr($item->sha, 0, 10); ?>
+	</td>
 	<td class="center">
 		<a class="btn btn-small btn-info" href="<?php echo $item->pull_url; ?>" target="_blank">
 			<span class="octicon octicon-mark-github"></span> <?php echo \JText::_('COM_PATCHTESTER_GITHUB'); ?>
--- a/administrator/components/com_patchtester/install/sql/mysql/install.sql
+++ b/administrator/components/com_patchtester/install/sql/mysql/install.sql
@ -4,6 +4,7 @@ CREATE TABLE IF NOT EXISTS `#__patchtester_pulls` (
  `title` varchar(200) NOT NULL,
  `description` varchar(150) NOT NULL DEFAULT '',
  `pull_url` varchar(255) NOT NULL,
+  `sha` varchar(40) NOT NULL,
  PRIMARY KEY (`id`)
 ) DEFAULT CHARSET=utf8;

--- a/administrator/components/com_patchtester/install/sql/postgresql/install.sql
+++ b/administrator/components/com_patchtester/install/sql/postgresql/install.sql
@ -4,6 +4,7 @@ CREATE TABLE IF NOT EXISTS "#__patchtester_pulls" (
  "title" character varying(200) NOT NULL,
  "description" character varying(150) DEFAULT '' NOT NULL,
  "pull_url" character varying(255) NOT NULL,
+  "sha" character varying(40) NOT NULL,
  PRIMARY KEY ("id")
 );

--- a/administrator/components/com_patchtester/install/sql/sqlsrv/install.sql
+++ b/administrator/components/com_patchtester/install/sql/sqlsrv/install.sql
@ -4,6 +4,7 @@ CREATE TABLE [#__patchtester_pulls] (
  [title] [nvarchar](200) NOT NULL,
  [description] [nvarchar](150) NOT NULL DEFAULT '',
  [pull_url] [nvarchar](255) NOT NULL,
+  [sha] [nvarchar](40) NOT NULL,
 CONSTRAINT [PK_#__patchtester_pulls] PRIMARY KEY CLUSTERED
 (
  [id] ASC
--- 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
@ -44,7 +44,7 @@ COM_PATCHTESTER_FILTER_APPLIED_PATCHES="Filter der angewendeten Patchs"
 COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION="Diese Liste nach Titel oder ID durchsuchen."
 COM_PATCHTESTER_HEADING_FETCH_DATA="GitHub Daten abrufen"
 COM_PATCHTESTER_PULL_ID="Pull ID"
-COM_PATCHTESTER_NO_CREDENTIALS="Es wurden noch keine Benutzerdaten eingetragen, somit können höchstens 60 Anfragen pro Stunde an die Github API gestellt werden. Mit Benutzerdaten sind bis zu 5.000 Anfragen pro Stunde möglich."
+COM_PATCHTESTER_NO_CREDENTIALS="In den Optionen wurden noch keine Benutzerdaten eingetragen, somit können höchstens 60 Anfragen pro Stunde an die Github API gestellt werden. Mit Benutzerdaten sind bis zu 5.000 Anfragen pro Stunde möglich."
 COM_PATCHTESTER_NO_FILES_TO_PATCH="In diesem Pull Request gibt es keine Datei zum patchen. Das kann vorkommen wenn die Dateien die geändert werden sollen nicht in der Joomla Installation vorhanden sind (z.B. installations Ordner)."
 COM_PATCHTESTER_NO_ITEMS="Es wurden (noch) keine Daten von Github abgerufen. Bitte den Button 'Daten abrufen' benutzen um die aktuellen Daten von Github abzurufen."
 COM_PATCHTESTER_NOT_APPLIED="Nicht angewendet"
@ -59,4 +59,5 @@ COM_PATCHTESTER_REQUIREMENTS_NOT_MET="Ihr System erfüllt nicht die Mindestvorra
 COM_PATCHTESTER_REVERT_OK="Der Patch wurde zurückgenommen."
 COM_PATCHTESTER_REVERT_PATCH="Patch zurücknehmen"
 COM_PATCHTESTER_TEST_THIS_PATCH="Diesen Patch testen"
-COM_PATCHTESTER_TOOLBAR_FETCH_DATA="Daten abrufen"
+COM_PATCHTESTER_TOOLBAR_FETCH_DATA="Daten abrufen"
+COM_PATCHTESTER_SHA="SHA"
--- a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
@ -13,7 +13,7 @@ COM_PATCHTESTER_COMPONENT_DESC="Joomla! Patch Tester Configuration Values"
 COM_PATCHTESTER_COMPONENT_LABEL="Joomla! Patch Tester"
 COM_PATCHTESTER_CONFIGURATION="Joomla! Patch Tester Settings"
 COM_PATCHTESTER_CONFLICT_S="The patch could not be applied because it conflicts with a previously applied patch: %s"
-COM_PATCHTESTER_COULD_NOT_CONNECT_TO_GITHUB="Could not connect to GitHub with the following error: %s"
+COM_PATCHTESTER_COULD_NOT_CONNECT_TO_GITHUB="Could not connect to GitHub: %s"
 COM_PATCHTESTER_ERROR_APPLIED_PATCHES="Cannot fetch data from GitHub while there are applied patches.  Please revert those patches before continuing."
 COM_PATCHTESTER_ERROR_CANNOT_COPY_FILE="Cannot copy source file %1$s to destination %2$s"
 COM_PATCHTESTER_ERROR_CANNOT_DELETE_FILE="Cannot delete file %s"
@ -44,7 +44,7 @@ COM_PATCHTESTER_FILTER_APPLIED_PATCHES="Filter Applied Patches"
 COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION="Filter the list by title or ID."
 COM_PATCHTESTER_HEADING_FETCH_DATA="Fetching GitHub Data"
 COM_PATCHTESTER_PULL_ID="Pull ID"
-COM_PATCHTESTER_NO_CREDENTIALS="No user credentials are saved, this will allow only 60 requests to the GitHub API per hour.  Saving user credentials will allow 5,000 requests per hour."
+COM_PATCHTESTER_NO_CREDENTIALS="You have not entered your user credentials in the Options. This will limit you to only 60 requests to the GitHub API per hour. Adding your credentials will allow 5,000 requests per hour."
 COM_PATCHTESTER_NO_FILES_TO_PATCH="There are no files to patch from this pull request.  This may mean that the files in the pull request are not present in your installation."
 COM_PATCHTESTER_NO_ITEMS="No data has been retrieved from GitHub, please click the 'Fetch Data' button in the toolbar to retrieve the open pull requests."
 COM_PATCHTESTER_NOT_APPLIED="Not Applied"
@ -60,3 +60,4 @@ COM_PATCHTESTER_REVERT_OK="Patch successfully reverted"
 COM_PATCHTESTER_REVERT_PATCH="Revert Patch"
 COM_PATCHTESTER_TEST_THIS_PATCH="Test This Patch"
 COM_PATCHTESTER_TOOLBAR_FETCH_DATA="Fetch Data"
+COM_PATCHTESTER_SHA="SHA"
--- a/administrator/components/com_patchtester/language/fr-FR/fr-FR.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/fr-FR/fr-FR.com_patchtester.ini
@ -13,7 +13,7 @@ COM_PATCHTESTER_COMPONENT_DESC="Valeurs de configuration pour Joomla! Patch Test
 COM_PATCHTESTER_COMPONENT_LABEL="Joomla! Patch Tester"
 COM_PATCHTESTER_CONFIGURATION="Paramètres de Joomla! Patch Tester"
 COM_PATCHTESTER_CONFLICT_S="Le correctif n'a pu être appliqué car il génère un conflit avec le correctif précédemment appliqué : %s"
-COM_PATCHTESTER_COULD_NOT_CONNECT_TO_GITHUB="Impossible de se connecter à GitHub, erreur : %s"
+COM_PATCHTESTER_COULD_NOT_CONNECT_TO_GITHUB="Impossible de se connecter à GitHub : %s"
 COM_PATCHTESTER_ERROR_APPLIED_PATCHES="Impossible de récupérer les données à partir de GitHub alors que des correctifs sont déja appliqués. Veuillez retirer ces correctifs avant de continuer."
 COM_PATCHTESTER_ERROR_CANNOT_COPY_FILE="Impossible de copier le fichier source %1$s vers la destination %2$s"
 COM_PATCHTESTER_ERROR_CANNOT_DELETE_FILE="Impossible de supprimer le fichier %s"
@ -44,7 +44,7 @@ COM_PATCHTESTER_FILTER_APPLIED_PATCHES="Correctifs filtrés"
 COM_PATCHTESTER_FILTER_SEARCH_DESCRIPTION="Filtrer la liste par titre ou par ID."
 COM_PATCHTESTER_HEADING_FETCH_DATA="Extraction des données GitHub"
 COM_PATCHTESTER_PULL_ID="ID de Pull"
-COM_PATCHTESTER_NO_CREDENTIALS="Aucune information d'identification d'utilisateur n'est sauvegardée, ce qui autorise uniquement 60 requêtes par heure à l'API GitHub. La sauvegarde des informations d'identification utilisateur autorisera 5.000 requêtes par heure."
+COM_PATCHTESTER_NO_CREDENTIALS="Aucune information d'identification n'a été définie dans les options. Cela a pour effet de limiter le nombre de vos requêtes autorisées sur l'API GitHub à 60 par heure. Ajouter ces informations d'identification utilisateur vous autorisera 5 000 requêtes par heure."
 COM_PATCHTESTER_NO_FILES_TO_PATCH="Il n'existe aucun fichier correctif à appliquer pour cette demande de Pull.  Cela peut signifier que les fichiers dans la demande de Pull ne sont pas présents dans votre installation."
 COM_PATCHTESTER_NO_ITEMS="Aucune donnée n'a été extraite de GitHub. Veuillez cliquer sur le bouton 'Extraire les données' dans la barre d'outils pour récupérer les demandes de Pull ouvertes."
 COM_PATCHTESTER_NOT_APPLIED="Non appliqué"
@ -60,3 +60,4 @@ COM_PATCHTESTER_REVERT_OK="Correctif retiré avec succès"
 COM_PATCHTESTER_REVERT_PATCH="Retirer le correctif"
 COM_PATCHTESTER_TEST_THIS_PATCH="Tester ce correctif"
 COM_PATCHTESTER_TOOLBAR_FETCH_DATA="Extraire les données"
+COM_PATCHTESTER_SHA="SHA"
--- a/administrator/components/com_patchtester/language/nl-NL/nl-NL.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/nl-NL/nl-NL.com_patchtester.ini
@ -44,3 +44,4 @@ COM_PATCHTESTER_REVERT_OK="Patch met succes ongedaan gemaakt"
 COM_PATCHTESTER_REVERT_PATCH="Patch ongedaan maken"
 COM_PATCHTESTER_TEST_THIS_PATCH="Test deze patch"
 COM_PATCHTESTER_TOOLBAR_FETCH_DATA="Gegevens ophalen"
+COM_PATCHTESTER_SHA="SHA"