From a0ec7652f8e366ca5ad463067569da91dd55bd30 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Mon, 1 Oct 2018 10:29:03 +1000 Subject: [PATCH] Remove stub method This is a very old stub method included to point out an override is available, in the process it prevents the viewBag property from being populated by the underlying CmsCompoundObject base class, thereby preventing anyone from extending the Layout or Page with custom form fields. Refs #3769 --- modules/cms/classes/Layout.php | 4 ---- modules/cms/classes/Page.php | 16 ++++++---------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/modules/cms/classes/Layout.php b/modules/cms/classes/Layout.php index 8c681321d..8ef4b59b4 100644 --- a/modules/cms/classes/Layout.php +++ b/modules/cms/classes/Layout.php @@ -18,10 +18,6 @@ class Layout extends CmsCompoundObject */ protected $dirName = 'layouts'; - protected function parseSettings() - { - } - /** * Initializes the fallback layout. * @param \Cms\Classes\Theme $theme Specifies a theme the file belongs to. diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php index 2ea4ce171..f58d15af1 100644 --- a/modules/cms/classes/Page.php +++ b/modules/cms/classes/Page.php @@ -60,15 +60,11 @@ class Page extends CmsCompoundObject ]; } - protected function parseSettings() - { - } - /** * Returns name of a PHP class to us a parent for the PHP class created for the object's PHP section. * @return mixed Returns the class name or null. */ - public function getCodeClassParent() : string + public function getCodeClassParent() { return PageCode::class; } @@ -78,7 +74,7 @@ class Page extends CmsCompoundObject * This method is used by the form widget. * @return array Returns an array of strings. */ - public function getLayoutOptions() : array + public function getLayoutOptions() { if (!($theme = Theme::getEditTheme())) { throw new ApplicationException(Lang::get('cms::lang.theme.edit.not_found')); @@ -105,7 +101,7 @@ class Page extends CmsCompoundObject * Helper that returns a nicer list of pages for use in dropdowns. * @return array */ - public static function getNameList() : array + public static function getNameList() { $result = []; $pages = self::sortBy('baseFileName')->all(); @@ -122,7 +118,7 @@ class Page extends CmsCompoundObject * @param array $params Route parameters to consider in the URL. * @return string */ - public static function url($page, array $params = []) : string + public static function url($page, array $params = []) { /* * Reuse existing controller or create a new one, @@ -151,7 +147,7 @@ class Page extends CmsCompoundObject * @param string $type Specifies the menu item type * @return array Returns an array */ - public static function getMenuTypeInfo(string $type) : array + public static function getMenuTypeInfo(string $type) { $result = []; @@ -219,7 +215,7 @@ class Page extends CmsCompoundObject * @param string $type Specifies the page link type * @return array */ - public static function getRichEditorTypeInfo(string $type) : array + public static function getRichEditorTypeInfo(string $type) { $result = [];