remove usage of $this->app and use $this->getApplication() for Joomla 6.x

Author: zero-24

gitdeploy.php

@@ -30,14 +30,6 @@ class plgSystemGitDeploy extends CMSPlugin
 	 */
 	protected $autoloadLanguage = true;
 
-	/**
-	 * Application object.
-	 *
-	 * @var    CMSApplication
-	 * @since  1.0
-	 */
-	protected $app;
-
 	/**
 	 * Raw post data
 	 *
@@ -56,7 +48,7 @@ class plgSystemGitDeploy extends CMSPlugin
 	 */
 	public function onAfterRoute()
 	{
-		if ($this->app->input->getCmd('github', false))
+		if ($this->getApplication()->input->getCmd('github', false))
 		{
 			set_error_handler(
 				function($severity, $message, $file, $line)
@@ -70,7 +62,7 @@ function($e)
 				{
 					header('HTTP/1.1 500 Internal Server Error');
 					echo "Error on line {$e->getLine()}: " . htmlspecialchars($e->getMessage());
-					$this->app->close();
+					$this->getApplication()->close();
 				}
 			);
 
@@ -85,7 +77,7 @@ function($e)
 			$this->setPayload();
 			$this->handleGitHubEvent();
 
-			$this->app->close();
+			$this->getApplication()->close();
 		}
 	}
 
@@ -101,7 +93,7 @@ function($e)
 	 */
 	protected function checkSecret($hookSecret)
 	{
-		if (!$this->app->input->server->get('HTTP_X_HUB_SIGNATURE_256', false))
+		if (!$this->getApplication()->input->server->get('HTTP_X_HUB_SIGNATURE_256', false))
 		{
 			throw new \Exception("HTTP header 'X-Hub-Signature' is missing.");
 		}
@@ -111,7 +103,7 @@ protected function checkSecret($hookSecret)
 			throw new \Exception("Missing 'hash' extension to check the secret code validity.");
 		}
 
-		list($algo, $hash) = explode('=', $this->app->input->server->getString('HTTP_X_HUB_SIGNATURE_256'), 2) + array('', '');
+		list($algo, $hash) = explode('=', $this->getApplication()->input->server->getString('HTTP_X_HUB_SIGNATURE_256'), 2) + array('', '');
 
 		if (!in_array($algo, hash_algos(), TRUE))
 		{
@@ -136,11 +128,11 @@ protected function checkSecret($hookSecret)
 	 */
 	protected function checkContentType()
 	{
-		if (!$this->app->input->server->getString('CONTENT_TYPE', false))
+		if (!$this->getApplication()->input->server->getString('CONTENT_TYPE', false))
 		{
 			throw new \Exception("Missing HTTP 'Content-Type' header.");
 		}
-		elseif (!$this->app->input->server->getString('HTTP_X_GITHUB_EVENT', false))
+		elseif (!$this->getApplication()->input->server->getString('HTTP_X_GITHUB_EVENT', false))
 		{
 			throw new \Exception("Missing HTTP 'X-Github-Event' header.");
 		}
@@ -156,18 +148,18 @@ protected function checkContentType()
 	 */
 	protected function setPayload()
 	{
-		switch ($this->app->input->server->getString('CONTENT_TYPE'))
+		switch ($this->getApplication()->input->server->getString('CONTENT_TYPE'))
 		{
 			case 'application/json':
 				$json = $this->rawPost ?: file_get_contents('php://input');
 				break;
 
 			case 'application/x-www-form-urlencoded':
-				$json = $this->app->input->post->get('payload');
+				$json = $this->getApplication()->input->post->get('payload');
 				break;
 
 			default:
-				throw new \Exception('Unsupported content type: ' . $this->app->input->server->getString('HTTP_CONTENT_TYPE'));
+				throw new \Exception('Unsupported content type: ' . $this->getApplication()->input->server->getString('HTTP_CONTENT_TYPE'));
 		}
 
 		$this->payload = json_decode($json);
@@ -183,7 +175,7 @@ protected function setPayload()
 	 */
 	protected function handleGitHubEvent()
 	{
-		$githubEvent = $this->app->input->server->get('HTTP_X_GITHUB_EVENT');
+		$githubEvent = $this->getApplication()->input->server->get('HTTP_X_GITHUB_EVENT');
 
 		switch (strtolower($githubEvent))
 		{
@@ -205,7 +197,7 @@ protected function handleGitHubEvent()
 			default:
 				header('HTTP/1.0 404 Not Found');
 				echo 'Event: ' . $githubEvent . ' Payload: \n' . $this->payload;
-				$this->app->close();
+				$this->getApplication()->close();
 		}
 	}
 
@@ -270,7 +262,7 @@ protected function runGitPull($payload)
 				$commitsHtml .= '</ul>';
 
 				// Do we have a targetSite parameter
-				$targetSite = $this->app->input->getCmd('targetSite', false);
+				$targetSite = $this->getApplication()->input->getCmd('targetSite', false);
 
 				$messageData['pusherName'] = $payload->pusher->name;
 				$messageData['repoUrl'] = $payload->repository->url;