Fix namespace references

joomla · Apr 14, 2019 · 1d08673 · 1d08673
1 parent 3f4c413
commit 1d08673
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/administrator/components/com_privacy/Controller/ConsentsController.php b/administrator/components/com_privacy/Controller/ConsentsController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Privacy\Administrator\Model\ConsentsModel;
 
 /**
  * Consents management controller class.
@@ -43,7 +44,7 @@ public function invalidate($key = null, $urlVar = null)
 		else
 		{
 			// Get the model.
-			/** @var PrivacyModelConsents $model */
+			/** @var ConsentsModel $model */
 			$model = $this->getModel();
 
 			// Publish the items.
@@ -82,7 +83,7 @@ public function invalidateAll()
 		}
 
 		// Get the model.
-		/** @var PrivacyModelConsents $model */
+		/** @var ConsentsModel $model */
 		$model = $this->getModel();
 
 		// Publish the items.

diff --git a/administrator/components/com_privacy/Controller/RequestController.php b/administrator/components/com_privacy/Controller/RequestController.php
@@ -17,6 +17,10 @@
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Component\Privacy\Administrator\Model\ExportModel;
+use Joomla\Component\Privacy\Administrator\Model\RemoveModel;
+use Joomla\Component\Privacy\Administrator\Model\RequestModel;
+use Joomla\Component\Privacy\Administrator\Table\RequestTable;
 
 /**
  * Request management controller class.
@@ -40,10 +44,10 @@ public function complete($key = null, $urlVar = null)
 		// Check for request forgeries.
 		$this->checkToken();
 
-		/** @var PrivacyModelRequest $model */
+		/** @var RequestModel $model */
 		$model = $this->getModel();
 
-		/** @var PrivacyTableRequest $table */
+		/** @var RequestTable $table */
 		$table = $model->getTable();
 
 		// Determine the name of the primary key for the data.
@@ -144,7 +148,7 @@ public function complete($key = null, $urlVar = null)
 	 */
 	public function emailexport()
 	{
-		/** @var PrivacyModelExport $model */
+		/** @var ExportModel $model */
 		$model = $this->getModel('Export');
 
 		$recordId = $this->input->getUint('id');
@@ -309,7 +313,7 @@ public function invalidate($key = null, $urlVar = null)
 	 */
 	public function remove()
 	{
-		/** @var PrivacyModelRemove $model */
+		/** @var RemoveModel $model */
 		$model = $this->getModel('Remove');
 
 		$recordId = $this->input->getUint('id');

diff --git a/administrator/components/com_privacy/Controller/RequestsController.php b/administrator/components/com_privacy/Controller/RequestsController.php
@@ -32,7 +32,7 @@ class RequestsController extends AdminController
 	 *
 	 * @since   3.9.0
 	 */
-	public function getModel($name = 'Request', $prefix = 'PrivacyModel', $config = ['ignore_request' => true])
+	public function getModel($name = 'Request', $prefix = 'Administrator', $config = ['ignore_request' => true])
 	{
 		return parent::getModel($name, $prefix, $config);
 	}