Skip to content

Commit

Permalink
Merge pull request #102 from superdweebie/1.0.x
Browse files Browse the repository at this point in the history
Fix array notation
  • Loading branch information
Ocramius committed Feb 25, 2014
2 parents c0c11e1 + 6552370 commit 64923d9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Expand Up @@ -18,13 +18,13 @@ public function testConnectionStringOverwritesOtherConnectionSettings()
{
$connectionString = 'mongodb://localhost:27017';
$connectionOptions = new ConnectionOptions(
[
array(
'connection_string' => $connectionString,
'server' => 'unreachable',
'port' => '10000',
'user' => 'test fails if used',
'password' => 'test fails if used'
]
)
);

$builder = new ConnectionBuilder;
Expand All @@ -38,9 +38,9 @@ public function testConnectionStringShouldAllowMultipleHosts()
$unreachablePort = 56000;
$connectionString = "mongodb://localhost:$unreachablePort,localhost:27017";
$connectionOptions = new ConnectionOptions(
[
array(
'connection_string' => $connectionString,
]
)
);

$builder = new ConnectionBuilder;
Expand All @@ -53,9 +53,9 @@ public function testConnectionStringShouldAllowUnixSockets()
{
$connectionString = 'mongodb:///tmp/mongodb-27017.sock';
$connectionOptions = new ConnectionOptions(
[
array(
'connection_string' => $connectionString,
]
)
);

$builder = new ConnectionBuilder;
Expand Down
2 changes: 1 addition & 1 deletion tests/DoctrineMongoODMModuleTest/Doctrine/ModuleTest.php
Expand Up @@ -47,7 +47,7 @@ protected function getMockServiceManager()
$i++;
}

return [$serviceManager, $i];
return array($serviceManager, $i);
}

public function testOdmDefaultIsUsedAsTheDocumentManagerIfNoneIsProvided()
Expand Down

0 comments on commit 64923d9

Please sign in to comment.