Merge pull request #4 from ptondereau/lumen-support

Improve lib

.gitattributes

@@ -0,0 +1,8 @@
+* text=auto
+
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpunit.xml export-ignore
+/README.md export-ignore

.gitignore

@@ -1 +1,2 @@
 /vendor/
+composer.lock

.travis.yml

@@ -1,8 +1,62 @@
 language: php
+
+sudo: false
+
+matrix:
+  include:
+    - php: 5.5.9
+      env: LARAVEL_VERSION=5.1.*
+    - php: 5.5.9
+      env: LARAVEL_VERSION=5.2.*
+    - php: 5.5
+      env: LARAVEL_VERSION=5.1.*
+    - php: 5.5
+      env: LARAVEL_VERSION=5.2.*
+    - php: 5.6
+      env: LARAVEL_VERSION=5.1.*
+    - php: 5.6
+      env: LARAVEL_VERSION=5.2.*
+    - php: 5.6
+      env: LARAVEL_VERSION=5.3.*
+    - php: 5.6
+      env: LARAVEL_VERSION=5.4.*
+    - php: 7.0
+      env: LARAVEL_VERSION=5.1.*
+    - php: 7.0
+      env: LARAVEL_VERSION=5.2.*
+    - php: 7.0
+      env: LARAVEL_VERSION=5.3.*
+    - php: 7.0
+      env: LARAVEL_VERSION=5.4.*
+    - php: 7.1
+      env: LARAVEL_VERSION=5.1.*
+    - php: 7.1
+      env: LARAVEL_VERSION=5.2.*
+    - php: 7.1
+      env: LARAVEL_VERSION=5.3.*
+    - php: 7.1
+      env: LARAVEL_VERSION=5.4.*
+    - php: hhvm
+      env: LARAVEL_VERSION=5.1.*
+    - php: hhvm
+      env: LARAVEL_VERSION=5.2.*
+    - php: hhvm
+      env: LARAVEL_VERSION=5.3.*
+    - php: hhvm
+      env: LARAVEL_VERSION=5.4.*
+
+before_install:
+  - if [[ $TRAVIS_PHP_VERSION =~ ^hhvm ]]; then echo 'hhvm.jit = false' >> /etc/hhvm/php.ini ; fi
+  - composer self-update --stable -n
+  - composer require "laravel/framework:${LARAVEL_VERSION}" --no-update -n
+
 install:
-   - composer update
-php:
-  - '5.6'
-  - '7.0'
-  - hhvm
-  - nightly
+  - travis_retry composer install --no-suggest --prefer-dist -n -o
+
+script:
+  - if [ "$TRAVIS_PHP_VERSION" != "5.6" ]; then vendor/bin/phpunit; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi
+
+after_script:
+  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi

composer.json

@@ -3,17 +3,21 @@
     "description": "Slack Events API for Laravel 5",
     "keywords": ["slack", "laravel", "api", "slack api", "slack events api", "events", "slack events"],
     "require": {
-        "illuminate/http": "~5.0",
-        "illuminate/support": "~5.0",
-        "illuminate/routing": "~5.0"
+        "illuminate/http": "5.1.*|5.2.*|5.3.*|5.4.*",
+        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*",
+        "illuminate/routing": "5.1.*|5.2.*|5.3.*|5.4.*"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.5.*",
+        "phpunit/phpunit": "^4.7|^5.0",
         "orchestra/testbench": "~3.0"
     },
     "autoload": {
         "psr-4": {
-            "Lisennk\\LaravelSlackEvents\\": "src/",
+            "Lisennk\\LaravelSlackEvents\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "Lisennk\\LaravelSlackEvents\\Tests\\": "tests/"
         }
     },

src/config/slackEvents.php → config/slackEvents.php

@@ -6,7 +6,7 @@
     | Your validation token from "App Credentials"
     |-------------------------------------------------------------
     */
-    'token' => 'your-validation-token-here',
+    'token' => env('SLACK_EVENT_TOKEN', 'your-validation-token-here'),
 
     /*
     |-------------------------------------------------------------

phpunit.xml

@@ -1,7 +1,28 @@
-<phpunit bootstrap="vendor/autoload.php">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
     <testsuites>
-        <testsuite name="events">
-            <directory>tests</directory>
+        <testsuite name="Laravel Slack-Events Test Suite">
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
 </phpunit>

src/Events/Base/SlackEvent.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace Lisennk\LaravelSlackEvents\Events\Base;
+
 use Illuminate\Http\Request;
 
 /**
@@ -57,7 +58,7 @@ public function setFromRequest(Request $request)
     }
 
     /**
-     * Sets parameters from arrau
+     * Sets parameters from array
      *
      * @param array $data
      */

