diff --git a/administrator/components/com_menus/Controller/MenuController.php b/administrator/components/com_menus/Controller/MenuController.php index 88141c24172e6..3bebe4787e02c 100644 --- a/administrator/components/com_menus/Controller/MenuController.php +++ b/administrator/components/com_menus/Controller/MenuController.php @@ -29,7 +29,7 @@ class MenuController extends FormController * @param boolean $cachable If true, the view output will be cached. * @param array $urlparams An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}. * - * @return \JController This object to support chaining. + * @return MenuController This object to support chaining. * * @since 1.5 */ diff --git a/administrator/components/com_modules/Model/ModulesModel.php b/administrator/components/com_modules/Model/ModulesModel.php index 856e382831331..8ddffaeea7da7 100644 --- a/administrator/components/com_modules/Model/ModulesModel.php +++ b/administrator/components/com_modules/Model/ModulesModel.php @@ -29,7 +29,7 @@ class ModulesModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see \JController + * @see \JControllerLegacy * @since 1.6 */ public function __construct($config = array()) diff --git a/administrator/components/com_modules/Model/PositionsModel.php b/administrator/components/com_modules/Model/PositionsModel.php index 9938ba3dba6ab..62866c19f8f34 100644 --- a/administrator/components/com_modules/Model/PositionsModel.php +++ b/administrator/components/com_modules/Model/PositionsModel.php @@ -30,7 +30,7 @@ class PositionsModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see \JController + * @see \JControllerLegacy * @since 1.6 */ public function __construct($config = array()) diff --git a/administrator/components/com_workflow/Model/StagesModel.php b/administrator/components/com_workflow/Model/StagesModel.php index 7d728e6e5eaa4..b2558d484d088 100644 --- a/administrator/components/com_workflow/Model/StagesModel.php +++ b/administrator/components/com_workflow/Model/StagesModel.php @@ -26,7 +26,7 @@ class StagesModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see JController + * @see \JControllerLegacy * @since 4.0.0 */ public function __construct($config = array()) diff --git a/administrator/components/com_workflow/Model/TransitionsModel.php b/administrator/components/com_workflow/Model/TransitionsModel.php index 39f17eecc7b27..b41236dafe181 100644 --- a/administrator/components/com_workflow/Model/TransitionsModel.php +++ b/administrator/components/com_workflow/Model/TransitionsModel.php @@ -26,7 +26,7 @@ class TransitionsModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see JController + * @see \JControllerLegacy * @since 4.0.0 */ public function __construct($config = array()) diff --git a/administrator/components/com_workflow/Model/WorkflowsModel.php b/administrator/components/com_workflow/Model/WorkflowsModel.php index 7bd197fd39e76..ddbbbda289d3d 100644 --- a/administrator/components/com_workflow/Model/WorkflowsModel.php +++ b/administrator/components/com_workflow/Model/WorkflowsModel.php @@ -26,7 +26,7 @@ class WorkflowsModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see JController + * @see \JControllerLegacy * @since 4.0.0 */ public function __construct($config = array()) diff --git a/components/com_content/Model/ArticlesModel.php b/components/com_content/Model/ArticlesModel.php index 40f5902322fa9..3b5cdc306e14d 100644 --- a/components/com_content/Model/ArticlesModel.php +++ b/components/com_content/Model/ArticlesModel.php @@ -36,7 +36,7 @@ class ArticlesModel extends ListModel * * @param array $config An optional associative array of configuration settings. * - * @see \JController + * @see \JControllerLegacy * @since 1.6 */ public function __construct($config = array()) diff --git a/components/com_newsfeeds/Controller/DisplayController.php b/components/com_newsfeeds/Controller/DisplayController.php index 4fdcd0302632f..e914bdb296048 100644 --- a/components/com_newsfeeds/Controller/DisplayController.php +++ b/components/com_newsfeeds/Controller/DisplayController.php @@ -27,7 +27,7 @@ class DisplayController extends BaseController * @param boolean $cachable If true, the view output will be cached * @param array $urlparams An array of safe URL parameters and their variable types, for valid values see {@link \JFilterInput::clean()}. * - * @return \JController This object to support chaining. + * @return \JControllerLegacy This object to support chaining. * * @since 1.5 */ diff --git a/libraries/joomla/controller/base.php b/libraries/joomla/controller/base.php deleted file mode 100644 index 3eee2ad6508be..0000000000000 --- a/libraries/joomla/controller/base.php +++ /dev/null @@ -1,77 +0,0 @@ -setApplication($app); - } - else - { - $this->loadApplication(); - } - - if ($input) - { - $this->setInput($input); - } - else - { - $this->loadInput(); - } - } - - /** - * Load the application object. - * - * @return void - * - * @since 3.0.0 - */ - protected function loadApplication() - { - $this->setApplication(Factory::getApplication()); - } - - /** - * Load the input object. - * - * @return void - * - * @since 3.0.0 - */ - protected function loadInput() - { - $this->setInput($this->getApplication()->input); - } -} diff --git a/libraries/joomla/controller/controller.php b/libraries/joomla/controller/controller.php deleted file mode 100644 index f2f57bd64fc06..0000000000000 --- a/libraries/joomla/controller/controller.php +++ /dev/null @@ -1,41 +0,0 @@ -state = $state ?? $this->loadState(); - } - - /** - * Get the model state. - * - * @return Registry The state object. - * - * @since 3.0.0 - */ - public function getState() - { - return $this->state; - } - - /** - * Set the model state. - * - * @param Registry $state The state object. - * - * @return void - * - * @since 3.0.0 - */ - public function setState(Registry $state) - { - $this->state = $state; - } - - /** - * Load the model state. - * - * @return Registry The state object. - * - * @since 3.0.0 - */ - protected function loadState() - { - return new Registry; - } -} diff --git a/libraries/joomla/model/database.php b/libraries/joomla/model/database.php deleted file mode 100644 index 55808b83d20ad..0000000000000 --- a/libraries/joomla/model/database.php +++ /dev/null @@ -1,84 +0,0 @@ -db = isset($db) ? $db : $this->loadDb(); - } - - /** - * Get the database driver. - * - * @return JDatabaseDriver The database driver. - * - * @since 3.0.0 - */ - public function getDb() - { - return $this->db; - } - - /** - * Set the database driver. - * - * @param JDatabaseDriver $db The database driver. - * - * @return void - * - * @since 3.0.0 - */ - public function setDb(JDatabaseDriver $db) - { - $this->db = $db; - } - - /** - * Load the database driver. - * - * @return JDatabaseDriver The database driver. - * - * @since 3.0.0 - */ - protected function loadDb() - { - return Factory::getDbo(); - } -} diff --git a/libraries/joomla/model/model.php b/libraries/joomla/model/model.php deleted file mode 100644 index 1f6e4d9928cb8..0000000000000 --- a/libraries/joomla/model/model.php +++ /dev/null @@ -1,41 +0,0 @@ -model = $model; - } - - /** - * Method to escape output. - * - * @param string $output The output to escape. - * - * @return string The escaped output. - * - * @see JView::escape() - * @since 3.0.0 - */ - public function escape($output) - { - return $output; - } -} diff --git a/libraries/joomla/view/html.php b/libraries/joomla/view/html.php deleted file mode 100644 index e6df6f5ae9015..0000000000000 --- a/libraries/joomla/view/html.php +++ /dev/null @@ -1,200 +0,0 @@ -paths = $paths ?? $this->loadPaths(); - } - - /** - * Magic toString method that is a proxy for the render method. - * - * @return string - * - * @since 3.0.0 - */ - public function __toString() - { - return $this->render(); - } - - /** - * Method to escape output. - * - * @param string $output The output to escape. - * - * @return string The escaped output. - * - * @note the ENT_COMPAT flag will be replaced by ENT_QUOTES in Joomla 4.0 to also escape single quotes - * - * @see JView::escape() - * @since 3.0.0 - */ - public function escape($output) - { - // Escape the output. - return htmlspecialchars($output, ENT_QUOTES, 'UTF-8'); - } - - /** - * Method to get the view layout. - * - * @return string The layout name. - * - * @since 3.0.0 - */ - public function getLayout() - { - return $this->layout; - } - - /** - * Method to get the layout path. - * - * @param string $layout The layout name. - * - * @return mixed The layout file name if found, false otherwise. - * - * @since 3.0.0 - */ - public function getPath($layout) - { - // Get the layout file name. - $file = JPath::clean($layout . '.php'); - - // Find the layout file path. - $path = JPath::find(clone $this->paths, $file); - - return $path; - } - - /** - * Method to get the view paths. - * - * @return SplPriorityQueue The paths queue. - * - * @since 3.0.0 - */ - public function getPaths() - { - return $this->paths; - } - - /** - * Method to render the view. - * - * @return string The rendered view. - * - * @since 3.0.0 - * @throws RuntimeException - */ - public function render() - { - // Get the layout path. - $path = $this->getPath($this->getLayout()); - - // Check if the layout path was found. - if (!$path) - { - throw new RuntimeException('Layout Path Not Found'); - } - - // Start an output buffer. - ob_start(); - - // Load the layout. - include $path; - - // Get the layout contents. - $output = ob_get_clean(); - - return $output; - } - - /** - * Method to set the view layout. - * - * @param string $layout The layout name. - * - * @return JViewHtml Method supports chaining. - * - * @since 3.0.0 - */ - public function setLayout($layout) - { - $this->layout = $layout; - - return $this; - } - - /** - * Method to set the view paths. - * - * @param SplPriorityQueue $paths The paths queue. - * - * @return JViewHtml Method supports chaining. - * - * @since 3.0.0 - */ - public function setPaths(SplPriorityQueue $paths) - { - $this->paths = $paths; - - return $this; - } - - /** - * Method to load the paths queue. - * - * @return SplPriorityQueue The paths queue. - * - * @since 3.0.0 - */ - protected function loadPaths() - { - return new SplPriorityQueue; - } -} diff --git a/libraries/joomla/view/view.php b/libraries/joomla/view/view.php deleted file mode 100644 index f6ebce2f00926..0000000000000 --- a/libraries/joomla/view/view.php +++ /dev/null @@ -1,40 +0,0 @@ -