Compatible for laravel 8/9?

.github/workflows/php.yml

@@ -0,0 +1,37 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer install --prefer-dist --no-progress --no-suggest
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    # - name: Run test suite
+    #   run: composer run-script test

.scrutinizer.yml

@@ -1,23 +1,81 @@
-filter:
-    excluded_paths: [tests/*]
-
 checks:
     php:
-        remove_extra_empty_lines: true
-        remove_php_closing_tag: true
-        remove_trailing_whitespace: true
-        fix_use_statements:
-            remove_unused: true
-            preserve_multiple: false
-            preserve_blanklines: true
-            order_alphabetically: true
-        fix_php_opening_tag: true
-        fix_linefeed: true
-        fix_line_ending: true
-        fix_identation_4spaces: true
-        fix_doc_comments: true
+        code_rating: true
+        duplication: true
+
+build_failure_conditions:
+    - 'project.metric_change("scrutinizer.quality", < -0.10)'
+    - 'elements.rating(<= D).exists'                                # No classes/methods with a rating of D or worse
+    - 'elements.rating(<= D).new.exists'                            # No new classes/methods with a rating of D or worse allowed
+    - 'issues.label("coding-style").exists'                         # No coding style issues allowed
+    - 'issues.label("coding-style").new.exists'                     # No new coding style issues allowed
+    - 'issues.severity(>= MAJOR).new.exists'                        # New issues of major or higher severity
+    - 'issues.severity(>= MAJOR).exists'                            # New major or higher severity issues
+    - 'project.metric("scrutinizer.quality", < 9)'                  # Code Quality Rating drops below 9
+    - 'project.metric_change("scrutinizer.test_coverage", < -0.1)'  # Code Coverage decreased from previous inspection by more than 10%
+    - 'patches.label("Doc Comments").exists'                        # No doc comments patches allowed
+    - 'patches.label("Spacing").exists'                             # No spacing patches allowed
+
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                - 
+                    command: php-scrutinizer-run
+                    command: composer run-script codestyle
+
+        coverage:
+            tests:
+                override:
+                - 
+                    command: ./vendor/bin/phpunit --coverage-clover=tests/reports/clover.xml
+                    idle_timeout: 1200
+                    coverage:
+                        file: 'tests/reports/clover.xml'
+                        format: 'php-clover'
+                    command: php vendor/bin/ocular code-coverage:upload --format=php-clover tests/reports/clover.xml
 
+    cache:
+        directories:
+            - vendor        # Cache for already installed composer package -> speed up composer install
+            - ~/.composer   # Composer home directory (avoid fetching already fetched packages)
+
+
 tools:
-    external_code_coverage:
-        timeout: 600
-        runs: 3
+    php_analyzer:
+        enabled: true
+        config:
+            checkstyle:
+                enabled: true
+                naming:
+                    isser_method_name: ^.*$
+                    utility_class_name: ^.*$
+            doc_comment_fixes:
+                enabled: false
+            reflection_fixes:
+                enabled: false
+            use_statement_fixes:
+                enabled: false
+            simplify_boolean_return:
+                enabled: true
+    external_code_coverage: false
+    php_code_coverage: true
+    php_changetracking: true
+    php_cpd: true
+    php_cs_fixer: false
+    php_mess_detector: true
+    php_pdepend: true
+    sensiolabs_security_checker: true
+
+filter:
+    paths:
+        - src/*
+
+coding_style:
+    php:
+        spaces:
+            before_parentheses:
+                closure_definition: true
+            around_operators:
+                concatenation: false

.travis.yml

@@ -1,9 +1,8 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.2
+  - 7.3
 
 cache:
   directories:

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Release Notes for 2.x
 
+## v3.0.4 (2021-03-05)
+
+* Fix `queue-work:batch` command connection as optional argument ([#2](https://github.com/dnxlabs/laravel-queue-aws-batch/pull/1))
+
+## v3.0.0 (2021-02-18)
+
+### Added
+* Support for Laravel 6.x ([#21](https://github.com/dnxlabs/laravel-queue-aws-batch/pull/1))
+
 ## v2.0.1 (2017-04-13)
 
 ### Fixed

README.md

@@ -8,17 +8,27 @@
 ### Supported Versions
 | Laravel Version | Package Tag | Supported |
 |-----------------|-------------|-----------|
-| 5.4.x | 2.0.x | yes |
-| 5.3.x | 1.0.x | yes |
-| 5.2.x | 1.0.x | yes |
-| 5.1.x | 1.0.x | yes |
+| 6.0.x | 3.0.x | yes |
 
 ### Installation
 See the table above for package version information, and change the version below accordingly.
 
+Add custom repository to your composer json:
+```
+    "require": {
+        "dnxlabs/laravel-queue-aws-batch": "~3.0.0"
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url":  "[email protected]:dnxlabs/laravel-queue-aws-batch.git"
+        }
+    ]
+```
+
 Using `composer`, run:
 
-    composer require lukewaite/laravel-queue-aws-batch ~2.0
+    composer require dnxlabs/laravel-queue-aws-batch ~3.0
 
 
 ### Usage
@@ -79,7 +89,7 @@ the _next_ run after tries has been exceeded by jobs failing. Newer versions wil
 this requirement can be relaxed later.
 
 6. Add the Service Provider to your application:
-    * In `config/app.php` add to the `providers` array: `LukeWaite\LaravelQueueAwsBatch\BatchQueueServiceProvider::class`
+    * In `config/app.php` add to the `providers` array: `DNXLabs\LaravelQueueAwsBatch\BatchQueueServiceProvider::class`
 
 
 ### Limitations
@@ -89,11 +99,11 @@ AWS Batch has no method to delay a job and as it's our runner, we don't have an
 jobs for your use case, at this point my recommendation would be to use a regular DB queue, and to fire a job into it
 which will fire your batch job at the correct time.
 
-[ico-version]: https://img.shields.io/packagist/v/lukewaite/laravel-queue-aws-batch.svg?style=flat-square
+[ico-version]: https://img.shields.io/packagist/v/dnxlabs/laravel-queue-aws-batch.svg?style=flat-square
 [ico-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
-[ico-travis]: https://img.shields.io/travis/lukewaite/laravel-queue-aws-batch/master.svg?style=flat-square
-[ico-coverage]: https://img.shields.io/scrutinizer/coverage/g/lukewaite/laravel-queue-aws-batch/master.svg?style=flat-square
+[ico-travis]: https://img.shields.io/travis/dnxlabs/laravel-queue-aws-batch/master.svg?style=flat-square
+[ico-coverage]: https://img.shields.io/scrutinizer/coverage/g/dnxlabs/laravel-queue-aws-batch/master.svg?style=flat-square
 
-[link-packagist]: https://packagist.org/packages/lukewaite/laravel-queue-aws-batch
-[link-travis]: https://travis-ci.org/lukewaite/laravel-queue-aws-batch
-[link-coverage]: https://scrutinizer-ci.com/g/lukewaite/laravel-queue-aws-batch/?branch=master
+[link-packagist]: https://packagist.org/packages/dnxlabs/laravel-queue-aws-batch
+[link-travis]: https://travis-ci.org/dnxlabs/laravel-queue-aws-batch
+[link-coverage]: https://scrutinizer-ci.com/g/dnxlabs/laravel-queue-aws-batch/?branch=master

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "lukewaite/laravel-queue-aws-batch",
+  "name": "dnxlabs/laravel-queue-aws-batch",
   "description": "Laravel Queue for AWS Batch, enabling users to submit jobs for processing to a Batch queue.",
   "keywords": [
     "laravel",
@@ -10,7 +10,7 @@
   "license": "MIT",
   "autoload": {
     "psr-4": {
-      "LukeWaite\\LaravelQueueAwsBatch\\": "src/"
+      "DNXLabs\\LaravelQueueAwsBatch\\": "src/"
     }
   },
   "autoload-dev": {
@@ -24,9 +24,9 @@
   },
   "require-dev": {
     "mockery/mockery": "^0.9.6",
-    "laravel/framework": ">5.4",
-    "phpunit/phpunit": "~4.8",
-    "squizlabs/php_codesniffer": "^2.8",
+    "laravel/framework": "^6.0",
+    "phpunit/phpunit": "~8.2",
+    "squizlabs/php_codesniffer": ">2.8",
     "scrutinizer/ocular": "^1.3"
   },
   "scripts": {

src/BatchQueueServiceProvider.php

@@ -6,14 +6,14 @@
  * @copyright 2017 Luke Waite
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  *
- * @link      https://github.com/lukewaite/laravel-queue-aws-batch
+ * @link      https://github.com/dnxlabs/laravel-queue-aws-batch
  */
 
-namespace LukeWaite\LaravelQueueAwsBatch;
+namespace DNXLabs\LaravelQueueAwsBatch;
 
 use Illuminate\Support\ServiceProvider;
-use LukeWaite\LaravelQueueAwsBatch\Connectors\BatchConnector;
-use LukeWaite\LaravelQueueAwsBatch\Console\QueueWorkBatchCommand;
+use DNXLabs\LaravelQueueAwsBatch\Connectors\BatchConnector;
+use DNXLabs\LaravelQueueAwsBatch\Console\QueueWorkBatchCommand;
 
 class BatchQueueServiceProvider extends ServiceProvider
 {

src/Connectors/BatchConnector.php

@@ -6,15 +6,15 @@
  * @copyright 2017 Luke Waite
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  *
- * @link      https://github.com/lukewaite/laravel-queue-aws-batch
+ * @link      https://github.com/dnxlabs/laravel-queue-aws-batch
  */
 
-namespace LukeWaite\LaravelQueueAwsBatch\Connectors;
+namespace DNXLabs\LaravelQueueAwsBatch\Connectors;
 
 use Aws\Batch\BatchClient;
 use Illuminate\Queue\Connectors\DatabaseConnector;
 use Illuminate\Support\Arr;
-use LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue;
+use DNXLabs\LaravelQueueAwsBatch\Queues\BatchQueue;
 
 class BatchConnector extends DatabaseConnector
 {

src/Console/QueueWorkBatchCommand.php

@@ -6,20 +6,21 @@
  * @copyright 2017 Luke Waite
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  *
- * @link      https://github.com/lukewaite/laravel-queue-aws-batch
+ * @link      https://github.com/dnxlabs/laravel-queue-aws-batch
  */
 
-namespace LukeWaite\LaravelQueueAwsBatch\Console;
+namespace DNXLabs\LaravelQueueAwsBatch\Console;
 
-use Illuminate\Console\Command;
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Cache\Repository;
 use Illuminate\Foundation\Exceptions\Handler;
 use Illuminate\Queue\Console\WorkCommand;
 use Illuminate\Queue\QueueManager;
 use Illuminate\Queue\Worker;
 use Illuminate\Queue\WorkerOptions;
-use LukeWaite\LaravelQueueAwsBatch\Exceptions\JobNotFoundException;
-use LukeWaite\LaravelQueueAwsBatch\Exceptions\UnsupportedException;
-use LukeWaite\LaravelQueueAwsBatch\Queues\BatchQueue;
+use DNXLabs\LaravelQueueAwsBatch\Exceptions\JobNotFoundException;
+use DNXLabs\LaravelQueueAwsBatch\Exceptions\UnsupportedException;
+use DNXLabs\LaravelQueueAwsBatch\Queues\BatchQueue;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
 
 class QueueWorkBatchCommand extends WorkCommand
@@ -33,20 +34,24 @@ class QueueWorkBatchCommand extends WorkCommand
                             {connection? : The name of the queue connection to work}
                             {--memory=128 : The memory limit in megabytes}
                             {--timeout=60 : The number of seconds a child process can run}
-                            {--tries=0 : Number of times to attempt a job before logging it failed}';
+                            {--tries=0 : Number of times to attempt a job before logging it failed}
+                            {--force : Force the worker to run even in maintenance mode}
+                            {--queue= : The names of the queues to work}
+                            {--once : Only process the next job on the queue}
+                            {--stop-when-empty : Stop when the queue is empty}';
 
 
     protected $manager;
     protected $exceptions;
 
     public function __construct(QueueManager $manager, Worker $worker, Handler $exceptions)
     {
-        parent::__construct($worker);
+        parent::__construct($worker, Container::getInstance()->make(Repository::class));
         $this->manager = $manager;
         $this->exceptions = $exceptions;
     }
 
-    public function fire()
+    public function handle()
     {
         $this->listenForEvents();
 
@@ -64,7 +69,7 @@ public function fire()
     // TOOD: Refactor out the logic here into an extension of the Worker class
     protected function runJob()
     {
-        $connectionName = $this->argument('connection');
+        $connectionName = $connection = $this->argument('connection') ?: $this->laravel['config']['queue.default'];
         $jobId = $this->argument('job_id');
 
         /** @var BatchQueue $connection */
@@ -98,9 +103,13 @@ protected function runJob()
     protected function gatherWorkerOptions()
     {
         return new WorkerOptions(
-            0, $this->option('memory'),
-            $this->option('timeout'), 0,
-            $this->option('tries'), false
+            0, // delay
+            $this->option('memory'),
+            $this->option('timeout'),
+            0, // sleep
+            $this->option('tries'),
+            false, // force
+            $this->option('stop-when-empty')
         );
     }
 }

src/Exceptions/JobNotFoundException.php

@@ -6,10 +6,10 @@
  * @copyright 2017 Luke Waite
  * @license   http://www.opensource.org/licenses/mit-license.php MIT
  *
- * @link      https://github.com/lukewaite/laravel-queue-aws-batch
+ * @link      https://github.com/dnxlabs/laravel-queue-aws-batch
  */
 
-namespace LukeWaite\LaravelQueueAwsBatch\Exceptions;
+namespace DNXLabs\LaravelQueueAwsBatch\Exceptions;
 
 class JobNotFoundException extends LaravelAwsBatchQueueException
 {