visibility attributes

This commit is contained in:
euromark 2012-02-23 14:45:15 +01:00 committed by mark_story
parent e94d307ee1
commit 38c3e30a1e
6 changed files with 19 additions and 19 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -32,7 +32,7 @@ class SiteFixture extends CakeTestFixture {
* @var string 'Site' * @var string 'Site'
* @access public * @access public
*/ */
var $name = 'Site'; public $name = 'Site';
/** /**
* fields property * fields property
@ -40,7 +40,7 @@ class SiteFixture extends CakeTestFixture {
* @var array * @var array
* @access public * @access public
*/ */
var $fields = array( public $fields = array(
'id' => array('type' => 'integer', 'key' => 'primary'), 'id' => array('type' => 'integer', 'key' => 'primary'),
'name' => array('type' => 'string', 'null' => false), 'name' => array('type' => 'string', 'null' => false),
'created' => 'datetime', 'created' => 'datetime',
@ -53,7 +53,7 @@ class SiteFixture extends CakeTestFixture {
* @var array * @var array
* @access public * @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' => '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' => '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'), array('name' => 'rchavik sites', 'created' => '2001-02-03 00:01:02', 'updated' => '2007-03-17 01:22:31'),