Merge pull request #8 from lukewaite/l5.7_support

L5.7 support

Author: lukewaite

.travis.yml

@@ -1,18 +1,27 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
-  - 7.2
   - 7.3
 
 env:
-  matrix:
-    - COMPOSER_FLAGS="--prefer-lowest"
-    - COMPOSER_FLAGS=""
+  - LARAVEL_VERSION="~5.5.0" COMPOSER_FLAGS="--prefer-lowest"
+  - LARAVEL_VERSION="~5.5.0" COMPOSER_FLAGS=""
+  - LARAVEL_VERSION="~5.6.0" COMPOSER_FLAGS="--prefer-lowest"
+  - LARAVEL_VERSION="~5.6.0" COMPOSER_FLAGS=""
+  - LARAVEL_VERSION="~5.7.0" COMPOSER_FLAGS="--prefer-lowest"
+  - LARAVEL_VERSION="~5.7.0" COMPOSER_FLAGS=""
+
+matrix:
+  include:
+    - php: 7.0
+      env: LARAVEL_VERSION="~5.1.0" COMPOSER_FLAGS=""
+    - php: 7.1
+      env: LARAVEL_VERSION="~5.7.0" COMPOSER_FLAGS=""
+    - php: 7.2
+      env: LARAVEL_VERSION="~5.7.0" COMPOSER_FLAGS=""
 
 before_script:
-  - travis_retry composer self-update
+  - travis_retry composer require laravel/framework ${LARAVEL_VERSION}
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:

composer.json

