From 56d0c3351b33a12d403d33da862a79daeeeb6f6a Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Fri, 1 Aug 2014 18:20:55 +1000
Subject: [PATCH] private -> protected

---
 modules/backend/behaviors/FormController.php     |  4 ++--
 modules/backend/behaviors/ListController.php     |  8 ++++----
 modules/backend/behaviors/RelationController.php | 12 ++++++------
 modules/backend/classes/AuthManager.php          |  6 +++---
 modules/backend/classes/NavigationManager.php    | 12 ++++++------
 modules/backend/classes/WidgetManager.php        |  4 ++--
 modules/backend/widgets/Form.php                 |  2 +-
 modules/backend/widgets/Toolbar.php              |  2 +-
 modules/cms/classes/CmsException.php             |  2 +-
 modules/cms/classes/CodeParser.php               |  8 ++++----
 modules/cms/classes/ComponentManager.php         |  2 +-
 modules/cms/classes/Router.php                   |  2 +-
 modules/cms/twig/Extension.php                   |  2 +-
 modules/system/classes/ExceptionBase.php         |  4 ++--
 modules/system/classes/MarkupManager.php         |  2 +-
 modules/system/classes/SettingsManager.php       | 10 +++++-----
 modules/system/controllers/Settings.php          |  2 +-
 modules/system/twig/Extension.php                |  2 +-
 18 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index ecde8c9ed..02cc43ba1 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -25,7 +25,7 @@ class FormController extends ControllerBehavior
     /**
      * @var Backend\Classes\WidgetBase Reference to the widget object.
      */
-    private $formWidget;
+    protected $formWidget;
 
     /**
      * {@inheritDoc}
@@ -47,7 +47,7 @@ class FormController extends ControllerBehavior
     /**
      * @var array List of prepared models that require saving.
      */
-    private $modelsToSave = [];
+    protected $modelsToSave = [];
 
     /**
      * Behavior constructor
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index 77896c924..444a0f2fe 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -19,22 +19,22 @@ class ListController extends ControllerBehavior
     /**
      * @var array List definitions, keys for alias and value for configuration.
      */
-    private $listDefinitions;
+    protected $listDefinitions;
 
     /**
      * @var string The primary list alias to use. Default: list
      */
-    private $primaryDefinition;
+    protected $primaryDefinition;
 
     /**
      * @var Backend\Classes\WidgetBase Reference to the list widget object.
      */
-    private $listWidgets = [];
+    protected $listWidgets = [];
 
     /**
      * @var WidgetBase Reference to the toolbar widget objects.
      */
-    private $toolbarWidgets = [];
+    protected $toolbarWidgets = [];
 
     /**
      * {@inheritDoc}
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index f1afd0c65..0f479d814 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -26,22 +26,22 @@ class RelationController extends ControllerBehavior
     /**
      * @var Backend\Classes\WidgetBase Reference to the toolbar widget object.
      */
-    private $toolbarWidget;
+    protected $toolbarWidget;
 
     /**
      * @var Backend\Classes\WidgetBase Reference to the widget used for viewing (list or form).
      */
-    private $viewWidget;
+    protected $viewWidget;
 
     /**
      * @var Backend\Classes\WidgetBase Reference to the widget used for relation management.
      */
-    private $manageWidget;
+    protected $manageWidget;
 
     /**
      * @var Backend\Classes\WidgetBase Reference to widget for relations with pivot data.
      */
-    private $pivotWidget;
+    protected $pivotWidget;
 
     /**
      * {@inheritDoc}
@@ -61,12 +61,12 @@ class RelationController extends ControllerBehavior
     /**
      * @var array Original configuration values
      */
-    private $originalConfig;
+    protected $originalConfig;
 
     /**
      * @var bool Has the behavior been initialized.
      */
-    private $initialized = false;
+    protected $initialized = false;
 
     /**
      * @var string Relationship type
diff --git a/modules/backend/classes/AuthManager.php b/modules/backend/classes/AuthManager.php
index f115514be..41b992f76 100644
--- a/modules/backend/classes/AuthManager.php
+++ b/modules/backend/classes/AuthManager.php
@@ -37,17 +37,17 @@ class AuthManager extends RainAuthManager
     /**
      * @var array Cache of registration callbacks.
      */
