10000 Integrates #2733 into master branch by aboks · Pull Request #2820 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Integrates #2733 into master branch #2820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Integrates #2733 into master branch #2820

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4535abe
[DoctrineBridge] Fixed attempt to serialize non-serializable values
aboks Nov 27, 2011
28730e9
[DoctrineBridge] Added unit tests
aboks Nov 27, 2011
4fe4dfd
Fixed vendor version mismatch in tests
aboks Dec 8, 2011
bb0d202
Switched sanitizeParameter() for existing varToString()-method; now a…
aboks Dec 8, 2011
aecef2a
Merged aboks/doctrine_data_collector
aboks Dec 9, 2011
01dbb0f
Adapted tests for master branch
aboks Dec 9, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed vendor version mismatch in tests
  • Loading branch information
@aboks
aboks committed Dec 8, 2011
commit 4fe4dfd116f2ff7e749eec2890403047d19d5d1c
8 changes: 4 additions & 4 deletions tests/Symfony/Tests/Bridge/Doctrine/DataCollector/DoctrineDataCollectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ public function paramProvider()

private function createCollector($queries)
{
$registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
$registry = $this->getMock('Symfony\Bridge\Doctrine\RegistryInterface');
$registry
->expects($this->once())
->expects($this->any())
->method('getConnectionNames')
->will($this->returnValue(array('default' => 'doctrine.dbal.default_connection')));
$registry
->expects($this->once())
->method('getManagerNames')
->expects($this->any())
->method('getEntityManagerNames')
->will($this->returnValue(array('default' => 'doctrine.orm.default_entity_manager')));

$logger = $this->getMock('Symfony\Bridge\Doctrine\Logger\DbalLogger');
Expand Down
0