merged branch Wotre/master (PR #4640)

fabpot · fabpot · commit c4a8feb68bf9 · 2012-06-26T14:41:54.000+02:00
Commits ------- 81d0552 Adding the database to the DSN we are sending to the MongoDB server Discussion ---------- Adding the database to the DSN we are sending to the MongoDB server Adding the database to the DSN we are sending to the MongoDB server. According to the [documentation from PHP](http://be2.php.net/manual/en/mongo.construct.php) the database will default to admin if it isn't specified in this DSN. Unfortunately the username we're trying to login with shouldn't have access to this database. --------------------------------------------------------------------------- by travisbot at 2012-06-23T13:54:28Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1688817) (merged 2251be90 into 0d4b02e). --------------------------------------------------------------------------- by travisbot at 2012-06-25T11:34:17Z This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1700214) (merged 45d0748b into 0d4b02e). --------------------------------------------------------------------------- by Wotre at 2012-06-25T12:16:49Z It looks to me like travisbot failed because of an error in the routing system that was fixed in c67cf8b, not because of the code I altered. --------------------------------------------------------------------------- by travisbot at 2012-06-25T16:45:12Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1702410) (merged aa659463 into 0d4b02e). --------------------------------------------------------------------------- by fabpot at 2012-06-26T05:07:37Z Can you squash your commits before I merge? Thanks. --------------------------------------------------------------------------- by Wotre at 2012-06-26T12:02:02Z I think I've managed to do that, but correct me if I've done something wrong :) --------------------------------------------------------------------------- by travisbot at 2012-06-26T12:05:19Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1710220) (merged dcb79089 into 0d4b02e). --------------------------------------------------------------------------- by fabpot at 2012-06-26T12:14:28Z @Wotre Unfortunately, that's wrong. You can read how to do that in the contrib docs: http://symfony.com/doc/current/contributing/code/patches.html#rework-your-patch --------------------------------------------------------------------------- by Wotre at 2012-06-26T12:37:59Z Thanks for the help, looks like I forgot the -f when pushing. It should be okay now
diff --git a/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/MongoDbProfilerStorage.php
@@ -114,7 +114,7 @@ protected function getMongo()
     {
         if ($this->mongo === null) {
             if (preg_match('#^(mongodb://.*)/(.*)/(.*)$#', $this->dsn, $matches)) {
-                $mongo = new \Mongo($matches[1]);
+                $mongo = new \Mongo($matches[1] . (!empty($matches[2]) ? '/' . $matches[2] : ''));
                 $database = $matches[2];
                 $collection = $matches[3];
                 $this->mongo = $mongo->selectCollection($database, $collection);

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ protected function getMongo()`
`114`	`114`	`{`
`115`	`115`	`if ($this->mongo === null) {`
`116`	`116`	`if (preg_match('#^(mongodb://.)/(.)/(.*)$#', $this->dsn, $matches)) {`
`117`		`- $mongo = new \Mongo($matches[1]);`
	`117`	`+ $mongo = new \Mongo($matches[1] . (!empty($matches[2]) ? '/' . $matches[2] : ''));`
`118`	`118`	`$database = $matches[2];`
`119`	`119`	`$collection = $matches[3];`
`120`	`120`	`$this->mongo = $mongo->selectCollection($database, $collection);`