Clean up Factory calls (#25679)

joomla · Jul 24, 2019 · 0649e2c · 0649e2c
1 parent 1e8198a
commit 0649e2c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Association\AssociationServiceInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\BeforeExecuteEvent;
@@ -87,7 +88,7 @@ class PlgSystemLanguageFilter extends CMSPlugin
 	/**
 	 * Application object.
 	 *
-	 * @var    JApplicationCms
+	 * @var    CMSApplicationInterface
 	 * @since  3.3
 	 */
 	protected $app;
@@ -104,8 +105,6 @@ public function __construct(&$subject, $config)
 	{
 		parent::__construct($subject, $config);
 
-		$this->app = Factory::getApplication();
-
 		// Setup language data.
 		$this->mode_sef     = $this->app->get('sef', 0);
 		$this->sefs         = LanguageHelper::getLanguages('sef');
@@ -115,7 +114,7 @@ public function __construct(&$subject, $config)
 		// If language filter plugin is executed in a site page.
 		if ($this->app->isClient('site'))
 		{
-			$levels = Factory::getUser()->getAuthorisedViewLevels();
+			$levels = $this->app->getIdentity()->getAuthorisedViewLevels();
 
 			foreach ($this->sefs as $sef => $language)
 			{
@@ -524,7 +523,7 @@ public function parseRule(&$router, &$uri)
 		// Set the request var.
 		$this->app->input->set('language', $lang_code);
 		$this->app->set('language', $lang_code);
-		$language = Factory::getLanguage();
+		$language = $this->app->getLanguage();
 
 		if ($language->getTag() !== $lang_code)
 		{
@@ -780,15 +779,15 @@ public function onUserLogin($user, $options = array())
 	 */
 	public function onAfterDispatch()
 	{
-		$doc = Factory::getDocument();
+		$doc = $this->app->getDocument();
 
 		if ($this->app->isClient('site') && $this->params->get('alternate_meta', 1) && $doc->getType() === 'html')
 		{
 			$languages             = $this->lang_codes;
 			$homes                 = Multilanguage::getSiteHomePages();
 			$menu                  = $this->app->getMenu();
 			$active                = $menu->getActive();
-			$levels                = Factory::getUser()->getAuthorisedViewLevels();
+			$levels                = $this->app->getIdentity()->getAuthorisedViewLevels();
 			$remove_default_prefix = $this->params->get('remove_default_prefix', 0);
 			$server                = Uri::getInstance()->toString(array('scheme', 'host', 'port'));
 			$is_home               = false;