Merge pull request #303 from ruudk/patch-2

videlalvaro · videlalvaro · commit c26019d78f9e · 2015-10-06T21:59:39.000+02:00
Support PhpAmqpLib 2.6
diff --git a/Tests/RabbitMq/BaseAmqpTest.php b/Tests/RabbitMq/BaseAmqpTest.php
@@ -4,12 +4,11 @@
 
 use OldSound\RabbitMqBundle\RabbitMq\Consumer;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class BaseAmqpTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @expectedException \PhpAmqpLib\Exception\AMQPRuntimeException
+     * @expectedException \ErrorException
      */
     public function testLazyConnection()
     {
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "symfony/config"               : "~2.3",
         "symfony/yaml"                 : "~2.3",
         "symfony/console"              : "~2.3",
-        "videlalvaro/php-amqplib"      : "~2.5.0"
+        "videlalvaro/php-amqplib"      : "~2.6"
     },
     "suggest": {
         "symfony/framework-bundle" : "To use this lib as a full Symfony Bundle and to use the profiler data collector"

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,11 @@`
`4`	`4`
`5`	`5`	`use OldSound\RabbitMqBundle\RabbitMq\Consumer;`
`6`	`6`	`use PhpAmqpLib\Connection\AMQPLazyConnection;`
`7`		`-use Symfony\Component\DependencyInjection\ContainerBuilder;`
`8`	`7`
`9`	`8`	`class BaseAmqpTest extends \PHPUnit_Framework_TestCase`
`10`	`9`	`{`
`11`	`10`	`/**`
`12`		`- * @expectedException \PhpAmqpLib\Exception\AMQPRuntimeException`
	`11`	`+ * @expectedException \ErrorException`
`13`	`12`	`*/`
`14`	`13`	`public function testLazyConnection()`
`15`	`14`	`{`