Merge branch 'master' into feature/native-searchtools

# Conflicts:
#	administrator/components/com_patchtester/PatchTester/Model/PullsModel.php
#	administrator/components/com_patchtester/PatchTester/View/Pulls/PullsHtmlView.php
#	administrator/components/com_patchtester/language/en-GB/com_patchtester.ini

Author: roland-d

.github/workflows/crowdin-wf.yml

@@ -0,0 +1,47 @@
+name: Crowdin Action
+# Controls when the action will run. 
+on:
+  schedule:
+    - cron: '43 * * * *'
+  
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel  
+jobs:
+  # This workflow contains a single job called "build"
+  synchronize-with-crowdin:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - name: Checkout
+      uses: actions/checkout@v2
+    
+    # Runs the Crowdin action command - https://github.com/crowdin/github-action
+    - name: crowdin action
+      uses: crowdin/github-action@1.1.2
+      with:
+        # Upload sources to Crowdin
+        upload_sources: true
+        # Upload translations to Crowdin, only use true at initial run
+        upload_translations: false
+        # Make pull request of Crowdin translations
+        download_translations: true
+        # Only download translated strings
+        skip_untranslated_strings: false
+        # Download translations with pushing to branch
+        push_translations: true
+        # To download translations to the specified version branch
+        localization_branch_name: 'l10n_crowdin_translations'
+        # Create pull request after pushing to branch
+        create_pull_request: true
+        # Configuration file to use
+        config: 'crowdin.yml'
+        # Use true for dryrun to test the run without actually processing anything
+        dryrun_action: false
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

README.md

