Merge pull request #617 from FriendsOfSymfony/scope

Fix scope error on Symfony 3

DependencyInjection/Compiler/SpamDetectionPass.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the FOSCommentBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace FOS\CommentBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * SpamDetectionPass
+ */
+class SpamDetectionPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        // Symfony 2.3 BC
+        if (class_exists('Symfony\Component\HttpFoundation\RequestStack')) {
+            return;
+        }
+
+        if ($container->hasDefinition('fos_comment.spam_detection.comment.akismet')) {
+            $definition = $container->getDefinition('fos_comment.spam_detection.comment.akismet');
+            $definition->setScope('request');
+        }
+
+        if ($container->hasDefinition('fos_comment.listener.comment_spam')) {
+            $definition = $container->getDefinition('fos_comment.listener.comment_spam');
+            $definition->setScope('request');
+        }
+    }
+}

FOSCommentBundle.php

@@ -13,6 +13,7 @@
 
 use FOS\CommentBundle\DependencyInjection\Compiler\SecurityPass;
 use FOS\CommentBundle\DependencyInjection\Compiler\SortingPass;
+use FOS\CommentBundle\DependencyInjection\Compiler\SpamDetectionPass;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -30,5 +31,6 @@ public function build(ContainerBuilder $container)
 
         $container->addCompilerPass(new SecurityPass());
         $container->addCompilerPass(new SortingPass());
+        $container->addCompilerPass(new SpamDetectionPass());
     }
 }

Resources/config/spam_detection.xml

@@ -15,11 +15,11 @@
 
     <services>
 
-        <service id="fos_comment.spam_detection.comment.akismet" class="FOS\CommentBundle\SpamDetection\AkismetSpamDetection" scope="request" public="false">
+        <service id="fos_comment.spam_detection.comment.akismet" class="FOS\CommentBundle\SpamDetection\AkismetSpamDetection" public="false">
             <argument type="service" id="ornicar_akismet" />
         </service>
 
-        <service id="fos_comment.listener.comment_spam" class="FOS\CommentBundle\EventListener\CommentSpamListener" scope="request">
+        <service id="fos_comment.listener.comment_spam" class="FOS\CommentBundle\EventListener\CommentSpamListener">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="fos_comment.spam_detection.comment" />
         </service>