Removing calls to Factory::getApplication and getDbo

Author: Hackwar

administrator/components/com_finder/src/Controller/IndexController.php

@@ -52,9 +52,8 @@ public function optimise()
 		$this->checkToken();
 
 		// Optimise the index by first running the garbage collection
-		$app = Factory::getApplication();
 		PluginHelper::importPlugin('finder');
-		$app->triggerEvent('onFinderGarbageCollection');
+		$this->app->triggerEvent('onFinderGarbageCollection');
 
 		// Now run the optimisation method from the indexer
 		$indexer = new Indexer;

administrator/components/com_finder/src/Indexer/Adapter.php

@@ -271,7 +271,7 @@ public function onBuildIndex()
 	 */
 	public function onFinderGarbageCollection()
 	{
-		$db = Factory::getDbo();
+		$db = $this->db;
 		$type_id = $this->getTypeId();
 
 		$query = $db->getQuery(true);
@@ -396,7 +396,7 @@ protected function remove($id, $removeTaxonomies = true)
 		// Check the items.
 		if (empty($items))
 		{
-			Factory::getApplication()->triggerEvent('onFinderIndexAfterDelete', array($id));
+			$this->app->triggerEvent('onFinderIndexAfterDelete', array($id));
 
 			return true;
 		}