From 29dc12dbc256114e0113ee0b75f42a9043de794a Mon Sep 17 00:00:00 2001
From: predominant <graham@grahamweldon.com>
Date: Sun, 4 Apr 2010 16:33:39 +1000
Subject: [PATCH] Changed all $__ declared variables to private.

---
 cake/console/libs/schema.php                  |  2 +-
 cake/console/libs/tasks/db_config.php         |  2 +-
 cake/console/libs/tasks/extract.php           | 16 ++++++-------
 cake/libs/cache.php                           |  6 ++---
 cake/libs/cache/memcache.php                  |  2 +-
 cake/libs/class_registry.php                  |  6 ++---
 cake/libs/configure.php                       | 10 ++++----
 cake/libs/controller/component.php            |  4 ++--
 cake/libs/controller/components/cookie.php    |  8 +++----
 cake/libs/controller/components/email.php     |  8 +++----
 .../controller/components/request_handler.php | 10 ++++----
 cake/libs/controller/components/session.php   |  4 ++--
 cake/libs/controller/controller.php           |  2 +-
 cake/libs/controller/scaffold.php             |  2 +-
 cake/libs/folder.php                          |  8 +++----
 cake/libs/i18n.php                            | 10 ++++----
 cake/libs/l10n.php                            |  4 ++--
 cake/libs/model/behaviors/acl.php             |  2 +-
 cake/libs/model/datasources/datasource.php    |  2 +-
 cake/libs/model/datasources/dbo/dbo_mssql.php |  4 ++--
 .../libs/model/datasources/dbo/dbo_oracle.php |  2 +-
 cake/libs/model/datasources/dbo_source.php    |  4 ++--
 cake/libs/model/model.php                     | 12 +++++-----
 cake/libs/model/model_behavior.php            |  4 ++--
 cake/libs/multibyte.php                       |  6 ++---
 cake/libs/router.php                          | 24 +++++++++----------
 cake/libs/validation.php                      |  2 +-
 cake/libs/view/helper.php                     |  4 ++--
 cake/libs/view/helpers/ajax.php               |  2 +-
 cake/libs/view/helpers/cache.php              |  4 ++--
 cake/libs/view/helpers/form.php               |  2 +-
 cake/libs/view/helpers/html.php               |  4 ++--
 cake/libs/view/helpers/javascript.php         |  2 +-
 cake/libs/view/helpers/js.php                 |  6 ++---
 cake/libs/view/helpers/paginator.php          |  2 +-
 cake/libs/view/helpers/session.php            |  2 +-
 cake/libs/view/view.php                       |  6 ++---
 cake/libs/xml.php                             | 12 +++++-----
 cake/tests/lib/cake_test_case.php             |  4 ++--
 39 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/cake/console/libs/schema.php b/cake/console/libs/schema.php
