From 38c3e30a1e24bfd0cfd1b9f0310743bf488283cd Mon Sep 17 00:00:00 2001 From: euromark Date: Thu, 23 Feb 2012 14:45:15 +0100 Subject: [PATCH] visibility attributes --- lib/Cake/Model/Behavior/TranslateBehavior.php | 4 ++-- lib/Cake/Test/Case/Model/ModelValidationTest.php | 4 ++-- lib/Cake/Test/Case/Model/models.php | 12 ++++++------ lib/Cake/Test/Fixture/DomainFixture.php | 6 +++--- lib/Cake/Test/Fixture/DomainsSiteFixture.php | 6 +++--- lib/Cake/Test/Fixture/SiteFixture.php | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/Cake/Model/Behavior/TranslateBehavior.php b/lib/Cake/Model/Behavior/TranslateBehavior.php index 392068f1b..4c39112db 100644 --- a/lib/Cake/Model/Behavior/TranslateBehavior.php +++ b/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 diff --git a/lib/Cake/Test/Case/Model/ModelValidationTest.php b/lib/Cake/Test/Case/Model/ModelValidationTest.php index 02be26ce4..590235685 100644 --- a/lib/Cake/Test/Case/Model/ModelValidationTest.php +++ b/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(); diff --git a/lib/Cake/Test/Case/Model/models.php b/lib/Cake/Test/Case/Model/models.php index 2eee6fd97..9a2e2da18 100644 --- a/lib/Cake/Test/Case/Model/models.php +++ b/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'), ); } diff --git a/lib/Cake/Test/Fixture/DomainFixture.php b/lib/Cake/Test/Fixture/DomainFixture.php index 0478a301f..0dc66e85e 100644 --- a/lib/Cake/Test/Fixture/DomainFixture.php +++ b/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'), diff --git a/lib/Cake/Test/Fixture/DomainsSiteFixture.php b/lib/Cake/Test/Fixture/DomainsSiteFixture.php index 7eba942be..fa616d331 100644 --- a/lib/Cake/Test/Fixture/DomainsSiteFixture.php +++ b/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'), diff --git a/lib/Cake/Test/Fixture/SiteFixture.php b/lib/Cake/Test/Fixture/SiteFixture.php index 678c95688..9e0aa4865 100644 --- a/lib/Cake/Test/Fixture/SiteFixture.php +++ b/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'),