@@ -25,7 +25,7 @@
     "illuminate/support": ">5.1.0 <5.8"
   },
   "require-dev": {
-    "laravel/framework": ">5.1.0 <5.2",
+    "laravel/framework": ">5.1.0 <5.8",
     "mockery/mockery": "^0.9.6",
     "php-coveralls/php-coveralls": "^2.1",
     "phpunit/phpunit": "^6.5",

src/Contracts/Handler.php

@@ -2,12 +2,16 @@
 
 namespace Intouch\LaravelAwsLambda\Contracts;
 
-abstract class Handler implements IHandler
+abstract class Handler
 {
     protected $payload;
 
-    public function __construct($payload)
+    public function setPayload($payload)
     {
         $this->payload = $payload;
     }
+
+    abstract public function canHandle();
+
+//    abstract function  handle();
 }

src/Contracts/IHandler.php

@@ -3,6 +3,7 @@
 namespace Intouch\LaravelAwsLambda;
 
 use Illuminate\Contracts\Container\Container;
+use Intouch\LaravelAwsLambda\Contracts\Handler;
 
 class Executor
 {
@@ -37,9 +38,11 @@ public function handle($payload)
     private function runHandlers($payload)
     {
         foreach ($this->handlers as $handler) {
-            $instance = new $handler($payload);
+            /** @var Handler $instance */
+            $instance = $this->app->make($handler);
+            $instance->setPayload($payload);
 
-            if ($instance->canHandle($payload)) {
+            if ($instance->canHandle()) {
                 return $this->app->call([$instance, 'handle']);
             }
         }

src/Executor.php

@@ -2,25 +2,33 @@
 
 namespace Intouch\LaravelAwsLambda\Handlers;
 
-use Illuminate\Contracts\Container\Container;
+use Illuminate\Foundation\Application;
 use Illuminate\Queue\Worker;
+use Illuminate\Queue\WorkerOptions;
 use Intouch\LaravelAwsLambda\Contracts\Handler;
 use Intouch\LaravelAwsLambda\Queue\Jobs\LambdaSqsJob;
+use Intouch\LaravelAwsLambda\Queue\Jobs\LambdaSqsJobFiveOne;
 
 class Sqs extends Handler
 {
     /**
-     * @param Container $container
+     * @param Application $app
      * @param Worker $worker
      *
      * @return array|null
      * @throws \Throwable
      */
-    public function handle(Container $container, Worker $worker)
+    public function handle(Application $app, Worker $worker)
     {
-        $job = new LambdaSqsJob($container, $this->payload);
+        if (version_compare($app->version(), '5.3.0', '>=')) {
+            $job = new LambdaSqsJob($app, $this->payload);
 
-        return $worker->process('lambda', $job);
+            return $worker->process('lambda', $job, new WorkerOptions());
+        } else {
+            $job = new LambdaSqsJobFiveOne($app, $this->payload);
+
+            return $worker->process('lambda', $job);
+        }
     }
 
     public function canHandle()

src/Handlers/Sqs.php

@@ -29,12 +29,14 @@ public function __construct(Container $container, array $job)
 
     /**
      * Fire the job.
+     * We implement this here, and pass it up to the parent to allow the class to be loaded in older versions
+     * of Laravel without triggering a fatal error. Those versions of Laravel use the LambadaSqsJobFiveOne class.
      *
      * @return void
      */
     public function fire()
     {
-        $this->resolveAndFire(json_decode($this->getRawBody(), true));
+        parent::fire();
     }
 
     /**

src/Queue/Jobs/LambdaSqsJob.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Intouch\LaravelAwsLambda\Queue\Jobs;
+
+/**
+ * A Laravel 5.1 and 5.2 compatible Job.
+ */
+class LambdaSqsJobFiveOne extends LambdaSqsJob
+{
+    /**
+     * Fire the job.
+     *
+     * @return void
+     */
+    public function fire()
+    {
+        $this->resolveAndFire(json_decode($this->getRawBody(), true));
+    }
+}

src/Queue/Jobs/LambdaSqsJobFiveOne.php

@@ -76,7 +76,8 @@ public function can_handle_a_valid_api_gateway_message()
     {
         $payload = json_decode($this->validJson, true);
 
-        $handler = new ApiGateway($payload);
+        $handler = new ApiGateway();
+        $handler->setPayload($payload);
         $this->assertTrue($handler->canHandle());
     }
 
@@ -122,15 +123,19 @@ public function it_ignores_a_payload_from_an_alb()
 
         $payload = json_decode($payload, true);
 
-        $handler = new ApiGateway($payload);
+        $handler = new ApiGateway();
+        $handler->setPayload($payload);
+
         $this->assertFalse($handler->canHandle());
     }
 
     /** @test */
     public function it_coverts_headers_json_to_a_server_array_of_headers()
     {
         $payload = json_decode($this->validJson, true);
-        $handler = new ApiGateway($payload);
+
+        $handler = new ApiGateway();
+        $handler->setPayload($payload);
 
         $this->assertEquals(
             [
@@ -161,7 +166,8 @@ public function it_coverts_headers_json_to_a_server_array_of_headers()
     public function it_coverts_headers_json_to_a_server_array_of_headers_not_prefixing_content_type()
     {
         $payload = json_decode($this->validJson, true);
-        $handler = new ApiGateway($payload);
+        $handler = new ApiGateway();
+        $handler->setPayload($payload);
         $headers = [
             'Accept' => 'application/json',
             'Content-Type' => 'application/json',
@@ -184,7 +190,8 @@ public function it_handles_non_base64_encoded_body()
             'body' => 'I am a sample body',
             'isBase64Encoded' => false,
         ];
-        $handler = new ApiGateway($payload);
+        $handler = new ApiGateway();
+        $handler->setPayload($payload);
 
         $this->assertEquals('I am a sample body', $handler->getBodyFromPayload());
     }
@@ -196,7 +203,8 @@ public function it_handles_a_base64_encoded_body()
             'body' => 'SSBhbSBhIHNhbXBsZSBib2R5IHRoYXQgaXMgYmFzZTY0IGVuY29kZWQ=',
             'isBase64Encoded' => true,
         ];
-        $handler = new ApiGateway($payload);
+        $handler = new ApiGateway();
+        $handler->setPayload($payload);
 
         $this->assertEquals('I am a sample body that is base64 encoded', $handler->getBodyFromPayload());
     }
@@ -212,7 +220,8 @@ public function it_correctly_converts_request_uri_to_parsable_uri($path, $expect
             ->andReturn($config = \Mockery::mock('Illuminate\Config\Repository'));
         $config->shouldReceive('get')->once()->with('app.url')->andReturn('http://localhost');
 
-        $handler = new ApiGateway([
+        $handler = new ApiGateway();
+        $handler->setPayload([
             'path' => $path,
         ]);
 

test/Handlers/ApiGatewayHandlerTest.php

@@ -17,7 +17,8 @@ public function can_handle_a_valid_artisan_message()
     {
         $payload = json_decode($this->validJson, true);
 
-        $handler = new Artisan($payload);
+        $handler = new Artisan();
+        $handler->setPayload($payload);
         $this->assertTrue($handler->canHandle());
     }
 
@@ -30,7 +31,9 @@ public function it_handles_an_artisan_message_correctly()
 
         $payload = json_decode($this->validJson, true);
 
-        $handler = new Artisan($payload);
+        $handler = new Artisan();
+        $handler->setPayload($payload);
+
         $retval = $handler->handle($kernel);
 
         // Artisan commands should return an exit code of 0