clean some stuff

OpenClassrooms · Jul 16, 2015 · a01feb9 · a01feb9
1 parent 0443771
commit a01feb9
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 46 deletions.
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -1,6 +1,5 @@
 <container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-
         <service id="openclassrooms.akismet.client" class="OpenClassrooms\Akismet\Client\Impl\ClientImpl">
             <argument>%openclassrooms.akismet.key%</argument>
             <argument>%openclassrooms.akismet.blog%</argument>

diff --git a/Services/Impl/AkismetServiceImpl.php b/Services/Impl/AkismetServiceImpl.php
@@ -27,38 +27,37 @@ class AkismetServiceImpl implements AkismetService
      */
     public function commentCheck(Comment $comment)
     {
-        $this->overLoadComment($comment);
-
-        return $this->akismet->commentCheck($comment);
+        return $this->akismet->commentCheck($this->completeComment($comment));
     }
 
-    private function overLoadComment(Comment $comment)
+    /**
+     * @return Comment
+     */
+    private function completeComment(Comment $comment)
     {
-        $request = $this->requestStack->getCurrentRequest();
+        $request = $this->requestStack->getMasterRequest();
 
         $comment->setUserIp($request->getClientIp());
         $comment->setUserAgent($request->headers->get('User-Agent'));
         $comment->setReferrer($request->headers->get('referrer'));
+
+        return $comment;
     }
 
     /**
      * {@inheritdoc}
      */
     public function submitSpam(Comment $comment)
     {
-        $this->overLoadComment($comment);
-
-        return $this->akismet->submitSpam($comment);
+        return $this->akismet->submitSpam($this->completeComment($comment));
     }
 
     /**
      * {@inheritdoc}
      */
     public function submitHam(Comment $comment)
     {
-        $this->overLoadComment($comment);
-
-        return $this->akismet->submitHam($comment);
+        return $this->akismet->submitHam($this->completeComment($comment));
     }
 
     public function setAkismet(AkismetService $akismet)

diff --git a/Tests/DependencyInjection/OpenClassroomsAkismetExtensionTest.php b/Tests/DependencyInjection/OpenClassroomsAkismetExtensionTest.php
@@ -4,11 +4,11 @@
 
 use OpenClassrooms\Bundle\AkismetBundle\DependencyInjection\OpenClassroomsAkismetExtension;
 use OpenClassrooms\Bundle\AkismetBundle\OpenClassroomsAkismetBundle;
-use OpenClassrooms\Bundle\AkismetBundle\Tests\Doubles\HttpFoundation\RequestStackMock;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * @author Arnaud Lefèvre <arnaud.lefevre@openclassrooms.com>
@@ -94,7 +94,7 @@ protected function setUp()
     {
         $this->container = new ContainerBuilder();
         $this->extension = new OpenClassroomsAkismetExtension();
-        $this->container->set('request_stack', new RequestStackMock());
+        $this->container->set('request_stack', new RequestStack());
         $this->container->registerExtension($this->extension);
         $this->container->loadFromExtension('open_classrooms_akismet');
         $this->configLoader = new YamlFileLoader(

diff --git a/Tests/Doubles/HttpFoundation/RequestStackMock.php b/Tests/Doubles/HttpFoundation/RequestStackMock.php
diff --git a/Tests/Services/Impl/AkismetServiceImplTest.php b/Tests/Services/Impl/AkismetServiceImplTest.php
@@ -5,11 +5,12 @@
 use OpenClassrooms\Akismet\Models\Impl\CommentBuilderImpl;
 use OpenClassrooms\Akismet\Models\Resource;
 use OpenClassrooms\Akismet\Services\AkismetService;
-use OpenClassrooms\Akismet\Tests\Models\CommentStub;
 use OpenClassrooms\Akismet\Services\Impl\AkismetServiceImpl as Akismet;
+use OpenClassrooms\Akismet\Tests\Models\CommentStub;
 use OpenClassrooms\Bundle\AkismetBundle\Services\Impl\AkismetServiceImpl;
 use OpenClassrooms\Bundle\AkismetBundle\Tests\Doubles\Client\ClientMock;
-use OpenClassrooms\Bundle\AkismetBundle\Tests\Doubles\HttpFoundation\RequestStackMock;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Class AkismetServiceImplTest
@@ -19,8 +20,13 @@
 class AkismetServiceImplTest extends \PHPUnit_Framework_TestCase
 {
     const KEY = '123APIKey';
+
     const BLOG_URL = 'http://www.blogdomainname.com/';
 
+    const USER_AGENT = 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6';
+
+    const REFERRER = 'http://www.google.com';
+
     /**
      * @var AkismetService
      */
@@ -106,18 +112,32 @@ private function assertCommentCheckParams()
     protected function setUp()
     {
         $this->akismetService = new AkismetServiceImpl();
-        $this->akismetService->setAkismet($this->getAkismet());
-        $this->akismetService->setRequestStack(new RequestStackMock());
+        $this->akismetService->setAkismet($this->buildAkismet());
+        $this->akismetService->setRequestStack($this->buildRequestStack());
     }
 
     /**
      * @return Akismet
      */
-    private function getAkismet()
+    private function buildAkismet()
     {
         $akismet = new Akismet();
         $akismet->setClient(new ClientMock());
 
         return $akismet;
     }
+
+    /**
+     * @return RequestStack
+     */
+    protected function buildRequestStack()
+    {
+        $request = Request::create('http://localhost');
+        $request->headers->set('User-Agent', self::USER_AGENT);
+        $request->headers->set('referrer', self::REFERRER);
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+
+        return $requestStack;
+    }
 }