index b8efe2a55..9ecd9a794 100644
--- a/cake/console/libs/schema.php
+++ b/cake/console/libs/schema.php
@@ -38,7 +38,7 @@ class SchemaShell extends Shell {
  * @var boolean
  * @access private
  */
-	var $__dry = null;
+	private $__dry = null;
 
 /**
  * Override initialize
diff --git a/cake/console/libs/tasks/db_config.php b/cake/console/libs/tasks/db_config.php
index 00ad98fcf..b311d80c6 100644
--- a/cake/console/libs/tasks/db_config.php
+++ b/cake/console/libs/tasks/db_config.php
@@ -40,7 +40,7 @@ class DbConfigTask extends Shell {
  * @var array
  * @access private
  */
-	var $__defaultConfig = array(
+	private $__defaultConfig = array(
 		'name' => 'default', 'driver'=> 'mysql', 'persistent'=> 'false', 'host'=> 'localhost',
 		'login'=> 'root', 'password'=> 'password', 'database'=> 'project_name',
 		'schema'=> null, 'prefix'=> null, 'encoding' => null, 'port' => null
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index f2a1275d8..0c30e2909 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -32,7 +32,7 @@ class ExtractTask extends Shell {
  * @var string
  * @access private
  */
-	var $__paths = array();
+	private $__paths = array();
 
 /**
  * Files from where to extract
@@ -40,7 +40,7 @@ class ExtractTask extends Shell {
  * @var array
  * @access private
  */
-	var $__files = array();
+	private $__files = array();
 
 /**
  * Merge all domains string into the default.pot file
@@ -48,7 +48,7 @@ class ExtractTask extends Shell {
  * @var boolean
  * @access private
  */
-	var $__merge = false;
+	private $__merge = false;
 
 /**
  * Current file being processed
@@ -56,7 +56,7 @@ class ExtractTask extends Shell {
  * @var string
  * @access private
  */
-	var $__file = null;
+	private $__file = null;
 
 /**
  * Contains all content waiting to be write
@@ -64,7 +64,7 @@ class ExtractTask extends Shell {
  * @var string
  * @access private
  */
-	var $__storage = array();
+	private $__storage = array();
 
 /**
  * Extracted tokens
@@ -72,7 +72,7 @@ class ExtractTask extends Shell {
  * @var array
  * @access private
  */
-	var $__tokens = array();
+	private $__tokens = array();
 
 /**
  * Extracted strings
@@ -80,7 +80,7 @@ class ExtractTask extends Shell {
  * @var array
  * @access private
  */
-	var $__strings = array();
+	private $__strings = array();
 
 /**
  * Destination path
@@ -88,7 +88,7 @@ class ExtractTask extends Shell {
  * @var string
  * @access private
  */
-	var $__output = null;
+	private $__output = null;
 
 /**
  * Execution method always used for tasks
diff --git a/cake/libs/cache.php b/cake/libs/cache.php
index a0c448d4d..6335338f3 100644
--- a/cake/libs/cache.php
+++ b/cake/libs/cache.php
@@ -35,7 +35,7 @@ class Cache {
  * @var array
  * @access private
  */
-	var $__config = array();
+	private $__config = array();
 
 /**
  * Holds name of the current configuration name being used.
@@ -43,7 +43,7 @@ class Cache {
  * @var array
  * @access private
  */
-	var $__name = 'default';
+	private $__name = 'default';
 
 /**
  * Whether to reset the settings with the next call to Cache::set();
@@ -51,7 +51,7 @@ class Cache {
  * @var array
  * @access private
  */
-	var $__reset = false;
+	private $__reset = false;
 
 /**
  * Engine instances keyed by configuration name.
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index 013ef2759..ec4e99a57 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -33,7 +33,7 @@ class MemcacheEngine extends CacheEngine {
  * @var Memcache
  * @access private
  */
-	var $__Memcache = null;
+	private $__Memcache = null;
 
 /**
  * Settings
diff --git a/cake/libs/class_registry.php b/cake/libs/class_registry.php
index e0eff1832..dd78c35c9 100644
--- a/cake/libs/class_registry.php
+++ b/cake/libs/class_registry.php
@@ -38,7 +38,7 @@ class ClassRegistry {
  * @var array
  * @access private
  */
-	var $__objects = array();
+	private $__objects = array();
 
 /**
  * Names of class names mapped to the object in the registry.
@@ -46,7 +46,7 @@ class ClassRegistry {
  * @var array
  * @access private
  */
-	var $__map = array();
+	private $__map = array();
 
 /**
  * Default constructor parameter settings, indexed by type
@@ -54,7 +54,7 @@ class ClassRegistry {
  * @var array
  * @access private
  */
-	var $__config = array();
+	private $__config = array();
 
 /**
  * Return a singleton instance of the ClassRegistry.
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 802ed1c3b..b561a5e3f 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -584,7 +584,7 @@ class App extends Object {
  * @var boolean
  * @access private
  */
-	var $__cache = false;
+	private $__cache = false;
 
 /**
  * Holds key/value pairs of $type => file path.
@@ -592,7 +592,7 @@ class App extends Object {
  * @var array
  * @access private
  */
-	var $__map = array();
+	private $__map = array();
 
 /**
  * Holds paths for deep searching of files.
@@ -600,7 +600,7 @@ class App extends Object {
  * @var array
  * @access private
  */
-	var $__paths = array();
+	private $__paths = array();
 
 /**
  * Holds loaded files.
@@ -608,7 +608,7 @@ class App extends Object {
  * @var array
  * @access private
  */
-	var $__loaded = array();
+	private $__loaded = array();
 
 /**
  * Holds and key => value array of object types.
@@ -616,7 +616,7 @@ class App extends Object {
  * @var array
  * @access private
  */
-	var $__objects = array();
+	private $__objects = array();
 
 /**
  * Used to read information stored path
diff --git a/cake/libs/controller/component.php b/cake/libs/controller/component.php
index 4df0b1257..89a35636a 100644
--- a/cake/libs/controller/component.php
+++ b/cake/libs/controller/component.php
@@ -32,7 +32,7 @@ class Component extends Object {
  * @var object
  * @access private
  */
-	var $__controllerVars = array('plugin' => null, 'name' => null, 'base' => null);
+	private $__controllerVars = array('plugin' => null, 'name' => null, 'base' => null);
 
 /**
  * List of loaded components.
@@ -57,7 +57,7 @@ class Component extends Object {
  * @var array
  * @access private
  */
-	var $__settings = array();
+	private $__settings = array();
 
 /**
  * Used to initialize the components for current controller.
diff --git a/cake/libs/controller/components/cookie.php b/cake/libs/controller/components/cookie.php
index 4b24d3343..1e09fb66b 100644
--- a/cake/libs/controller/components/cookie.php
+++ b/cake/libs/controller/components/cookie.php
@@ -124,7 +124,7 @@ class CookieComponent extends Object {
  * @var string
  * @access private
  */
-	var $__values = array();
+	private $__values = array();
 
 /**
  * Type of encryption to use.
@@ -136,7 +136,7 @@ class CookieComponent extends Object {
  * @access private
  * @todo add additional encryption methods
  */
-	var $__type = 'cipher';
+	private $__type = 'cipher';
 
 /**
  * Used to reset cookie time if $expire is passed to CookieComponent::write()
@@ -144,7 +144,7 @@ class CookieComponent extends Object {
  * @var string
  * @access private
  */
-	var $__reset = null;
+	private $__reset = null;
 
 /**
  * Expire time of the cookie
@@ -154,7 +154,7 @@ class CookieComponent extends Object {
  * @var string
  * @access private
  */
-	var $__expires = 0;
+	private $__expires = 0;
 
 /**
  * Main execution method.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
index 73de46195..d92b082a4 100755
--- a/cake/libs/controller/components/email.php
+++ b/cake/libs/controller/components/email.php
@@ -272,7 +272,7 @@ class EmailComponent extends Object{
  * @var array
  * @access private
  */
-	var $__header = array();
+	private $__header = array();
 
 /**
  * If set, boundary to use for multipart mime messages
@@ -280,7 +280,7 @@ class EmailComponent extends Object{
  * @var string
  * @access private
  */
-	var $__boundary = null;
+	private $__boundary = null;
 
 /**
  * Temporary store of message lines
@@ -288,7 +288,7 @@ class EmailComponent extends Object{
  * @var array
  * @access private
  */
-	var $__message = array();
+	private $__message = array();
 
 /**
  * Variable that holds SMTP connection
@@ -296,7 +296,7 @@ class EmailComponent extends Object{
  * @var resource
  * @access private
  */
-	var $__smtpConnection = null;
+	private $__smtpConnection = null;
 
 /**
  * Initialize component
diff --git a/cake/libs/controller/components/request_handler.php b/cake/libs/controller/components/request_handler.php
index ef166baac..26213fb38 100644
--- a/cake/libs/controller/components/request_handler.php
+++ b/cake/libs/controller/components/request_handler.php
@@ -53,7 +53,7 @@ class RequestHandlerComponent extends Object {
  * @var string
  * @access private
  */
-	var $__responseTypeSet = null;
+	private $__responseTypeSet = null;
 
 /**
  * Holds the copy of Controller::$params
@@ -71,7 +71,7 @@ class RequestHandlerComponent extends Object {
  * @access private
  * @see RequestHandlerComponent::setContent
  */
-	var $__requestContent = array(
+	private $__requestContent = array(
 		'javascript'	=> 'text/javascript',
 		'js'			=> 'text/javascript',
 		'json'			=> 'application/json',
@@ -141,7 +141,7 @@ class RequestHandlerComponent extends Object {
  * @access private
  * @see Router::parseExtensions()
  */
-	var $__acceptTypes = array();
+	private $__acceptTypes = array();
 
 /**
  * The template to use when rendering the given content type.
@@ -149,7 +149,7 @@ class RequestHandlerComponent extends Object {
  * @var string
  * @access private
  */
-	var $__renderType = null;
+	private $__renderType = null;
 
 /**
  * Contains the file extension parsed out by the Router
@@ -167,7 +167,7 @@ class RequestHandlerComponent extends Object {
  * @access private
  * @see RequestHandler::__initializeTypes()
  */
-	var $__typesInitialized = false;
+	private $__typesInitialized = false;
 
 /**
  * Constructor. Parses the accepted content types accepted by the client using HTTP_ACCEPT
diff --git a/cake/libs/controller/components/session.php b/cake/libs/controller/components/session.php
index fbe572009..17d46584b 100644
--- a/cake/libs/controller/components/session.php
+++ b/cake/libs/controller/components/session.php
@@ -38,7 +38,7 @@ class SessionComponent extends CakeSession {
  * @var boolean
  * @access private
  */
-	var $__active = true;
+	private $__active = true;
 
 /**
  * Used to determine if request are from an Ajax request
@@ -46,7 +46,7 @@ class SessionComponent extends CakeSession {
  * @var boolean
  * @access private
  */
-	var $__bare = 0;
+	private $__bare = 0;
 
 /**
  * Class constructor
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index f2cfcce9c..8a1d5de04 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -353,7 +353,7 @@ class Controller extends Object {
  * @var array Associative array of HTTP codes and their associated messages.
  * @access private
  */
-	var $__httpCodes = null;
+	private $__httpCodes = null;
 
 /**
  * Constructor.
diff --git a/cake/libs/controller/scaffold.php b/cake/libs/controller/scaffold.php
index 1abd00c2c..0c80875f9 100644
--- a/cake/libs/controller/scaffold.php
+++ b/cake/libs/controller/scaffold.php
@@ -135,7 +135,7 @@ class Scaffold extends Object {
  * @var array
  * @access private
  */
-	var $__passedVars = array(
+	private $__passedVars = array(
 		'action', 'base', 'webroot', 'layout', 'name',
 		'viewPath', 'ext', 'params', 'data', 'plugin', 'cacheAction'
 	);
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 523d1928d..fb0f77228 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -66,7 +66,7 @@ class Folder extends Object {
  * @var array
  * @access private
  */
-	var $__messages = array();
+	private $__messages = array();
 
 /**
  * Holds errors from last method.
@@ -74,7 +74,7 @@ class Folder extends Object {
  * @var array
  * @access private
  */
-	var $__errors = false;
+	private $__errors = false;
 
 /**
  * Holds array of complete directory paths.
@@ -82,7 +82,7 @@ class Folder extends Object {
  * @var array
  * @access private
  */
-	var $__directories;
+	private $__directories;
 
 /**
  * Holds array of complete file paths.
@@ -90,7 +90,7 @@ class Folder extends Object {
  * @var array
  * @access private
  */
-	var $__files;
+	private $__files;
 
 /**
  * Constructor.
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 37abc0061..03d1d1209 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -61,7 +61,7 @@ class I18n extends Object {
  * @var string
  * @access private
  */
-	var $__lang = null;
+	private $__lang = null;
 
 /**
  * Translation strings for a specific domain read from the .mo or .po files
@@ -69,7 +69,7 @@ class I18n extends Object {
  * @var array
  * @access private
  */
-	var $__domains = array();
+	private $__domains = array();
 
 /**
  * Set to true when I18N::__bindTextDomain() is called for the first time.
@@ -78,7 +78,7 @@ class I18n extends Object {
  * @var boolean
  * @access private
  */
-	var $__noLocale = false;
+	private $__noLocale = false;
 
 /**
  * Determine if $__domains cache should be wrote
@@ -86,7 +86,7 @@ class I18n extends Object {
  * @var boolean
  * @access private
  */
-	var $__cache = false;
+	private $__cache = false;
 
 /**
  * Set to true when I18N::__bindTextDomain() is called for the first time.
@@ -95,7 +95,7 @@ class I18n extends Object {
  * @var array
  * @access private
  */
-	var $__categories = array(
+	private $__categories = array(
 		 'LC_ALL', 'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME', 'LC_MESSAGES'
 	);
 
diff --git a/cake/libs/l10n.php b/cake/libs/l10n.php
index 534009f7a..1198015ae 100644
--- a/cake/libs/l10n.php
+++ b/cake/libs/l10n.php
@@ -98,7 +98,7 @@ class L10n extends Object {
  * @var array
  * @access private
  */
-	var $__l10nMap = array(/* Afrikaans */ 'afr' => 'af',
+	private $__l10nMap = array(/* Afrikaans */ 'afr' => 'af',
 								/* Albanian */ 'alb' => 'sq',
 								/* Arabic */ 'ara' => 'ar',
 								/* Armenian - Armenia */ 'hye' => 'hy',
@@ -184,7 +184,7 @@ class L10n extends Object {
  * @var array
  * @access private
  */
-	var $__l10nCatalog = array('af' => array('language' => 'Afrikaans', 'locale' => 'afr', 'localeFallback' => 'afr', 'charset' => 'utf-8', 'direction' => 'ltr'),
+	private $__l10nCatalog = array('af' => array('language' => 'Afrikaans', 'locale' => 'afr', 'localeFallback' => 'afr', 'charset' => 'utf-8', 'direction' => 'ltr'),
 										'ar' => array('language' => 'Arabic', 'locale' => 'ara', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
 										'ar-ae' => array('language' => 'Arabic (U.A.E.)', 'locale' => 'ar_ae', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
 										'ar-bh' => array('language' => 'Arabic (Bahrain)', 'locale' => 'ar_bh', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
index 3bc033b61..c30dffd15 100644
--- a/cake/libs/model/behaviors/acl.php
+++ b/cake/libs/model/behaviors/acl.php
@@ -34,7 +34,7 @@ class AclBehavior extends ModelBehavior {
  * @var array
  * @access protected
  */
-	var $__typeMaps = array('requester' => 'Aro', 'controlled' => 'Aco');
+	private $__typeMaps = array('requester' => 'Aro', 'controlled' => 'Aco');
 
 /**
  * Sets up the configuation for the model, and loads ACL models if they haven't been already
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
index eef8a4283..74e3ffe94 100644
--- a/cake/libs/model/datasources/datasource.php
+++ b/cake/libs/model/datasources/datasource.php
@@ -154,7 +154,7 @@ class DataSource extends Object {
  * @var array
  * @access private
  */
-	var $__descriptions = array();
+	private $__descriptions = array();
 
 /**
  * Holds a list of sources (tables) contained in the DataSource
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 273d4364c..5efce898e 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -55,7 +55,7 @@ class DboMssql extends DboSource {
  *
  * @var array
  */
-	var $__fieldMappings = array();
+	private $__fieldMappings = array();
 
 /**
  * Base configuration settings for MS SQL driver
@@ -108,7 +108,7 @@ class DboMssql extends DboSource {
  * @var string
  * @access private
  */
-	var $__lastQueryHadError = false;
+	private $__lastQueryHadError = false;
 /**
  * MS SQL DBO driver constructor; sets SQL Server error reporting defaults
  *
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 1e078ccee..44986c0f9 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -53,7 +53,7 @@ class DboOracle extends DboSource {
  *
  * @var boolean
  */
-	var $__transactionStarted = false;
+	private $__transactionStarted = false;
 
 /**
  * Enter description here...
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index 8c3da9226..9ac2a85d9 100755
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -75,7 +75,7 @@ class DboSource extends DataSource {
  * @var boolean
  * @access private
  */
-	var $__bypass = false;
+	private $__bypass = false;
 
 /**
  * The set of valid SQL operations usable in a WHERE statement
@@ -83,7 +83,7 @@ class DboSource extends DataSource {
  * @var array
  * @access private
  */
-	var $__sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
+	private $__sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
 
 /**
  * Index of basic SQL commands
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index b5f36d9da..1faa2d0ea 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -310,7 +310,7 @@ class Model extends Overloadable {
  * @var array
  * @access private
  */
-	var $__associationKeys = array(
+	private $__associationKeys = array(
 		'belongsTo' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'counterCache'),
 		'hasOne' => array('className', 'foreignKey','conditions', 'fields','order', 'dependent'),
 		'hasMany' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'dependent', 'exclusive', 'finderQuery', 'counterQuery'),
@@ -323,7 +323,7 @@ class Model extends Overloadable {
  * @var array
  * @access private
  */
-	var $__associations = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+	private $__associations = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
 
 /**
  * Holds model associations temporarily to allow for dynamic (un)binding.
@@ -331,7 +331,7 @@ class Model extends Overloadable {
  * @var array
  * @access private
  */
-	var $__backAssociation = array();
+	private $__backAssociation = array();
 
 /**
  * The ID of the model record that was last inserted.
@@ -339,7 +339,7 @@ class Model extends Overloadable {
  * @var integer
  * @access private
  */
-	var $__insertID = null;
+	private $__insertID = null;
 
 /**
  * The number of records returned by the last query.
@@ -347,7 +347,7 @@ class Model extends Overloadable {
  * @var integer
  * @access private
  */
-	var $__numRows = null;
+	private $__numRows = null;
 
 /**
  * The number of records affected by the last query.
@@ -355,7 +355,7 @@ class Model extends Overloadable {
  * @var integer
  * @access private
  */
-	var $__affectedRows = null;
+	private $__affectedRows = null;
 
 /**
  * List of valid finder method options, supplied as the first parameter to find().
diff --git a/cake/libs/model/model_behavior.php b/cake/libs/model/model_behavior.php
index 51273ba62..119b3d95a 100644
--- a/cake/libs/model/model_behavior.php
+++ b/cake/libs/model/model_behavior.php
@@ -245,14 +245,14 @@ class BehaviorCollection extends Object {
  *
  * @var array
  */
-	var $__methods = array();
+	private $__methods = array();
 
 /**
  * Keeps a list of all methods which have been mapped with regular expressions
  *
  * @var array
  */
-	var $__mappedMethods = array();
+	private $__mappedMethods = array();
 
 /**
  * Attaches a model object and loads a list of behaviors
diff --git a/cake/libs/multibyte.php b/cake/libs/multibyte.php
index 261960760..33a0d2211 100644
--- a/cake/libs/multibyte.php
+++ b/cake/libs/multibyte.php
@@ -267,7 +267,7 @@ class Multibyte extends Object {
  * @var array
  * @access private
  */
-	var $__caseFold = array();
+	private $__caseFold = array();
 
 /**
  * Holds an array of Unicode code point ranges
@@ -275,7 +275,7 @@ class Multibyte extends Object {
  * @var array
  * @access private
  */
-	var $__codeRange = array();
+	private $__codeRange = array();
 
 /**
  * Holds the current code point range
@@ -283,7 +283,7 @@ class Multibyte extends Object {
  * @var string
  * @access private
  */
-	var $__table = null;
+	private $__table = null;
 
 /**
  * Gets a reference to the Multibyte object instance
diff --git a/cake/libs/router.php b/cake/libs/router.php
index 0c988ac35..ee3905518 100644
--- a/cake/libs/router.php
+++ b/cake/libs/router.php
@@ -41,7 +41,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__prefixes = array();
+	private $__prefixes = array();
 
 /**
  * Directive for Router to parse out file extensions for mapping to Content-types.
@@ -49,7 +49,7 @@ class Router {
  * @var boolean
  * @access private
  */
-	var $__parseExtensions = false;
+	private $__parseExtensions = false;
 
 /**
  * List of valid extensions to parse from a URL.  If null, any extension is allowed.
@@ -57,7 +57,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__validExtensions = null;
+	private $__validExtensions = null;
 
 /**
  * 'Constant' regular expression definitions for named route elements
@@ -65,7 +65,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__named = array(
+	private $__named = array(
 		'Action'	=> 'index|show|add|create|edit|update|remove|del|delete|view|item',
 		'Year'		=> '[12][0-9]{3}',
 		'Month'		=> '0[1-9]|1[012]',
@@ -93,7 +93,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__currentRoute = array();
+	private $__currentRoute = array();
 
 /**
  * Default HTTP request method => controller action map.
@@ -101,7 +101,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__resourceMap = array(
+	private $__resourceMap = array(
 		array('action' => 'index',	'method' => 'GET',		'id' => false),
 		array('action' => 'view',	'method' => 'GET',		'id' => true),
 		array('action' => 'add',	'method' => 'POST',		'id' => false),
@@ -116,7 +116,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__resourceMapped = array();
+	private $__resourceMapped = array();
 
 /**
  * Maintains the parameter stack for the current request
@@ -124,7 +124,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__params = array();
+	private $__params = array();
 
 /**
  * Maintains the path stack for the current request
@@ -132,7 +132,7 @@ class Router {
  * @var array
  * @access private
  */
-	var $__paths = array();
+	private $__paths = array();
 
 /**
  * Keeps Router state to determine if default routes have already been connected
@@ -140,7 +140,7 @@ class Router {
  * @var boolean
  * @access private
  */
-	var $__defaultsMapped = false;
+	private $__defaultsMapped = false;
 
 /**
  * Keeps track of whether the connection of default routes is enabled or disabled.
@@ -148,7 +148,7 @@ class Router {
  * @var boolean
  * @access private
  */
-	var $__connectDefaults = true;
+	private $__connectDefaults = true;
 
 /**
  * Constructor for Router.
@@ -1273,7 +1273,7 @@ class CakeRoute {
  * @var array
  * @access private
  */
-	var $__headerMap = array(
+	private $__headerMap = array(
 		'type' => 'content_type',
 		'method' => 'request_method',
 		'server' => 'server_name'
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index 4b732f25e..f5a561f7a 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -52,7 +52,7 @@ class Validation extends Object {
  * @var array
  * @access private
  */
-	var $__pattern = array(
+	private $__pattern = array(
 		'hostname' => '(?:[a-z0-9][-a-z0-9]*\.)*(?:[a-z0-9][-a-z0-9]{0,62})\.(?:(?:[a-z]{2}\.)?[a-z]{2,4}|museum|travel)'
 	);
 
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
index c37348da7..1ec808aa0 100644
--- a/cake/libs/view/helper.php
+++ b/cake/libs/view/helper.php
@@ -133,7 +133,7 @@ class Helper extends Overloadable {
  * @access private
  * @var mixed
  */
-	var $__tainted = null;
+	private $__tainted = null;
 
 /**
  * Holds the cleaned content.
@@ -141,7 +141,7 @@ class Helper extends Overloadable {
  * @access private
  * @var mixed
  */
-	var $__cleaned = null;
+	private $__cleaned = null;
 
 /**
  * Default overload methods
diff --git a/cake/libs/view/helpers/ajax.php b/cake/libs/view/helpers/ajax.php
index e84eb87a9..6e5b6fcd2 100644
--- a/cake/libs/view/helpers/ajax.php
+++ b/cake/libs/view/helpers/ajax.php
@@ -144,7 +144,7 @@ class AjaxHelper extends AppHelper {
  *
  * @var array
  */
-	var $__ajaxBuffer = array();
+	private $__ajaxBuffer = array();
 
 /**
  * Returns link to remote action
diff --git a/cake/libs/view/helpers/cache.php b/cake/libs/view/helpers/cache.php
index 35d05f80a..a495d5085 100644
--- a/cake/libs/view/helpers/cache.php
+++ b/cake/libs/view/helpers/cache.php
@@ -36,7 +36,7 @@ class CacheHelper extends AppHelper {
  * @var array
  * @access private
  */
-	var $__replace = array();
+	private $__replace = array();
 
 /**
  * Array of string that are replace with there var replace above.
@@ -45,7 +45,7 @@ class CacheHelper extends AppHelper {
  * @var array
  * @access private
  */
-	var $__match = array();
+	private $__match = array();
 
 /**
  * cache action time
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index c086ba777..7eef71d46 100755
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -51,7 +51,7 @@ class FormHelper extends AppHelper {
  *
  * @var array
  */
-	var $__options = array(
+	private $__options = array(
 		'day' => array(), 'minute' => array(), 'hour' => array(),
 		'month' => array(), 'year' => array(), 'meridian' => array()
 	);
diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 3161a96fb..2dbebb7d3 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -105,7 +105,7 @@ class HtmlHelper extends AppHelper {
  * @var array
  * @access private
  */
-	var $__includedScripts = array();
+	private $__includedScripts = array();
 /**
  * Options for the currently opened script block buffer if any.
  *
@@ -119,7 +119,7 @@ class HtmlHelper extends AppHelper {
  * @var array
  * @access private
  */
-	var $__docTypes = array(
+	private $__docTypes = array(
 		'html4-strict'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
 		'html4-trans'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
 		'html4-frame'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
diff --git a/cake/libs/view/helpers/javascript.php b/cake/libs/view/helpers/javascript.php
index 86a101b58..4517479f3 100644
--- a/cake/libs/view/helpers/javascript.php
+++ b/cake/libs/view/helpers/javascript.php
@@ -130,7 +130,7 @@ class JavascriptHelper extends AppHelper {
  * @var string
  * @access private
  */
-	var $__scriptBuffer = null;
+	private $__scriptBuffer = null;
 
 /**
  * Constructor. Checks for presence of native PHP JSON extension to use for object encoding
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
index 5ad10191d..cf6cb9947 100644
--- a/cake/libs/view/helpers/js.php
+++ b/cake/libs/view/helpers/js.php
@@ -51,7 +51,7 @@ class JsHelper extends AppHelper {
  * @see JsHelper::set()
  * @access private
  */
-	var $__jsVars = array();
+	private $__jsVars = array();
 
 /**
  * Scripts that are queued for output
@@ -60,7 +60,7 @@ class JsHelper extends AppHelper {
  * @see JsHelper::buffer()
  * @access private
  */
-	var $__bufferedScripts = array();
+	private $__bufferedScripts = array();
 
 /**
  * Current Javascript Engine that is being used
@@ -68,7 +68,7 @@ class JsHelper extends AppHelper {
  * @var string
  * @access private
  */
-	var $__engineName;
+	private $__engineName;
 
 /**
  * The javascript variable created by set() variables.
diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index 47f0652ef..aca981388 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -40,7 +40,7 @@ class PaginatorHelper extends AppHelper {
  *
  * @var string
  */
-	var $__defaultModel = null;
+	private $__defaultModel = null;
 
 /**
  * The class used for 'Ajax' pagination links.
diff --git a/cake/libs/view/helpers/session.php b/cake/libs/view/helpers/session.php
index 8e9b6eada..29db2ff4b 100644
--- a/cake/libs/view/helpers/session.php
+++ b/cake/libs/view/helpers/session.php
@@ -42,7 +42,7 @@ class SessionHelper extends CakeSession {
  *
  * @var boolean
  */
-	var $__active = true;
+	private $__active = true;
 
 /**
  * Class constructor
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 1d80636b5..11062487d 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -275,7 +275,7 @@ class View extends Object {
  * @var array
  * @access protected
  */
-	var $__passedVars = array(
+	private $__passedVars = array(
 		'viewVars', 'action', 'autoLayout', 'autoRender', 'ext', 'base', 'webroot',
 		'helpers', 'here', 'layout', 'name', 'layoutPath', 'viewPath',
 		'params', 'data', 'plugin', 'passedArgs', 'cacheAction'
@@ -287,7 +287,7 @@ class View extends Object {
  * @var array
  * @access private
  */
-	var $__scripts = array();
+	private $__scripts = array();
 
 /**
  * Holds an array of paths.
@@ -295,7 +295,7 @@ class View extends Object {
  * @var array
  * @access private
  */
-	var $__paths = array();
+	private $__paths = array();
 
 /**
  * Constructor
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index c61cfa0c0..a2bf6527f 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -86,7 +86,7 @@ class XmlNode extends Object {
  * @var XmlNode
  * @access private
  */
-	var $__parent = null;
+	private $__parent = null;
 
 /**
  * Constructor.
@@ -788,7 +788,7 @@ class Xml extends XmlNode {
  * @var resource
  * @access private
  */
-	var $__parser;
+	private $__parser;
 
 /**
  * File handle to XML indata file.
@@ -796,7 +796,7 @@ class Xml extends XmlNode {
  * @var resource
  * @access private
  */
-	var $__file;
+	private $__file;
 
 /**
  * Raw XML string data (for loading purposes)
@@ -804,7 +804,7 @@ class Xml extends XmlNode {
  * @var string
  * @access private
  */
-	var $__rawData = null;
+	private $__rawData = null;
 
 /**
  * XML document header
@@ -812,7 +812,7 @@ class Xml extends XmlNode {
  * @var string
  * @access private
  */
-	var $__header = null;
+	private $__header = null;
 
 /**
  * Default array keys/object properties to use as tag names when converting objects or array
@@ -821,7 +821,7 @@ class Xml extends XmlNode {
  * @var array
  * @access private
  */
-	var $__tags = array();
+	private $__tags = array();
 
 /**
  * XML document version
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
index b27636db2..f4ea8ed5e 100644
--- a/cake/tests/lib/cake_test_case.php
+++ b/cake/tests/lib/cake_test_case.php
@@ -125,7 +125,7 @@ class CakeTestCase extends UnitTestCase {
  * @var boolean
  * @access private
  */
-	var $__truncated = true;
+	private $__truncated = true;
 
 /**
  * savedGetData property
@@ -133,7 +133,7 @@ class CakeTestCase extends UnitTestCase {
  * @var array
  * @access private
  */
-	var $__savedGetData = array();
+	private $__savedGetData = array();
 
 /**
  * Called when a test case (group of methods) is about to start (to be overriden when needed.)