moved the closures out from the config into the module class

robertmarsal · Jan 30, 2014 · 0e0c735 · 0e0c735
1 parent ce50a40
commit 0e0c735
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 40 deletions.
diff --git a/Module.php b/Module.php
@@ -4,7 +4,9 @@
 
 use RbComment\Model\Comment as RbComment;
 use RbComment\Model\CommentTable as RbCommentTable;
+use ZendService\Akismet\Akismet;
 use Zend\Db\ResultSet\ResultSet;
+use Zend\Mail\Transport\Sendmail;
 use Zend\Db\TableGateway\TableGateway;
 
 class Module
@@ -43,6 +45,28 @@ public function getServiceConfig()
                     $resultSetPrototype->setArrayObjectPrototype(new RbComment());
                     return new TableGateway('rb_comments', $dbAdapter, null, $resultSetPrototype);
                 },
+                /**
+                 * Placeholder transport config. Do not use this in production.
+                 * Replace with smtp.
+                 */
+                'RbComment\Mailer' => function () {
+                    return new Sendmail();
+                },
+                /**
+                 * Akismet service instance factory. Uses the config down below.
+                 */
+                'RbComment\Akismet' => function ($serviceManager) {
+
+                    $config = $serviceManager->get('Config');
+                    $viewHelperManager = $serviceManager->get('viewhelpermanager');
+
+                    $akismetConfig = $config['rb_comment']['akismet'];
+
+                    return new Akismet(
+                        $akismetConfig['api_key'],
+                        $viewHelperManager->get('serverUrl')->__invoke()
+                    );
+               }
             ),
         );
     }

diff --git a/README.md b/README.md
@@ -111,20 +111,11 @@ This array contains email notifications parameters
     'context_link_text' => 'See this comment in context',
 ),
 ```
-For sending the emails the module uses a service factory called `RbComment\Mailer`. As a default it configures a sendmail transport. This should be changed in production and customized to your needs (probably with smtp). To do this rewrite the service factory in your `config/autoload/global.php` file.
-```php
-'service_manager' => array(
-    'factories' => array(
-        /**
-         * Placeholder transport config. Do not use this in production.
-         * Replace with smtp.
-         */
-        'RbComment\Mailer' => function () {
-            return new Zend\Mail\Transport\Sendmail();
-        },
-    ),
-),
-```
+For sending the emails the module uses a service factory called `RbComment\Mailer`.
+As a default it configures a sendmail transport. This should be changed in
+production and customized to your needs (probably with smtp).
+To do this rewrite the service factory `RbComment\Mailer`.
+
 #### akismet
 
 The module provides integration with the Akismet service. Comments marked as

diff --git a/config/module.config.php b/config/module.config.php
@@ -38,32 +38,6 @@
             'rbcomment/theme/default' => __DIR__ . '/../view/theme/default.phtml',
         ),
     ),
-    'service_manager' => array(
-        'factories' => array(
-            /**
-             * Placeholder transport config. Do not use this in production.
-             * Replace with smtp.
-             */
-            'RbComment\Mailer' => function () {
-                return new Zend\Mail\Transport\Sendmail();
-            },
-            /**
-             * Akismet service instance factory. Uses the config down below.
-             */
-            'RbComment\Akismet' => function ($serviceManager) {
-
-                $config = $serviceManager->get('Config');
-                $viewHelperManager = $serviceManager->get('viewhelpermanager');
-
-                $akismetConfig = $config['rb_comment']['akismet'];
-
-                return new ZendService\Akismet\Akismet(
-                    $akismetConfig['api_key'],
-                    $viewHelperManager->get('serverUrl')->__invoke()
-                );
-            }
-        ),
-    ),
     'rb_comment' => array(
         /**
          * Default visibility of the comments.