-    private $callbacks = [];
+    protected $callbacks = [];
 
     /**
      * @var array List of registered permissions.
      */
-    private $permissions = [];
+    protected $permissions = [];
 
     /**
      * @var array Cache of registered permissions.
      */
-    private $permissionCache = false;
+    protected $permissionCache = false;
 
     /**
      * Registers a callback function that defines authentication permissions.
diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php
index 7c20e26d6..8b21c68f4 100644
--- a/modules/backend/classes/NavigationManager.php
+++ b/modules/backend/classes/NavigationManager.php
@@ -17,18 +17,18 @@ class NavigationManager
     /**
      * @var array Cache of registration callbacks.
      */
-    private $callbacks = [];
+    protected $callbacks = [];
 
     /**
      * @var array List of registered items.
      */
-    private $items;
+    protected $items;
 
-    private $contextSidenavPartials = [];
+    protected $contextSidenavPartials = [];
 
-    private $contextOwner;
-    private $contextMainMenuItemCode;
-    private $contextSideMenuItemCode;
+    protected $contextOwner;
+    protected $contextMainMenuItemCode;
+    protected $contextSideMenuItemCode;
 
     static $mainItemDefaults = [
         'code'        => null,
diff --git a/modules/backend/classes/WidgetManager.php b/modules/backend/classes/WidgetManager.php
index 59fb88e9f..007ad3571 100644
--- a/modules/backend/classes/WidgetManager.php
+++ b/modules/backend/classes/WidgetManager.php
@@ -27,7 +27,7 @@ class WidgetManager
     /**
      * @var array Cache of report widget registration callbacks.
      */
-    private $formWidgetCallbacks = [];
+    protected $formWidgetCallbacks = [];
 
     /**
      * @var array An array of report widgets.
@@ -42,7 +42,7 @@ class WidgetManager
     /**
      * @var array Cache of report widget registration callbacks.
      */
-    private $reportWidgetCallbacks = [];
+    protected $reportWidgetCallbacks = [];
 
     /**
      * @var array An array where keys are aliases and values are class names.
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 060c6ffdd..3eb2e8ffa 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -46,7 +46,7 @@ class Form extends WidgetBase
      */
     public $allFields = [];
 
-    /** 
+    /**
      * @var array Collection of all form widgets used in this form.
      */
     public $formWidgets = [];
diff --git a/modules/backend/widgets/Toolbar.php b/modules/backend/widgets/Toolbar.php
index e2abfb0b2..eefd498ac 100644
--- a/modules/backend/widgets/Toolbar.php
+++ b/modules/backend/widgets/Toolbar.php
@@ -19,7 +19,7 @@ class Toolbar extends WidgetBase
     /**
      * @var WidgetBase Reference to the search widget object.
      */
-    private $searchWidget;
+    protected $searchWidget;
 
     /**
      * @var string Name of partial containing control panel.
diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php
index e8066d626..3dec87b0f 100644
--- a/modules/cms/classes/CmsException.php
+++ b/modules/cms/classes/CmsException.php
@@ -20,7 +20,7 @@ class CmsException extends ApplicationException
     /**
      * @var Cms\Classes\CmsCompoundObject A reference to a CMS object used for masking errors.
      */
-    private $compoundObject;
+    protected $compoundObject;
 
     /**
      * @var array Collection of error codes for each error distinction.
diff --git a/modules/cms/classes/CodeParser.php b/modules/cms/classes/CodeParser.php
index ca60a7131..866d02424 100644
--- a/modules/cms/classes/CodeParser.php
+++ b/modules/cms/classes/CodeParser.php
@@ -17,22 +17,22 @@ class CodeParser
     /**
      * @var \Cms\Classes\CmsCompoundObject A reference to the CMS object being parsed.
      */
-    private $object;
+    protected $object;
 
     /**
      * @var string Contains a path to the CMS object's file being parsed.
      */
-    private $filePath;
+    protected $filePath;
 
     /**
      * @var mixed The internal cache, keeps parsed object information during a request.
      */
-    static private $cache = [];
+    static protected $cache = [];
 
     /**
      * @var string Key for the parsed PHP file information cache.
      */
-    private $dataCacheKey = 'cms-php-file-data';
+    protected $dataCacheKey = 'cms-php-file-data';
 
     /**
      * Creates the class instance
diff --git a/modules/cms/classes/ComponentManager.php b/modules/cms/classes/ComponentManager.php
index 8674c7a33..ed0f3cfb8 100644
--- a/modules/cms/classes/ComponentManager.php
+++ b/modules/cms/classes/ComponentManager.php
@@ -18,7 +18,7 @@ class ComponentManager
     /**
      * @var array Cache of registration callbacks.
      */
-    private $callbacks = [];
+    protected $callbacks = [];
 
     /**
      * @var array An array where keys are codes and values are class names.
diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
index 17964df10..d12582063 100644
--- a/modules/cms/classes/Router.php
+++ b/modules/cms/classes/Router.php
@@ -42,7 +42,7 @@ class Router
     /**
      * @var array A list of parameters names and values extracted from the URL pattern and URL string.
      */
-    private $parameters = [];
+    protected $parameters = [];
 
     /**
      * @var array Contains the URL map - the list of page file names and corresponding URL patterns.
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index d9e390617..7d3ef5e81 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -22,7 +22,7 @@ class Extension extends Twig_Extension
     /**
      * @var \Cms\Classes\Controller A reference to the CMS controller.
      */
-    private $controller;
+    protected $controller;
 
     /**
      * Creates the extension instance.
diff --git a/modules/system/classes/ExceptionBase.php b/modules/system/classes/ExceptionBase.php
index 15688084a..7112a1923 100644
--- a/modules/system/classes/ExceptionBase.php
+++ b/modules/system/classes/ExceptionBase.php
@@ -18,7 +18,7 @@ class ExceptionBase extends Exception
     /**
      * @var Exception If this exception is acting as a mask, this property stores the face exception.
      */
-    private $mask;
+    protected $mask;
 
     /**
      * @var string Hint Message to help the user with troubleshooting the error (optional).
@@ -43,7 +43,7 @@ class ExceptionBase extends Exception
     /**
      * @var stdObject Cached code information for highlighting code.
      */
-    private $highlight;
+    protected $highlight;
 
     /**
      * CMS base exception class constructor. Inherits the native PHP Exception.
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index 6a6453900..37cf11193 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -24,7 +24,7 @@ class MarkupManager
     /**
      * @var array Cache of registration callbacks.
      */
-    private $callbacks = [];
+    protected $callbacks = [];
 
     /**
      * @var array Registered extension items
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index 08089561d..30459ffcb 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -17,20 +17,20 @@ class SettingsManager
     /**
      * @var array Cache of registration callbacks.
      */
-    private $callbacks = [];
+    protected $callbacks = [];
 
     /**
      * @var array List of registered items.
      */
-    private $items;
+    protected $items;
     
     /**
      * @var array Flat collection of all items.
      */
-    private $allItems;
+    protected $allItems;
 
-    private $contextOwner;
-    private $contextItemCode;
+    protected $contextOwner;
+    protected $contextItemCode;
 
     static $itemDefaults = [
         'code'        => null,
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index e9044f495..af03d20c7 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -23,7 +23,7 @@ class Settings extends Controller
     /**
      * @var WidgetBase Reference to the widget object.
      */
-    private $formWidget;
+    protected $formWidget;
 
     public $requiredPermissions = ['system.manage_settings'];
 
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 71483a294..22ec306f1 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -20,7 +20,7 @@ class Extension extends Twig_Extension
     /**
      * @var \System\Classes\MarkupManager A reference to the markup manager instance.
      */
-    private $markupManager;
+    protected $markupManager;
 
     /**
      * Creates the extension instance.