adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 20:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrated ConnectionManager to phpunit

Browse source
This commit is contained in:
José Lorenzo Rodríguez 2010-06-04 23:47:38 -04:30
parent 7aa01c4c77
commit fd4db4184a
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/datasources/dbo/dbo_mssql.php
View file

@ -701,7 +701,7 @@ class DboMssql extends DboSource {
* @param string $fields * @param string $fields
* @param array $values * @param array $values
*/ */
protected function insertMulti($table, $fields, $values) { public function insertMulti($table, $fields, $values) {
$primaryKey = $this->_getPrimaryKey($table); $primaryKey = $this->_getPrimaryKey($table);
$hasPrimaryKey = $primaryKey != null && ( $hasPrimaryKey = $primaryKey != null && (
(is_array($fields) && in_array($primaryKey, $fields) (is_array($fields) && in_array($primaryKey, $fields)

12
cake/tests/cases/libs/model/connection_manager.test.php
View file

@ -34,7 +34,7 @@ class ConnectionManagerTest extends CakeTestCase {
* @return void * @return void
*/ */
function setUp() { function setUp() {
$this->ConnectionManager =& ConnectionManager::getInstance(); $this->ConnectionManager = ConnectionManager::getInstance();
} }
/** /**
@ -79,12 +79,12 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testGetDataSource() { function testGetDataSource() {
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertTrue(count(array_keys($connections) >= 1)); $this->assertTrue((bool)(count(array_keys($connections) >= 1)));
$source = ConnectionManager::getDataSource(key($connections)); $source = ConnectionManager::getDataSource(key($connections));
$this->assertTrue(is_object($source)); $this->assertTrue(is_object($source));
$this->expectError(new PatternExpectation('/Non-existent data source/i')); $this->expectError();
$source = ConnectionManager::getDataSource('non_existent_source'); $source = ConnectionManager::getDataSource('non_existent_source');
$this->assertEqual($source, null); $this->assertEqual($source, null);
@ -212,7 +212,7 @@ class ConnectionManagerTest extends CakeTestCase {
$this->assertEqual($result, $name); $this->assertEqual($result, $name);
$source =& new StdClass(); $source = new StdClass();
$result = ConnectionManager::getSourceName($source); $result = ConnectionManager::getSourceName($source);
$this->assertEqual($result, null); $this->assertEqual($result, null);
} }
@ -238,7 +238,7 @@ class ConnectionManagerTest extends CakeTestCase {
} }
$connection = array('classname' => 'NonExistentDataSource', 'filename' => 'non_existent'); $connection = array('classname' => 'NonExistentDataSource', 'filename' => 'non_existent');
$this->expectError(new PatternExpectation('/Unable to import DataSource class/i')); $this->expectError();
$loaded = ConnectionManager::loadDataSource($connection); $loaded = ConnectionManager::loadDataSource($connection);
$this->assertEqual($loaded, null); $this->assertEqual($loaded, null);
@ -254,7 +254,7 @@ class ConnectionManagerTest extends CakeTestCase {
$name = 'test_created_connection'; $name = 'test_created_connection';
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertTrue(count(array_keys($connections) >= 1)); $this->assertTrue((bool)(count(array_keys($connections) >= 1)));
$source = ConnectionManager::getDataSource(key($connections)); $source = ConnectionManager::getDataSource(key($connections));
$this->assertTrue(is_object($source)); $this->assertTrue(is_object($source));