Page MenuHomeDevCentral
Files F9572302

D231.diff
No OneTemporary
Actions

D231.diff
View Options

diff --git a/app/Providers/BrokerServiceProvider.php b/app/Providers/BrokerServiceProvider.php
--- a/app/Providers/BrokerServiceProvider.php
+++ b/app/Providers/BrokerServiceProvider.php
@@ -4,9 +4,8 @@
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Support\ServiceProvider;
-use Keruald\Broker\AMQPBroker as Broker;
-use Config;
+use Keruald\Broker\BrokerFactory;
class BrokerServiceProvider extends ServiceProvider {
@@ -22,20 +21,14 @@
* Registers the application services.
*
* @return void
- *
- * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
public function register() {
$this->app->singleton('broker', function (Application $app) {
- $broker = new Broker();
- $broker->connect(
- Config::get('broker.connections.amqp.host'),
- Config::get('broker.connections.amqp.port'),
- Config::get('broker.connections.amqp.username'),
- Config::get('broker.connections.amqp.password'),
- Config::get('broker.connections.amqp.vhost')
- );
- return $broker;
+ $config = $app->make('config');
+ $driver = $config->get('broker.driver');
+ $params = $config->get('broker.connections.' . $driver);
+
+ return BrokerFactory::make($params);
});
}
}
diff --git a/composer.json b/composer.json
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
"php": ">=5.6.0",
"laravel/framework": "5.2.*",
"keruald/github": ">=0.2.0",
- "keruald/broker": ">=0.2.0",
+ "keruald/broker": ">=0.3.2",
"netresearch/jsonmapper": "~0.1.0"
},
"require-dev": {
diff --git a/config/broker.php b/config/broker.php
--- a/config/broker.php
+++ b/config/broker.php
@@ -36,6 +36,10 @@
'vhost' => env('BROKER_VHOST', '/'),
],
+ 'blackhole' => [
+ 'driver' => 'blackhole',
+ ]
+
],
/*
diff --git a/phpunit.xml b/phpunit.xml
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,6 +27,7 @@
</logging>
<php>
<env name="APP_ENV" value="testing"/>
+ <env name="BROKER_DRIVER" value="blackhole"/>
<env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
diff --git a/tests/Providers/BrokerServiceProviderTest.php b/tests/Providers/BrokerServiceProviderTest.php
new file mode 100644
--- /dev/null
+++ b/tests/Providers/BrokerServiceProviderTest.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Nasqueron\Notifications\Tests\Providers;
+
+class BrokerServiceProviderTest extends TestCase {
+
+ public function testType () {
+ $this->assertServiceInstanceOf(
+ 'Keruald\Broker\Broker',
+ 'broker'
+ );
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 9, 07:01 (1 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2714114
Default Alt Text
D231.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator