Uses phpunit-bridge and fixes deprecation notices

Author: Keith Kirk

.travis.yml

@@ -36,7 +36,7 @@ install:
     - composer install --prefer-dist
 
 script:
-    - if [ "$COVERAGE" = "yes" ]; then phpunit --coverage-text --coverage-clover=coverage.clover --testsuite "UecodeQPushBundle Test Suite"; else phpunit --testsuite "UecodeQPushBundle Test Suite"; fi
+    - if [ "$COVERAGE" = "yes" ]; then ./vendor/bin/simple-phpunit --coverage-text --coverage-clover=coverage.clover --testsuite "UecodeQPushBundle Test Suite"; else ./vendor/bin/simple-phpunit --testsuite "UecodeQPushBundle Test Suite"; fi
 
 after_script:
   - if [ "$COVERAGE" = "yes" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi

composer.json

@@ -26,11 +26,11 @@
         "symfony/monolog-bundle": "~2.3|^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~3.7",
         "aws/aws-sdk-php": "~2.5",
         "iron-io/iron_mq": "^4.0",
         "symfony/finder": "~2.3|^3.0",
         "symfony/filesystem": "~2.3|^3.0",
+        "symfony/phpunit-bridge": "^4.0",
         "symfony/yaml": "^3.4"
     },
     "suggest": {

src/DependencyInjection/UecodeQPushExtension.php

@@ -104,6 +104,8 @@ public function load(array $configs, ContainerBuilder $container)
                 $class, [$queue, $values['options'], $client, new Reference($cache), new Reference('logger')]
             );
 
+            $definition->setPublic(true);
+
             $definition->addTag('monolog.logger', ['channel' => 'qpush'])
                 ->addTag(
                     'uecode_qpush.event_listener',

tests/EventListener/RequestListenerTest.php

@@ -56,7 +56,7 @@ public function setUp()
         $this->dispatcher->addListener(QPushEvents::Notification('ironmq-test'), [$this, 'IronMqOnNotificationReceived']);
         $this->dispatcher->addListener(QPushEvents::Notification('aws-test'), [$this, 'AwsOnNotificationReceived']);
 
-        $this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
+        $this->kernel = $this->createMock('Symfony\Component\HttpKernel\HttpKernelInterface');
     }
 
     public function testListenerDoesNothingForSubRequests()

tests/Provider/AbstractProviderTest.php

@@ -75,12 +75,12 @@ private function getTestProvider(array $options = [])
             'test',
             $options,
             new \stdClass,
-            $this->getMock(
+            $this->createMock(
                 'Doctrine\Common\Cache\PhpFileCache',
                 [],
                 ['/tmp', 'qpush.aws.test.php']
             ),
-            $this->getMock(
+            $this->createMock(
                 'Symfony\Bridge\Monolog\Logger',
                 [],
                 ['qpush.test']

tests/Provider/AwsProviderTest.php

@@ -86,13 +86,13 @@ private function getAwsProvider(array $options = [])
             'region' => 'us-east-1'
         ]);
 
-        $cache = $this->getMock(
+        $cache = $this->createMock(
             'Doctrine\Common\Cache\PhpFileCache',
             [],
             ['/tmp', 'qpush.aws.test.php']
         );
 
-        $logger = $this->getMock(
+        $logger = $this->createMock(
             'Symfony\Bridge\Monolog\Logger', [], ['qpush.test']
         );
 
@@ -316,7 +316,7 @@ public function testOnNotificationMessageEvent()
         $this->provider->onNotification(
             $event,
             NotificationEvent::TYPE_MESSAGE,
-            $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface')
+            $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface')
         );
     }
 

tests/Provider/CustomProviderTest.php

@@ -82,13 +82,13 @@ protected function getCustomProvider()
             'subscribers'           => []
         ];
 
-        $cache = $this->getMock(
+        $cache = $this->createMock(
             'Doctrine\Common\Cache\PhpFileCache',
             [],
             ['/tmp', 'qpush.custom.test.php']
         );
 
-        $this->logger = $this->getMock(
+        $this->logger = $this->createMock(
             'Monolog\Logger', [], ['qpush.test']
         );
 

tests/Provider/FileProviderTest.php

@@ -62,13 +62,13 @@ private function getFileProvider(array $options = [])
             $options
         );
 
-        $cache = $this->getMock(
+        $cache = $this->createMock(
             'Doctrine\Common\Cache\PhpFileCache',
             [],
             ['/tmp', 'qpush.aws.test.php']
         );
 
-        $logger = $this->getMock(
+        $logger = $this->createMock(
             'Symfony\Bridge\Monolog\Logger', [], ['qpush.test']
         );
 

tests/Provider/IronMqProviderTest.php

@@ -85,12 +85,12 @@ private function getIronMqProvider(array $options = [])
             'test',
             $options,
             $client,
-            $this->getMock(
+            $this->createMock(
                 'Doctrine\Common\Cache\PhpFileCache',
                 [],
                 ['/tmp', 'qpush.ironmq.test.php']
             ),
-            $this->getMock(
+            $this->createMock(
                 'Symfony\Bridge\Monolog\Logger',
                 [],
                 ['qpush.test']
@@ -181,7 +181,7 @@ public function testOnNotification()
         $this->provider->onNotification(
             $event,
             NotificationEvent::TYPE_MESSAGE,
-            $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface')
+            $this->createMock('Symfony\Component\EventDispatcher\EventDispatcherInterface')
         );
     }
 

tests/Provider/ProviderRegisteryTest.php

@@ -34,13 +34,13 @@ public function testRegistry()
         $registry   = new ProviderRegistry();
         $interface  = 'Uecode\Bundle\QPushBundle\Provider\ProviderInterface';
 
-        $registry->addProvider('test', $this->getMock($interface));
+        $registry->addProvider('test', $this->createMock($interface));
 
-        $this->assertEquals(['test' => $this->getMock($interface)], $registry->all());
+        $this->assertEquals(['test' => $this->createMock($interface)], $registry->all());
 
         $this->assertTrue($registry->has('test'));
 
-        $this->assertEquals($this->getMock($interface), $registry->get('test'));
+        $this->assertEquals($this->createMock($interface), $registry->get('test'));
 
         $this->setExpectedException('InvalidArgumentException');
         $registry->get('foo');