Changed all $__ declared variables to private.

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

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

cake/console/libs/tasks/extract.php

@@ -32,63 +32,63 @@ class ExtractTask extends Shell {
  * @var string
  * @access private
  */
-	var $__paths = array();
+	private $__paths = array();
 
 /**
  * Files from where to extract
  *
  * @var array
  * @access private
  */
-	var $__files = array();
+	private $__files = array();
 
 /**
  * Merge all domains string into the default.pot file
  *
  * @var boolean
  * @access private
  */
-	var $__merge = false;
+	private $__merge = false;
 
 /**
  * Current file being processed
  *
  * @var string
  * @access private
  */
-	var $__file = null;
+	private $__file = null;
 
 /**
  * Contains all content waiting to be write
  *
  * @var string
  * @access private
  */
-	var $__storage = array();
+	private $__storage = array();
 
 /**
  * Extracted tokens
  *
  * @var array
  * @access private
  */
-	var $__tokens = array();
+	private $__tokens = array();
 
 /**
  * Extracted strings
  *
  * @var array
  * @access private
  */
-	var $__strings = array();
+	private $__strings = array();
 
 /**
  * Destination path
  *
  * @var string
  * @access private
  */
-	var $__output = null;
+	private $__output = null;
 
 /**
  * Execution method always used for tasks

cake/libs/cache.php

@@ -35,23 +35,23 @@ class Cache {
  * @var array
  * @access private
  */
-	var $__config = array();
+	private $__config = array();
 
 /**
  * Holds name of the current configuration name being used.
  *
  * @var array
  * @access private
  */
-	var $__name = 'default';
+	private $__name = 'default';
 
 /**
  * Whether to reset the settings with the next call to Cache::set();
  *
  * @var array
  * @access private
  */
-	var $__reset = false;
+	private $__reset = false;
 
 /**
  * Engine instances keyed by configuration name.

cake/libs/cache/memcache.php

@@ -33,7 +33,7 @@ class MemcacheEngine extends CacheEngine {
  * @var Memcache
  * @access private
  */
-	var $__Memcache = null;
+	private $__Memcache = null;
 
 /**
  * Settings

cake/libs/class_registry.php

@@ -38,23 +38,23 @@ class ClassRegistry {
  * @var array
  * @access private
  */
-	var $__objects = array();
+	private $__objects = array();
 
 /**
  * Names of class names mapped to the object in the registry.
  *
  * @var array
  * @access private
  */
-	var $__map = array();
+	private $__map = array();
 
 /**
  * Default constructor parameter settings, indexed by type
  *
  * @var array
  * @access private
  */
-	var $__config = array();
+	private $__config = array();
 
 /**
  * Return a singleton instance of the ClassRegistry.

cake/libs/configure.php

@@ -584,39 +584,39 @@ class App extends Object {
  * @var boolean
  * @access private
  */
-	var $__cache = false;
+	private $__cache = false;
 
 /**
  * Holds key/value pairs of $type => file path.
  *
  * @var array
  * @access private
  */
-	var $__map = array();
+	private $__map = array();
 
 /**
  * Holds paths for deep searching of files.
  *
  * @var array
  * @access private
  */
-	var $__paths = array();
+	private $__paths = array();
 
 /**
  * Holds loaded files.
  *
  * @var array
  * @access private
  */
-	var $__loaded = array();
+	private $__loaded = array();
 
 /**
  * Holds and key => value array of object types.
  *
  * @var array
  * @access private
  */
-	var $__objects = array();
+	private $__objects = array();
 
 /**
  * Used to read information stored path

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.

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,15 +136,15 @@ 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()
  *
  * @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.

cake/libs/controller/components/email.php

@@ -272,31 +272,31 @@ class EmailComponent extends Object{
  * @var array
  * @access private
  */
-	var $__header = array();
+	private $__header = array();
 
 /**
  * If set, boundary to use for multipart mime messages
  *
  * @var string
  * @access private
  */
-	var $__boundary = null;
+	private $__boundary = null;
 
 /**
  * Temporary store of message lines
  *
  * @var array
  * @access private
  */
-	var $__message = array();
+	private $__message = array();
 
 /**
  * Variable that holds SMTP connection
  *
  * @var resource
  * @access private
  */
-	var $__smtpConnection = null;
+	private $__smtpConnection = null;
 
 /**
  * Initialize component

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,15 +141,15 @@ 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.
  *
  * @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

cake/libs/controller/components/session.php

@@ -38,15 +38,15 @@ class SessionComponent extends CakeSession {
  * @var boolean
  * @access private
  */
-	var $__active = true;
+	private $__active = true;
 
 /**
  * Used to determine if request are from an Ajax request
  *
  * @var boolean
  * @access private
  */
-	var $__bare = 0;
+	private $__bare = 0;
 
 /**
  * Class constructor

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.

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'
 	);