@@ -1,5 +1,5 @@
 Patch Tester [![Build Status](https://ci.joomla.org/api/badges/joomla-extensions/patchtester/status.svg)](https://ci.joomla.org/joomla-extensions/patchtester) 
-[![Crowdin](https://badges.crowdin.net/e/fc3dad2620189bfc76653c4d0b71c9ab/localized.svg)](https://joomla.crowdin.com/patch-tester-extension)
+[![Crowdin](https://badges.crowdin.net/e/f166ad1cd11fb51fd49eb6a863f64f08/localized.svg)](https://joomla.crowdin.com/joomla-official-extensions)
 =============
 
 * [In English](#license)
@@ -43,7 +43,7 @@ To use an account that has two factor authentication enabled, you'll have to [cr
 Translations
 =============
 
-Translations for the patch tester component are managed on [Crowdin](https://joomla.crowdin.com/patch-tester-extension).
+Translations for the patch tester component are managed on [Crowdin](https://joomla.crowdin.com/joomla-official-extensions).
 
 
 fr-FR - Patch Tester en français

administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php

@@ -51,6 +51,71 @@ public function __construct(Registry $options = null, Http $client = null)
 		$this->client  = $client ?: HttpFactory::getHttp($options);
 	}
 
+	/**
+	 * Get the HTTP client for this connector.
+	 *
+	 * @return  Http
+	 *
+	 * @since   3.0.0
+	 */
+	public function getClient()
+	{
+		return $this->client;
+	}
+
+	/**
+	 * Get the diff for a pull request.
+	 *
+	 * @param   string   $user    The name of the owner of the GitHub repository.
+	 * @param   string   $repo    The name of the GitHub repository.
+	 * @param   integer  $pullId  The pull request number.
+	 *
+	 * @return  Response
+	 *
+	 * @since   3.0.0
+	 */
+	public function getDiffForPullRequest($user, $repo, $pullId)
+	{
+		// Build the request path.
+		$path = "/repos/$user/$repo/pulls/" . (int) $pullId;
+
+		// Build the request headers.
+		$headers = array('Accept' => 'application/vnd.github.diff');
+
+		$prepared = $this->prepareRequest($path, 0, 0, $headers);
+
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
+	}
+
+	/**
+	 * Method to build and return a full request URL for the request.
+	 *
+	 * This method will add appropriate pagination details if necessary and also prepend the API url to have a complete URL for the request.
+	 *
+	 * @param   string   $path     Path to process
+	 * @param   integer  $page     Page to request
+	 * @param   integer  $limit    Number of results to return per page
+	 * @param   array    $headers  The headers to send with the request
+	 *
+	 * @return  array  Associative array containing the prepared URL and request headers
+	 *
+	 * @since   3.0.0
+	 */
+	protected function prepareRequest($path, $page = 0, $limit = 0,
+		array $headers = array()
+	) {
+		$url = $this->fetchUrl($path, $page, $limit);
+
+		if ($token = $this->options->get('gh.token', false))
+		{
+			$headers['Authorization'] = "token $token";
+		}
+
+		return array('url' => $url, 'headers' => $headers);
+	}
+
 	/**
 	 * Build and return a full request URL.
 	 *
@@ -70,27 +135,6 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 		// Get a new Uri object using the API URL and given path.
 		$uri = new Uri($this->options->get('api.url') . $path);
 
-		// Only apply basic authentication if an access token is not set
-		if ($this->options->get('gh.token', false) === false)
-		{
-			// Use basic authentication
-			if ($this->options->get('api.username', false))
-			{
-				$username = $this->options->get('api.username');
-				$username = str_replace('@', '%40', $username);
-				$username = str_replace('#', '%23', $username);
-				$uri->setUser($username);
-			}
-
-			if ($this->options->get('api.password', false))
-			{
-				$password = $this->options->get('api.password');
-				$password = str_replace('@', '%40', $password);
-				$password = str_replace('#', '%23', $password);
-				$uri->setPass($password);
-			}
-		}
-
 		// If we have a defined page number add it to the JUri object.
 		if ($page > 0)
 		{
@@ -107,39 +151,32 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 	}
 
 	/**
-	 * Get the HTTP client for this connector.
-	 *
-	 * @return  Http
-	 *
-	 * @since   3.0.0
-	 */
-	public function getClient()
-	{
-		return $this->client;
-	}
-
-	/**
-	 * Get the diff for a pull request.
+	 * Process the response and return it.
 	 *
-	 * @param   string   $user    The name of the owner of the GitHub repository.
-	 * @param   string   $repo    The name of the GitHub repository.
-	 * @param   integer  $pullId  The pull request number.
+	 * @param   Response  $response      The response.
+	 * @param   integer   $expectedCode  The expected response code.
 	 *
 	 * @return  Response
 	 *
 	 * @since   3.0.0
+	 * @throws  Exception\UnexpectedResponse
 	 */
-	public function getDiffForPullRequest($user, $repo, $pullId)
+	protected function processResponse(Response $response, $expectedCode = 200)
 	{
-		// Build the request path.
-		$path = "/repos/$user/$repo/pulls/" . (int) $pullId;
-
-		// Build the request headers.
-		$headers = array('Accept' => 'application/vnd.github.diff');
+		// Validate the response code.
+		if ($response->code != $expectedCode)
+		{
+			// Decode the error response and throw an exception.
+			$body  = json_decode($response->body);
+			$error = isset($body->error) ? $body->error
+				: (isset($body->message) ? $body->message : 'Unknown Error');
 
-		$prepared = $this->prepareRequest($path, 0, 0, $headers);
+			throw new Exception\UnexpectedResponse(
+				$response, $error, $response->code
+			);
+		}
 
-		return $this->processResponse($this->client->get($prepared['url'], $prepared['headers']));
+		return $response;
 	}
 
 	/**
@@ -168,7 +205,9 @@ public function getFileContents($user, $repo, $path, $ref = null)
 			$prepared['url'] = (string) $url;
 		}
 
-		return $this->processResponse($this->client->get($prepared['url'], $prepared['headers']));
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
 	}
 
 	/**
@@ -189,7 +228,9 @@ public function getFilesForPullRequest($user, $repo, $pullId)
 
 		$prepared = $this->prepareRequest($path);
 
-		return $this->processResponse($this->client->get($prepared['url'], $prepared['headers']));
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
 	}
 
 	/**
@@ -206,9 +247,36 @@ public function getFilesForPullRequest($user, $repo, $pullId)
 	 */
 	public function getOpenIssues($user, $repo, $page = 0, $limit = 0)
 	{
-		$prepared = $this->prepareRequest("/repos/$user/$repo/issues", $page, $limit);
+		$prepared = $this->prepareRequest(
+			"/repos/$user/$repo/issues", $page, $limit
+		);
+
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
+	}
+
+	/**
+	 * Get a list of the open pull requests for a repository.
+	 *
+	 * @param   string   $user   The name of the owner of the GitHub repository.
+	 * @param   string   $repo   The name of the GitHub repository.
+	 * @param   integer  $page   The page number from which to get items.
+	 * @param   integer  $limit  The number of items on a page.
+	 *
+	 * @return  Response
+	 *
+	 * @since   3.0.0
+	 */
+	public function getOpenPulls($user, $repo, $page = 0, $limit = 0)
+	{
+		$prepared = $this->prepareRequest(
+			"/repos/$user/$repo/pulls", $page, $limit
+		);
 
-		return $this->processResponse($this->client->get($prepared['url'], $prepared['headers']));
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
 	}
 
 	/**
@@ -244,7 +312,9 @@ public function getPullRequest($user, $repo, $pullId)
 
 		$prepared = $this->prepareRequest($path);
 
-		return $this->processResponse($this->client->get($prepared['url'], $prepared['headers']));
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
 	}
 
 	/**
@@ -258,59 +328,9 @@ public function getRateLimit()
 	{
 		$prepared = $this->prepareRequest('/rate_limit');
 
-		return $this->processResponse($this->client->get($prepared['url'], $prepared['headers']));
-	}
-
-	/**
-	 * Process the response and return it.
-	 *
-	 * @param   Response  $response      The response.
-	 * @param   integer   $expectedCode  The expected response code.
-	 *
-	 * @return  Response
-	 *
-	 * @since   3.0.0
-	 * @throws  Exception\UnexpectedResponse
-	 */
-	protected function processResponse(Response $response, $expectedCode = 200)
-	{
-		// Validate the response code.
-		if ($response->code != $expectedCode)
-		{
-			// Decode the error response and throw an exception.
-			$body  = json_decode($response->body);
-			$error = isset($body->error) ? $body->error : (isset($body->message) ? $body->message : 'Unknown Error');
-
-			throw new Exception\UnexpectedResponse($response, $error, $response->code);
-		}
-
-		return $response;
-	}
-
-	/**
-	 * Method to build and return a full request URL for the request.
-	 *
-	 * This method will add appropriate pagination details if necessary and also prepend the API url to have a complete URL for the request.
-	 *
-	 * @param   string   $path     Path to process
-	 * @param   integer  $page     Page to request
-	 * @param   integer  $limit    Number of results to return per page
-	 * @param   array    $headers  The headers to send with the request
-	 *
-	 * @return  array  Associative array containing the prepared URL and request headers
-	 *
-	 * @since   3.0.0
-	 */
-	protected function prepareRequest($path, $page = 0, $limit = 0, array $headers = array())
-	{
-		$url = $this->fetchUrl($path, $page, $limit);
-
-		if ($token = $this->options->get('gh.token', false))
-		{
-			$headers['Authorization'] = "token $token";
-		}
-
-		return array('url' => $url, 'headers' => $headers);
+		return $this->processResponse(
+			$this->client->get($prepared['url'], $prepared['headers'])
+		);
 	}
 
 	/**

administrator/components/com_patchtester/PatchTester/Helper.php

@@ -48,12 +48,6 @@ public static function initializeGithub()
 		{
 			$options->set('headers', ['Authorization' => 'token ' . $params->get('gh_token', '')]);
 		}
-		// Set the username and password if set in the params
-		elseif ($params->get('gh_user', '') && $params->get('gh_password'))
-		{
-			$options->set('api.username', $params->get('gh_user', ''));
-			$options->set('api.password', $params->get('gh_password', ''));
-		}
 		// Display a message about the lowered API limit without credentials
 		else
 		{