From fad028bc4099a771894347b68710a3b2ca763e4f Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 19 Mar 2016 13:22:08 +1100 Subject: [PATCH] Add local cmsObject.fillViewBagArray event Tidy up some inline docs --- modules/cms/classes/CmsCompoundObject.php | 14 +++++++++----- modules/system/console/OctoberUtil.php | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php index ce776d1a9..defa0c032 100644 --- a/modules/cms/classes/CmsCompoundObject.php +++ b/modules/cms/classes/CmsCompoundObject.php @@ -101,7 +101,6 @@ class CmsCompoundObject extends CmsObject /** * If the model is loaded with an invalid INI section, the invalid content will be * passed as a special attribute. Look for it, then locate the failure reason. - * * @return void */ protected function validateSettings() @@ -115,9 +114,9 @@ class CmsCompoundObject extends CmsObject /** * Parses the settings array. - * Child classes can override this method in order to update - * the content of the $settings property after the object - * is loaded from a file. + * Child classes can override this method in order to update the content + * of the $settings property after the object is loaded from a file. + * @return void */ protected function parseSettings() { @@ -131,6 +130,7 @@ class CmsCompoundObject extends CmsObject /** * Runs components defined in the settings * Process halts if a component returns a value + * @return void */ public function runComponents() { @@ -145,6 +145,7 @@ class CmsCompoundObject extends CmsObject * Parse component sections. * Replace the multiple component sections with a single "components" * element in the $settings property. + * @return void */ protected function parseComponentSettings() { @@ -331,9 +332,10 @@ class CmsCompoundObject extends CmsObject return $this->viewBagCache = $this->getComponent($componentName); } - /* + /** * Copies view bag properties to the view bag array. * This is required for the back-end editors. + * @return void */ protected function fillViewBagArray() { @@ -341,6 +343,8 @@ class CmsCompoundObject extends CmsObject foreach ($viewBag->getProperties() as $name => $value) { $this->viewBag[$name] = $value; } + + $this->fireEvent('cmsObject.fillViewBagArray'); } // diff --git a/modules/system/console/OctoberUtil.php b/modules/system/console/OctoberUtil.php index cfea8587d..955ce8243 100644 --- a/modules/system/console/OctoberUtil.php +++ b/modules/system/console/OctoberUtil.php @@ -14,6 +14,12 @@ use System\Classes\CombineAssets; * Supported commands: * * - purge thumbs: Deletes all thumbnail files in the uploads directory. + * - git pull: Perform "git pull" on all plugins and themes. + * - compile assets: Compile registered Language, LESS and JS files. + * - compile js: Compile registered JS files only. + * - compile less: Compile registered LESS files only. + * - compile lang: Compile registered Language files only. + * */ class OctoberUtil extends Command {