Merge branch 'master' of github.com:Superbalist/laravel-pubsub

Author: matthewgoslett

src/PubSubConnectionFactory.php

@@ -65,7 +65,7 @@ protected function makeRedisAdapter(array $config)
             $config['read_write_timeout'] = 0;
         }
 
-        $client = $this->container->make('pubsub.redis.redis_client', ['config' => $config]);
+        $client = $this->container->makeWith('pubsub.redis.redis_client', ['config' => $config]);
 
         return new RedisPubSubAdapter($client);
     }
@@ -80,21 +80,21 @@ protected function makeRedisAdapter(array $config)
     protected function makeKafkaAdapter(array $config)
     {
         // create producer
-        $producer = $this->container->make('pubsub.kafka.producer');
+        $producer = $this->container->makeWith('pubsub.kafka.producer');
         $producer->addBrokers($config['brokers']);
 
         // create consumer
-        $topicConf = $this->container->make('pubsub.kafka.topic_conf');
+        $topicConf = $this->container->makeWith('pubsub.kafka.topic_conf');
         $topicConf->set('auto.offset.reset', 'smallest');
 
-        $conf = $this->container->make('pubsub.kafka.conf');
+        $conf = $this->container->makeWith('pubsub.kafka.conf');
         $conf->set('group.id', array_get($config, 'consumer_group_id', 'php-pubsub'));
         $conf->set('metadata.broker.list', $config['brokers']);
         $conf->set('enable.auto.commit', 'false');
         $conf->set('offset.store.method', 'broker');
         $conf->setDefaultTopicConf($topicConf);
 
-        $consumer = $this->container->make('pubsub.kafka.consumer', ['conf' => $conf]);
+        $consumer = $this->container->makeWith('pubsub.kafka.consumer', ['conf' => $conf]);
 
         return new KafkaPubSubAdapter($producer, $consumer);
     }
@@ -112,7 +112,7 @@ protected function makeGoogleCloudAdapter(array $config)
             'projectId' => $config['project_id'],
             'keyFilePath' => $config['key_file'],
         ];
-        $client = $this->container->make('pubsub.gcloud.pub_sub_client', ['config' => $clientConfig]);
+        $client = $this->container->makeWith('pubsub.gcloud.pub_sub_client', ['config' => $clientConfig]);
 
         $clientIdentifier = array_get($config, 'client_identifier');
         $autoCreateTopics = array_get($config, 'auto_create_topics', true);

tests/PubSubConnectionFactoryTest.php

@@ -48,7 +48,7 @@ public function testMakeRedisAdapter()
         ];
 
         $container = Mockery::mock(Container::class);
-        $container->shouldReceive('make')
+        $container->shouldReceive('makeWith')
             ->withArgs([
                 'pubsub.redis.redis_client',
                 ['config' => $config],
@@ -80,15 +80,15 @@ public function testMakeKafkaAdapter()
             ->with('localhost')
             ->once();
 
-        $container->shouldReceive('make')
+        $container->shouldReceive('makeWith')
             ->with('pubsub.kafka.producer')
             ->once()
             ->andReturn($producer);
 
         $topicConf = Mockery::mock(\RdKafka\TopicConf::class);
         $topicConf->shouldReceive('set');
 
-        $container->shouldReceive('make')
+        $container->shouldReceive('makeWith')
             ->with('pubsub.kafka.topic_conf')
             ->once()
             ->andReturn($topicConf);
@@ -146,7 +146,7 @@ public function testMakeKafkaAdapter()
     public function testMakeGoogleCloudAdapter()
     {
         $container = Mockery::mock(Container::class);
-        $container->shouldReceive('make')
+        $container->shouldReceive('makeWith')
             ->withArgs([
                 'pubsub.gcloud.pub_sub_client',
                 [