Browse Source

visibility attributes

euromark 14 years ago
parent
commit
38c3e30a1e

+ 2 - 2
lib/Cake/Model/Behavior/TranslateBehavior.php

@@ -36,14 +36,14 @@ class TranslateBehavior extends ModelBehavior {
  *
  * @var object
  */
-	var $_joinTable;
+	protected $_joinTable;
 
 /**
  * Stores the runtime model for generating joins.
  *
  * @var Model
  */
-	var $_runtimeModel;
+	protected $_runtimeModel;
 
 /**
  * Callback

+ 2 - 2
lib/Cake/Test/Case/Model/ModelValidationTest.php

@@ -819,7 +819,7 @@ class ModelValidationTest extends BaseModelTest {
  *
  * @return void
  */
-	function testStateRequiredValidation() {
+	public function testStateRequiredValidation() {
 		$this->loadFixtures('Article');
 		$Article = new Article();
 
@@ -872,7 +872,7 @@ class ModelValidationTest extends BaseModelTest {
  *
  * @return void
  */
-	function testOnRequiredConflictValidation() {
+	public function testOnRequiredConflictValidation() {
 		$this->loadFixtures('Article');
 		$Article = new Article();
 

+ 6 - 6
lib/Cake/Test/Case/Model/models.php

@@ -3287,19 +3287,19 @@ class TransactionManyTestModel extends CakeTestModel {
 }
 
 class Site extends CakeTestModel {
-	var $name = 'Site';
-	var $useTable = 'sites';
+	public $name = 'Site';
+	public $useTable = 'sites';
 
-	var $hasAndBelongsToMany = array(
+	public $hasAndBelongsToMany = array(
 		'Domain' => array('unique' => 'keepExisting'),
 		);
 }
 
 class Domain extends CakeTestModel {
-	var $name = 'Domain';
-	var $useTable = 'domains';
+	public $name = 'Domain';
+	public $useTable = 'domains';
 
-	var $hasAndBelongsToMany = array(
+	public $hasAndBelongsToMany = array(
 		'Site' => array('unique' => 'keepExisting'),
 		);
 }

+ 3 - 3
lib/Cake/Test/Fixture/DomainFixture.php

@@ -32,7 +32,7 @@ class DomainFixture extends CakeTestFixture {
  * @var string 'Domain'
  * @access public
  */
-	var $name = 'Domain';
+	public $name = 'Domain';
 
 /**
  * fields property
@@ -40,7 +40,7 @@ class DomainFixture extends CakeTestFixture {
  * @var array
  * @access public
  */
-	var $fields = array(
+	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'domain' => array('type' => 'string', 'null' => false),
 		'created' => 'datetime',
@@ -53,7 +53,7 @@ class DomainFixture extends CakeTestFixture {
  * @var array
  * @access public
  */
-	var $records = array(
+	public $records = array(
 		array('domain' => 'cakephp.org', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
 		array('domain' => 'book.cakephp.org', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
 		array('domain' => 'api.cakephp.org', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),

+ 3 - 3
lib/Cake/Test/Fixture/DomainsSiteFixture.php

@@ -32,7 +32,7 @@ class DomainsSiteFixture extends CakeTestFixture {
  * @var string 'Domain'
  * @access public
  */
-	var $name = 'DomainsSite';
+	public $name = 'DomainsSite';
 
 /**
  * fields property
@@ -40,7 +40,7 @@ class DomainsSiteFixture extends CakeTestFixture {
  * @var array
  * @access public
  */
-	var $fields = array(
+	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'domain_id' => array('type' => 'integer', 'null' => false),
 		'site_id' => array('type' => 'integer', 'null' => false),
@@ -55,7 +55,7 @@ class DomainsSiteFixture extends CakeTestFixture {
  * @var array
  * @access public
  */
-	var $records = array(
+	public $records = array(
 		array('site_id' => 1, 'domain_id' => 1, 'active' => true, 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
 		array('site_id' => 1, 'domain_id' => 2, 'active' => true, 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
 		array('site_id' => 2, 'domain_id' => 4, 'active' => true, 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),

+ 3 - 3
lib/Cake/Test/Fixture/SiteFixture.php

@@ -32,7 +32,7 @@ class SiteFixture extends CakeTestFixture {
  * @var string 'Site'
  * @access public
  */
-	var $name = 'Site';
+	public $name = 'Site';
 
 /**
  * fields property
@@ -40,7 +40,7 @@ class SiteFixture extends CakeTestFixture {
  * @var array
  * @access public
  */
-	var $fields = array(
+	public $fields = array(
 		'id' => array('type' => 'integer', 'key' => 'primary'),
 		'name' => array('type' => 'string', 'null' => false),
 		'created' => 'datetime',
@@ -53,7 +53,7 @@ class SiteFixture extends CakeTestFixture {
  * @var array
  * @access public
  */
-	var $records = array(
+	public $records = array(
 		array('name' => 'cakephp', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
 		array('name' => 'Mark Story\'s sites', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
 		array('name' => 'rchavik sites', 'created' => '2001-02-03 00:01:02', 'updated' => '2007-03-17 01:22:31'),