Skip to content

Commit

Permalink
Added visibility in some methods and attributes.
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbasso committed Aug 19, 2011
1 parent 16ef234 commit 0575e92
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Console/Shell.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class Shell extends Object {
* @param ConsoleOutput $stderr A ConsoleOutput object for stderr.
* @param ConsoleInput $stdin A ConsoleInput object for stdin.
*/
function __construct($stdout = null, $stderr = null, $stdin = null) {
public function __construct($stdout = null, $stderr = null, $stdin = null) {
if ($this->name == null) {
$this->name = Inflector::camelize(str_replace(array('Shell', 'Task'), '', get_class($this)));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/AclComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class DbAcl extends Object implements AclInterface {
* Constructor
*
*/
function __construct() {
public function __construct() {
parent::__construct();
App::uses('AclNode', 'Model');
$this->Aro = ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro'));
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/Auth/BasicAuthenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
*
* In your controller's components array, add auth + the required settings.
* {{{
* var $components = array(
* public $components = array(
* 'Auth' => array(
* 'authenticate' => array('Basic')
* )
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/Auth/DigestAuthenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* In your controller's components array, add auth + the required settings.
* {{{
* var $components = array(
* public $components = array(
* 'Auth' => array(
* 'authenticate' => array('Digest')
* )
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/EmailComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class EmailComponent extends Component {
*
* @var string
*/
var $date = null;
public $date = null;

/**
* The subject of the email
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/RequestHandlerComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class RequestHandlerComponent extends Component {
* @param ComponentCollection $collection ComponentCollection object.
* @param array $settings Array of settings.
*/
function __construct(ComponentCollection $collection, $settings = array()) {
public function __construct(ComponentCollection $collection, $settings = array()) {
$this->addInputType('xml', array(array($this, '_convertXml')));
parent::__construct($collection, $settings);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Log/Engine/FileLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class FileLog implements CakeLogInterface {
*
* @param array $options Options for the FileLog, see above.
*/
function __construct($options = array()) {
public function __construct($options = array()) {
$options += array('path' => LOGS);
$this->_path = $options['path'];
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/Datasource/Database/Postgres.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ public function getSequence($table, $field = 'id') {
* and if 1, sequences are not modified
* @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
*/
function truncate($table, $reset = 0) {
public function truncate($table, $reset = 0) {
$table = $this->fullTableName($table, false);
if (!isset($this->_sequenceMap[$table])) {
$cache = $this->cacheSources;
Expand Down
12 changes: 6 additions & 6 deletions lib/Cake/Model/Datasource/Database/Sqlite.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,28 @@ class Sqlite extends DboSource {
*
* @var string
*/
var $description = "SQLite DBO Driver";
public $description = "SQLite DBO Driver";

/**
* Quote Start
*
* @var string
*/
var $startQuote = '"';
public $startQuote = '"';

/**
* Quote End
*
* @var string
*/
var $endQuote = '"';
public $endQuote = '"';

/**
* Base configuration settings for SQLite3 driver
*
* @var array
*/
var $_baseConfig = array(
protected $_baseConfig = array(
'persistent' => false,
'database' => null
);
Expand All @@ -64,7 +64,7 @@ class Sqlite extends DboSource {
*
* @var array
*/
var $columns = array(
public $columns = array(
'primary_key' => array('name' => 'integer primary key autoincrement'),
'string' => array('name' => 'varchar', 'limit' => '255'),
'text' => array('name' => 'text'),
Expand All @@ -83,7 +83,7 @@ class Sqlite extends DboSource {
*
* @var array
*/
var $fieldParameters = array(
public $fieldParameters = array(
'collate' => array(
'value' => 'COLLATE',
'quote' => false,
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/ModelBehavior.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* than a normal behavior mixin method.
*
* {{{
* var $mapMethods = array('/do(\w+)/' => 'doSomething');
* public $mapMethods = array('/do(\w+)/' => 'doSomething');
*
* function doSomething($model, $method, $arg1, $arg2) {
* //do something
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Network/Http/HttpResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public function offsetUnset($offset) {
*
* @return string
*/
function __toString() {
public function __toString() {
return $this->body();
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Utility/Validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ public static function date($check, $format = 'ymd', $regex = null) {
* @see Validation::date
* @see Validation::time
*/
function datetime($check, $dateFormat = 'ymd', $regex = null) {
public function datetime($check, $dateFormat = 'ymd', $regex = null) {
$valid = false;
$parts = explode(' ', $check);
if (!empty($parts) && count($parts) > 1) {
Expand Down
14 changes: 7 additions & 7 deletions lib/Cake/View/Helper/CacheHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ class CacheHelper extends AppHelper {
*/
protected $_match = array();

/**
* Counter used for counting nocache section tags.
*
* @var integer
*/
protected $_counter = 0;

/**
* Parses the view file and stores content for cache file building.
*
Expand Down Expand Up @@ -73,13 +80,6 @@ public function afterLayout($layoutFile) {
$this->_View->output = preg_replace('/<!--\/?nocache-->/', '', $this->_View->output);
}

/**
* Counter used for counting nocache section tags.
*
* @var integer
*/
var $_counter = 0;

/**
* Main method used to cache a view
*
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/View/Helper/FormHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -2203,7 +2203,7 @@ public function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $a
* @param boolean $setScope Sets the view scope to the model specified in $tagValue
* @return void
*/
function setEntity($entity, $setScope = false) {
public function setEntity($entity, $setScope = false) {
parent::setEntity($entity, $setScope);
$parts = explode('.', $entity);
$field = $this->_introspectModel($this->_modelScope, 'fields', $parts[0]);
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/View/Helper/JsBaseEngineHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
* @param View $View
* @param array $settings
*/
function __construct($View, $settings = array()) {
public function __construct($View, $settings = array()) {
parent::__construct($View, $settings);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/View/Helper/PaginatorHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class PaginatorHelper extends AppHelper {
* @param array $settings Array of settings.
* @throws CakeException When the AjaxProvider helper does not implement a link method.
*/
function __construct(View $View, $settings = array()) {
public function __construct(View $View, $settings = array()) {
$ajaxProvider = isset($settings['ajax']) ? $settings['ajax'] : 'Js';
$this->helpers[] = $ajaxProvider;
$this->_ajaxHelperClass = $ajaxProvider;
Expand Down

0 comments on commit 0575e92

Please sign in to comment.