added tests for logging

Author: pulkitjalan

.travis.yml

@@ -1,12 +1,18 @@
-sudo: false
 language: php
 
 php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
+matrix:
+    allow_failures:
+        - php: 7.0
+
+sudo: false
+
 before_script:
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction --prefer-source --dev

composer.json

@@ -18,7 +18,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "4.*",
-        "mockery/mockery": "0.9.*"
+        "mockery/mockery": "0.9.*",
+        "monolog/monolog": "1.*"
     },
     "autoload": {
         "psr-4": {

src/RequesterServiceProvider.php

@@ -25,14 +25,14 @@ public function boot()
             return $app['requester'];
         };
 
-        if ($this->app->config->get('requester::log.enabled')) {
-            $logger = $this->app->log->getMonolog();
+        if ($this->app['config']->get('requester::log.enabled')) {
+            $logger = $this->app['log']->getMonolog();
 
-            if (!empty($this->app->config->get('requester::log.file'))) {
-                $logger->pushHandler(new StreamHandler($this->app->config->get('requester::log.file'), Logger::INFO));
+            if (!empty($this->app['config']->get('requester::log.file'))) {
+                $logger->pushHandler(new StreamHandler($this->app['config']->get('requester::log.file'), Logger::INFO));
             }
 
-            $this->app['requester']->addLogger($logger, $this->app->config->get('requester::log.format'));
+            $this->app['requester']->addLogger($logger, $this->app['config']->get('requester::log.format'));
         }
     }
 
@@ -43,10 +43,10 @@ public function boot()
      */
     public function register()
     {
-        $this->app->config->package('pulkitjalan/requester', realpath(__DIR__.'/config'), 'requester');
+        $this->app['config']->package('pulkitjalan/requester', realpath(__DIR__.'/config'), 'requester');
 
         $this->app['requester'] = $this->app->share(function ($app) {
-            return new Requester(new GuzzleClient(), $config = $app->config->get('requester::config'));
+            return new Requester(new GuzzleClient(), $config = $app['config']->get('requester::config'));
         });
     }
 

tests/RequesterTest.php

@@ -18,7 +18,7 @@ public function tearDown()
         Mockery::close();
     }
 
-    public function testUrlGetter()
+    public function test_url_getter()
     {
         $this->requester->url('example.com');
 
@@ -33,19 +33,19 @@ public function testUrlGetter()
         $this->assertEquals('git://example.com', $this->requester->getUrl());
     }
 
-    public function testInvalidUrlException()
+    public function test_invalid_url_exception()
     {
         $this->setExpectedException('PulkitJalan\Requester\Exceptions\InvalidUrlException');
 
         $this->requester->getUrl();
     }
 
-    public function testGuzzleGetter()
+    public function test_guzzle_getter()
     {
         $this->assertInstanceOf('GuzzleHttp\Client', $this->requester->getGuzzleClient());
     }
 
-    public function testDisablingSslVerification()
+    public function test_disabling_ssl_verification()
     {
         $this->guzzle->shouldReceive('get')->once()->with('https://example.com', [
             'verify' => false,
@@ -54,7 +54,7 @@ public function testDisablingSslVerification()
         $this->requester->url('example.com')->verify(false)->get();
     }
 
-    public function testSettingAsync()
+    public function test_setting_async()
     {
         $this->guzzle->shouldReceive('get')->once()->with('https://example.com', [
             'verify' => true,
@@ -64,7 +64,7 @@ public function testSettingAsync()
         $this->requester->url('example.com')->async(true)->get();
     }
 
-    public function testSettingAndAddingHeaders()
+    public function test_setting_and_adding_headers()
     {
         $this->requester->headers(['Authorization' => 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==']);
 
@@ -84,7 +84,7 @@ public function testSettingAndAddingHeaders()
         ], $this->readAttribute($this->requester, 'options'));
     }
 
-    public function testAddingFileToRequest()
+    public function test_adding_file_to_request()
     {
         $this->requester->addFile(__FILE__);
 
@@ -97,7 +97,7 @@ public function testAddingFileToRequest()
         $this->assertInternalType('resource', $this->readAttribute($this->requester, 'options')['body']['image']);
     }
 
-    public function testChangingRetryOptions()
+    public function test_changing_retry_options()
     {
         $this->requester->retry(10);
 
@@ -116,7 +116,22 @@ public function testChangingRetryOptions()
         $this->assertEquals(false, $this->readAttribute($this->requester, 'retry'));
     }
 
-    public function testSendingGetRequest()
+    public function test_adding_logger()
+    {
+        $monolog = new \Monolog\Logger('name');
+        $handler = Mockery::mock('Monolog\Handler\NullHandler')->makePartial();
+        $monolog->pushHandler($handler);
+
+        $requester = new \PulkitJalan\Requester\Requester(new \GuzzleHttp\Client());
+
+        $requester->addLogger($monolog);
+
+        $handler->shouldReceive('handle')->once();
+
+        $requester->url('example.com')->get();
+    }
+
+    public function test_sending_get_request()
     {
         $this->guzzle->shouldReceive('get')->once()->with('https://example.com', [
             'verify' => true,
@@ -125,7 +140,7 @@ public function testSendingGetRequest()
         $this->requester->url('example.com')->get();
     }
 
-    public function testSendingHeadRequest()
+    public function test_sending_head_request()
     {
         $this->guzzle->shouldReceive('head')->once()->with('https://example.com', [
             'verify' => true,
@@ -134,7 +149,7 @@ public function testSendingHeadRequest()
         $this->requester->url('example.com')->head();
     }
 
-    public function testSendingOptionsRequest()
+    public function test_sending_options_request()
     {
         $this->guzzle->shouldReceive('options')->once()->with('https://example.com', [
             'verify' => true,
@@ -143,7 +158,7 @@ public function testSendingOptionsRequest()
         $this->requester->url('example.com')->options();
     }
 
-    public function testSendingPostRequest()
+    public function test_sending_post_request()
     {
         $this->guzzle->shouldReceive('post')->once()->with('https://example.com', [
             'verify'  => true,
@@ -159,7 +174,7 @@ public function testSendingPostRequest()
         ]);
     }
 
-    public function testSendingPutRequest()
+    public function test_sending_put_request()
     {
         $this->guzzle->shouldReceive('put')->once()->with('https://example.com', [
             'verify'  => true,
@@ -175,7 +190,7 @@ public function testSendingPutRequest()
         ]);
     }
 
-    public function testSendingPatchRequest()
+    public function test_sending_patch_request()
     {
         $this->guzzle->shouldReceive('patch')->once()->with('https://example.com', [
             'verify'  => true,
@@ -191,7 +206,7 @@ public function testSendingPatchRequest()
         ]);
     }
 
-    public function testSendingDeleteRequest()
+    public function test_sending_delete_request()
     {
         $this->guzzle->shouldReceive('delete')->once()->with('https://example.com', [
             'verify'  => true,