Commit 895c77b6 authored by Fabien Potencier's avatar Fabien Potencier

merged branch pborreli/master (PR #434)

Commits
-------

a7c1baee Fixed typos

Discussion
----------

Fixed typos
parents 6358f7ef a7c1baee
...@@ -21,7 +21,7 @@ trait SwiftmailerTrait ...@@ -21,7 +21,7 @@ trait SwiftmailerTrait
/** /**
* Sends an email. * Sends an email.
* *
* @param \Swift_Message $message A \Swift_Message intance * @param \Swift_Message $message A \Swift_Message instance
*/ */
public function mail(\Swift_Message $message) public function mail(\Swift_Message $message)
{ {
......
...@@ -64,7 +64,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface ...@@ -64,7 +64,7 @@ class DoctrineServiceProvider implements ServiceProviderInterface
$dbs = new \Pimple(); $dbs = new \Pimple();
foreach ($app['dbs.options'] as $name => $options) { foreach ($app['dbs.options'] as $name => $options) {
if ($app['dbs.default'] === $name) { if ($app['dbs.default'] === $name) {
// we use shortcuts here in case the default has been overriden // we use shortcuts here in case the default has been overridden
$config = $app['db.config']; $config = $app['db.config'];
$manager = $app['db.event_manager']; $manager = $app['db.event_manager'];
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment