adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Dont use private attributes as tables in CakeSchema. Fixes #7

Browse source
This commit is contained in:
Juan Basso 2010-08-02 00:22:46 -03:00
parent 69ee014a60
commit ae2fa908c5
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/model/cake_schema.php
View file

@ -116,6 +116,9 @@ class CakeSchema extends Object {
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if (!empty($val)) { if (!empty($val)) {
if (!in_array($key, array('plugin', 'name', 'path', 'file', 'connection', 'tables', '_log'))) { if (!in_array($key, array('plugin', 'name', 'path', 'file', 'connection', 'tables', '_log'))) {
if ($key[0] === '_') {
continue;
}
$this->tables[$key] = $val; $this->tables[$key] = $val;
unset($this->{$key}); unset($this->{$key});
} elseif ($key !== 'tables') { } elseif ($key !== 'tables') {

23
cake/tests/cases/libs/model/cake_schema.test.php
View file

@ -80,6 +80,14 @@ class MyAppSchema extends CakeSchema {
'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)), 'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
); );
/**
* _foo property
*
* @var array
* @access protected
*/
protected $_foo = array('bar');
/** /**
* setup method * setup method
* *
@ -99,6 +107,19 @@ class MyAppSchema extends CakeSchema {
*/ */
function teardown($version) { function teardown($version) {
} }
/**
* getVar method
*
* @param string $var Name of var
* @return mixed
*/
public function getVar($var) {
if (!isset($this->$var)) {
return null;
}
return $this->$var;
}
} }
/** /**
@ -750,6 +771,8 @@ class CakeSchemaTest extends CakeTestCase {
), ),
); );
$this->assertEqual($expected, $compare); $this->assertEqual($expected, $compare);
$this->assertNull($New->getVar('comments'));
$this->assertEqual($New->getVar('_foo'), array('bar'));
$tables = array( $tables = array(
'missing' => array( 'missing' => array(