Merge pull request #162 from core23/symfony3

Improved support for symfony 3
sonata-project · Jan 17, 2016 · 3953bbf · 3953bbf
2 parents bbd3fcd + 36673d3
commit 3953bbf
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 22 deletions.
diff --git a/Consumer/LoggerConsumer.php b/Consumer/LoggerConsumer.php
@@ -11,8 +11,9 @@
 
 namespace Sonata\NotificationBundle\Consumer;
 
+use Psr\Log\LoggerInterface;
 use Sonata\NotificationBundle\Exception\InvalidParameterException;
-use Symfony\Component\HttpKernel\Log\LoggerInterface;
+use Symfony\Component\HttpKernel\Log\LoggerInterface as LegacyLoggerInterface;
 
 class LoggerConsumer implements ConsumerInterface
 {
@@ -25,21 +26,24 @@ class LoggerConsumer implements ConsumerInterface
      * @var string[]
      */
     protected $types = array(
-        'emerg',
-        'alert',
-        'crit',
-        'err',
-        'warn',
-        'notice',
-        'info',
-        'debug',
+        'emerg'  => 'emergency',
+        'alert'  => 'alert',
+        'crit'   => 'critical',
+        'err'    => 'error',
+        'warn'   => 'warning',
+        'notice' => 'notice',
+        'info'   => 'info',
+        'debug'  => 'debug',
     );
 
     /**
-     * @param LoggerInterface $logger
+     * @param LoggerInterface|LegacyLoggerInterface $logger
      */
-    public function __construct(LoggerInterface $logger)
+    public function __construct($logger)
     {
+        if ($logger instanceof LegacyLoggerInterface) {
+            trigger_error(sprintf('Using an instance of "%s" is deprecated since version 2.3. Use Psr\Log\LoggerInterface instead.', get_class($logger)), E_USER_DEPRECATED);
+        }
         $this->logger = $logger;
     }
 
@@ -50,10 +54,12 @@ public function process(ConsumerEvent $event)
     {
         $message = $event->getMessage();
 
-        if (!in_array($message->getValue('level'), $this->types)) {
+        if (!array_key_exists($message->getValue('level'), $this->types)) {
             throw new InvalidParameterException();
         }
 
-        call_user_func(array($this->logger, $message->getValue('level')), $message->getValue('message'));
+        $level = $this->types[$message->getValue('level')];
+
+        $this->logger->{$level}($message->getValue('message'));
     }
 }
diff --git a/Controller/Api/MessageController.php b/Controller/Api/MessageController.php
@@ -127,7 +127,7 @@ public function postMessageAction(Request $request)
             'csrf_protection' => false,
         ));
 
-        $form->bind($request);
+        $form->handleRequest($request);
 
         if ($form->isValid()) {
             $message = $form->getData();

diff --git a/Tests/Backend/MessageManagerBackendTest.php b/Tests/Backend/MessageManagerBackendTest.php
@@ -107,7 +107,7 @@ public function testStatus($counts, $expectedStatus, $message)
     public static function statusProvider()
     {
         if (!class_exists('ZendDiagnostics\Result\Success')) {
-            return array(array(1,1,1));
+            return array(array(1, 1, 1));
         }
 
         $data = array();

diff --git a/Tests/Consumer/LoggerConsumerTest.php b/Tests/Consumer/LoggerConsumerTest.php
@@ -17,14 +17,20 @@
 
 class LoggerConsumerTest extends \PHPUnit_Framework_TestCase
 {
-    public function testProcess()
+    /**
+     * @dataProvider calledTypeProvider
+     *
+     * @param $type
+     * @param $calledType
+     */
+    public function testProcess($type, $calledType)
     {
-        $logger = $this->getMock('Symfony\Component\HttpKernel\Log\LoggerInterface');
-        $logger->expects($this->once())->method('crit');
+        $logger = $this->getMock('Psr\Log\LoggerInterface');
+        $logger->expects($this->once())->method($calledType);
 
         $message = new Message();
         $message->setBody(array(
-            'level'   => 'crit',
+            'level'   => $type,
             'message' => 'Alert - Area 52 get compromised!!',
         ));
 
@@ -34,12 +40,29 @@ public function testProcess()
         $consumer->process($event);
     }
 
+    /**
+     * @return array[]
+     */
+    public function calledTypeProvider()
+    {
+        return array(
+            array('emerg', 'emergency'),
+            array('alert', 'alert'),
+            array('crit', 'critical'),
+            array('err', 'error'),
+            array('warn', 'warning'),
+            array('notice', 'notice'),
+            array('info', 'info'),
+            array('debug', 'debug'),
+        );
+    }
+
     /**
      * @expectedException \Sonata\NotificationBundle\Exception\InvalidParameterException
      */
     public function testInvalidType()
     {
-        $logger = $this->getMock('Symfony\Component\HttpKernel\Log\LoggerInterface');
+        $logger = $this->getMock('Psr\Log\LoggerInterface');
 
         $message = new Message();
         $message->setBody(array(

diff --git a/Tests/Controller/Api/MessageControllerTest.php b/Tests/Controller/Api/MessageControllerTest.php
@@ -42,7 +42,7 @@ public function testPostMessageAction()
         $messageManager->expects($this->once())->method('save')->will($this->returnValue($message));
 
         $form = $this->getMockBuilder('Symfony\Component\Form\Form')->disableOriginalConstructor()->getMock();
-        $form->expects($this->once())->method('bind');
+        $form->expects($this->once())->method('handleRequest');
         $form->expects($this->once())->method('isValid')->will($this->returnValue(true));
         $form->expects($this->once())->method('getData')->will($this->returnValue($message));
 
@@ -62,7 +62,7 @@ public function testPostMessageInvalidAction()
         $messageManager->expects($this->never())->method('save')->will($this->returnValue($message));
 
         $form = $this->getMockBuilder('Symfony\Component\Form\Form')->disableOriginalConstructor()->getMock();
-        $form->expects($this->once())->method('bind');
+        $form->expects($this->once())->method('handleRequest');
         $form->expects($this->once())->method('isValid')->will($this->returnValue(false));
 
         $formFactory = $this->getMock('Symfony\Component\Form\FormFactoryInterface');