wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modified MongoDbCommand __toString output

Browse Source
This commit is contained in:
Anton Grebnev
2012-06-04 16:06:03 +04:00
parent f6e119d372
commit 950d1f4a9a
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
model/MongoDbCommand.php
View File

@ -97,7 +97,7 @@ class FindMongoCommand extends MongoDbCommand
public function __toString() public function __toString()
{ {
if ($this->checkParams()) { if ($this->checkParams()) {
$result = PHP_EOL . 'Collection: ' . $this->collection . PHP_EOL; $result = PHP_EOL . 'Collection: ' . trim($this->collection, "\n") . PHP_EOL;
ob_start(); ob_start();
var_dump($this->condition); var_dump($this->condition);
$condition = ob_get_clean(); $condition = ob_get_clean();
@ -143,7 +143,7 @@ class CountMongoCommand extends MongoDbCommand
public function __toString() public function __toString()
{ {
if ($this->checkParams()) { if ($this->checkParams()) {
$result = PHP_EOL . 'Collection: ' . $this->collection . PHP_EOL; $result = PHP_EOL . 'Collection: ' . trim($this->collection, "\n") . PHP_EOL;
$result .= 'Type: COUNT' . PHP_EOL; $result .= 'Type: COUNT' . PHP_EOL;
ob_start(); ob_start();
var_dump($this->condition); var_dump($this->condition);
@ -199,7 +199,7 @@ class InsertMongoCommand extends MongoDbCommand
public function __toString() public function __toString()
{ {
if ($this->checkParams()) { if ($this->checkParams()) {
$result = PHP_EOL . 'Collection: ' . $this->collection . PHP_EOL; $result = PHP_EOL . 'Collection: ' . trim($this->collection, "\n") . PHP_EOL;
$result .= 'Type: INSERT' . PHP_EOL; $result .= 'Type: INSERT' . PHP_EOL;
ob_start(); ob_start();
var_dump($this->data); var_dump($this->data);
@ -248,7 +248,7 @@ class UpdateMongoCommand extends MongoDbCommand
public function __toString() public function __toString()
{ {
if ($this->checkParams()) { if ($this->checkParams()) {
$result = PHP_EOL . 'Collection: ' . $this->collection . PHP_EOL; $result = PHP_EOL . 'Collection: ' . trim($this->collection, "\n") . PHP_EOL;
$result .= 'Type: UPDATE' . PHP_EOL; $result .= 'Type: UPDATE' . PHP_EOL;
ob_start(); ob_start();
var_dump($this->condition); var_dump($this->condition);
@ -294,7 +294,7 @@ class RemoveMongoCommand extends MongoDbCommand
public function __toString() public function __toString()
{ {
if ($this->checkParams()) { if ($this->checkParams()) {
$result = PHP_EOL . 'Collection: ' . $this->collection . PHP_EOL; $result = PHP_EOL . 'Collection: ' . trim($this->collection, "\n") . PHP_EOL;
$result .= 'Type: REMOVE' . PHP_EOL; $result .= 'Type: REMOVE' . PHP_EOL;
ob_start(); ob_start();
var_dump($this->condition); var_dump($this->condition);
@ -335,7 +335,7 @@ class CommandMongoCommand extends MongoDbCommand
public function __toString() public function __toString()
{ {
if ($this->checkParams()) { if ($this->checkParams()) {
$result = PHP_EOL . 'Collection: ' . $this->collection . PHP_EOL; $result = PHP_EOL . 'Collection: ' . trim($this->collection, "\n") . PHP_EOL;
$result .= 'Type: COMMAND' . PHP_EOL; $result .= 'Type: COMMAND' . PHP_EOL;
ob_start(); ob_start();
var_dump($this->command); var_dump($this->command);

16
tests/model/MongoDbCommandTest.php
View File

@ -329,23 +329,23 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
{ {
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::COUNT, new CollectionMock()); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::COUNT, new CollectionMock());
$cmd->bindParam('condition', array()); $cmd->bindParam('condition', array());
$this->assertStringStartsWith('Collection: CollectionMock', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: CollectionMock', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::FIND, new CollectionMock()); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::FIND, new CollectionMock());
$cmd->bindParam('condition', array()); $cmd->bindParam('condition', array());
$this->assertStringStartsWith('Collection: CollectionMock', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: CollectionMock', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::COMMAND, new CollectionMock()); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::COMMAND, new CollectionMock());
$this->assertSame('Command properties not set', $cmd->__toString()); $this->assertSame('Command properties not set', $cmd->__toString());
$cmd->bindParam('command', array()); $cmd->bindParam('command', array());
$this->assertStringStartsWith('Collection: CollectionMock', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: CollectionMock', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection);
$this->assertSame('Command properties not set', $cmd->__toString()); $this->assertSame('Command properties not set', $cmd->__toString());
$cmd $cmd
->bindParam('data', array('name' => 'insert')) ->bindParam('data', array('name' => 'insert'))
->bindParam('safe', true); ->bindParam('safe', true);
$this->assertStringStartsWith('Collection: ', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: ', $cmd->__toString());
$this->assertContains('Bulk insert: FALSE', $cmd->__toString()); $this->assertContains('Bulk insert: FALSE', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::INSERT, $this->collection);
@ -357,14 +357,14 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
$this->assertContains('Bulk insert: TRUE', $cmd->__toString()); $this->assertContains('Bulk insert: TRUE', $cmd->__toString());
$cmd->bindParam('condition', array('name' => 'insert'))->bindParam('fields', array()); $cmd->bindParam('condition', array('name' => 'insert'))->bindParam('fields', array());
$this->assertStringStartsWith('Collection: ', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: ', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::REMOVE, $this->collection); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::REMOVE, $this->collection);
$this->assertSame('Command properties not set', $cmd->__toString()); $this->assertSame('Command properties not set', $cmd->__toString());
$cmd $cmd
->bindParam('condition', array('name' => 'insert')) ->bindParam('condition', array('name' => 'insert'))
->bindParam('safe', true); ->bindParam('safe', true);
$this->assertStringStartsWith('Collection: ', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: ', $cmd->__toString());
$cmd = MongoCommandBuilder::factory(MongoCommandBuilder::UPDATE, $this->collection); $cmd = MongoCommandBuilder::factory(MongoCommandBuilder::UPDATE, $this->collection);
$this->assertSame('Command properties not set', $cmd->__toString()); $this->assertSame('Command properties not set', $cmd->__toString());
@ -373,7 +373,7 @@ class MongoDbCommandTest extends PHPUnit_Framework_TestCase
->bindParam('data', array('$set' => array('name' => 'update'))) ->bindParam('data', array('$set' => array('name' => 'update')))
->bindParam('upsert', false) ->bindParam('upsert', false)
->bindParam('safe', true); ->bindParam('safe', true);
$this->assertStringStartsWith('Collection: ', $cmd->__toString()); $this->assertStringStartsWith(PHP_EOL . 'Collection: ', $cmd->__toString());
} }
} }
@ -383,6 +383,6 @@ class CollectionMock
public function __toString() public function __toString()
{ {
return 'CollectionMock'; return PHP_EOL . 'CollectionMock';
} }
} }