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

Fix protected call for _build on CakeSchema, and associated references.

Browse source
This commit is contained in:
predominant 2010-04-09 20:41:28 +10:00
parent 59fb134455
commit ea635d6bea
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class CakeSchema extends Object {
} }
$options = array_merge(get_object_vars($this), $options); $options = array_merge(get_object_vars($this), $options);
$this->_build($options); $this->build($options);
} }
/** /**
@ -111,7 +111,7 @@ class CakeSchema extends Object {
* @param array $data loaded object properties * @param array $data loaded object properties
* @return void * @return void
*/ */
protected function _build($data) { public function build($data) {
$file = null; $file = null;
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if (!empty($val)) { if (!empty($val)) {
@ -162,7 +162,7 @@ class CakeSchema extends Object {
$options = array('path' => $options); $options = array('path' => $options);
} }
$this->_build($options); $this->build($options);
extract(get_object_vars($this)); extract(get_object_vars($this));
$class = $name .'Schema'; $class = $name .'Schema';
@ -318,7 +318,7 @@ class CakeSchema extends Object {
public function write($object, $options = array()) { public function write($object, $options = array()) {
if (is_object($object)) { if (is_object($object)) {
$object = get_object_vars($object); $object = get_object_vars($object);
$this->_build($object); $this->build($object);
} }
if (is_array($object)) { if (is_array($object)) {

6
cake/tests/lib/cake_test_fixture.php
View file

@ -36,14 +36,12 @@ class CakeTestFixture extends Object {
/** /**
* Cake's DBO driver (e.g: DboMysql). * Cake's DBO driver (e.g: DboMysql).
* *
* @access public
*/ */
public $db = null; public $db = null;
/** /**
* Full Table Name * Full Table Name
* *
* @access public
*/ */
public $table = null; public $table = null;
@ -131,7 +129,7 @@ class CakeTestFixture extends Object {
return false; return false;
} }
$this->Schema->_build(array($this->table => $this->fields)); $this->Schema->build(array($this->table => $this->fields));
return ( return (
$db->execute($db->createSchema($this->Schema), array('log' => false)) !== false $db->execute($db->createSchema($this->Schema), array('log' => false)) !== false
); );
@ -144,7 +142,7 @@ class CakeTestFixture extends Object {
* @return boolean True on success, false on failure * @return boolean True on success, false on failure
*/ */
public function drop(&$db) { public function drop(&$db) {
$this->Schema->_build(array($this->table => $this->fields)); $this->Schema->build(array($this->table => $this->fields));
return ( return (
$db->execute($db->dropSchema($this->Schema), array('log' => false)) !== false $db->execute($db->dropSchema($this->Schema), array('log' => false)) !== false
); );