src/Http/EventController.php

@@ -7,7 +7,6 @@
 use Illuminate\Support\Facades\Event;
 use Lisennk\LaravelSlackEvents\EventCreator;
 use Lisennk\LaravelSlackEvents\Events\Base\SlackEvent;
-use Lisennk\LaravelSlackEvents\Http\EventMiddleware;
 
 /**
  * Class EventController

src/Http/EventMiddleware.php

@@ -21,10 +21,12 @@ class EventMiddleware
      */
     public function handle(Request $request, Closure $next)
     {
-        if ($request->input('token') != config('slackEvents.token'))
+        if ($request->input('token') !== config('slackEvents.token')) {
             return response('Wrong token', 200);
-        if ($request->input('type') == 'url_verification')
+        }
+        if ($request->input('type') === 'url_verification') {
             return response($request->input('challenge'), 200);
+        }
 
         return $next($request);
     }

src/SlackEventsServiceProvider.php

@@ -3,10 +3,9 @@
 namespace Lisennk\LaravelSlackEvents;
 
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Http\Request;
-use Lisennk\LaravelSlackEvents\EventCreator;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Facades\Route;
+use Illuminate\Foundation\Application as LaravelApplication;
+use Laravel\Lumen\Application as LumenApplication;
+
 
 /**
  * Class SlackApiServiceProvider
@@ -19,15 +18,18 @@ class SlackEventsServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot(Request $request)
+    public function boot()
     {
-        $this->publishes([
-            dirname(__FILE__).'/config/slackEvents.php' => config_path('slackEvents.php'),
-        ]);
+        $source = dirname(__DIR__).'/config/slackEvents.php';
 
-        if (!$this->app->routesAreCached()) {
-            require dirname(__FILE__).'/Http/routes.php';
+        if ($this->app instanceof LaravelApplication && $this->app->runningInConsole()) {
+            $this->publishes([$source => config_path('slackEvents.php')]);
+        } elseif ($this->app instanceof LumenApplication) {
+            $this->app->configure('slackEvents');
         }
+        $this->mergeConfigFrom($source, 'slackEvents');
+
+        require __DIR__.'/Http/routes.php';
     }
 
     /**

tests/ControllerTest.php

@@ -29,7 +29,7 @@ public function testFire()
 
         $response = $controller->fire($request, $creator);
 
-        $this->assertTrue($response instanceof Response);
+        $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(200, $response->status());
     }
 }

tests/MiddlewareTest.php

@@ -31,7 +31,7 @@ public function testWrongToken()
         $middleware = new EventMiddleware;
         $response = $middleware->handle($request, function($response) {});
 
-        $this->assertTrue($response instanceof Response);
+        $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(200, $response->status());
         $this->assertEquals('Wrong token', $response->content());
     }
@@ -45,8 +45,8 @@ public function testMiddlewarePass()
         $request->replace($this->eventRequestData);
         $middleware = new EventMiddleware;
 
-        $response = $middleware->handle($request, function($request) {
-            $this->assertTrue($request instanceof Request);
+        $middleware->handle($request, function($request) {
+            $this->assertInstanceOf(Request::class, $request);
         });
     }
 
@@ -67,7 +67,7 @@ public function testUrlVerification()
         $middleware = new EventMiddleware;
         $response = $middleware->handle($request, function($response) {});
 
-        $this->assertTrue($response instanceof Response);
+        $this->assertInstanceOf(Response::class, $response);
         $this->assertEquals(200, $response->status());
         $this->assertEquals($data['challenge'], $response->content());
     }

tests/CreatorTest.php → tests/SlackEventsTest.php

@@ -24,7 +24,7 @@ public function testShouldCreateReactionAdded()
         $events = new EventCreator();
 
         $event = $events->make('reaction_added');
-        $this->assertTrue($event instanceof ReactionAdded);
+        $this->assertInstanceOf(ReactionAdded::class, $event);
     }
 
     /**
@@ -35,7 +35,7 @@ public function testShouldCreateChannelCreated()
         $events = new EventCreator();
 
         $event = $events->make('channel_created');
-        $this->assertTrue($event instanceof ChannelCreated);
+        $this->assertInstanceOf(ChannelCreated::class, $event);
     }
 
     /**