Merge pull request #4 from palpalani/develop

Develop

Author: palpalani

.gitattributes

@@ -12,3 +12,6 @@
 /psalm.xml          export-ignore
 /psalm.xml.dist     export-ignore
 /testbench.yaml     export-ignore
+/UPGRADING.md       export-ignore
+/phpstan.neon.dist  export-ignore
+/phpstan-baseline.neon  export-ignore

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
   - package-ecosystem: composer
     directory: "/"
     schedule:
-      interval: monthly
+      interval: "weekly"
     labels:
       - dependencies
     versioning-strategy: increase-if-necessary

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,32 @@
+name: dependabot-auto-merge
+on: pull_request_target
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+    
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.3
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          
+      - name: Auto-merge Dependabot PRs for semver-minor updates
+        if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          
+      - name: Auto-merge Dependabot PRs for semver-patch updates
+        if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/php-cs-fixer.yml renamed to .github/workflows/fix-php-code-style-issues.yml

@@ -1,9 +1,9 @@
-name: Check & fix styling
+name: Fix PHP code style issues
 
 on: [push]
 
 jobs:
-  php-cs-fixer:
+  php-code-styling:
     runs-on: ubuntu-latest
 
     steps:
@@ -12,12 +12,13 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Run PHP CS Fixer
-        uses: docker://oskarstark/php-cs-fixer-ga
+      - name: Fix PHP code style issues
+        uses: aglipanci/laravel-pint-action@1.0.0
         with:
-          args: --config=.php-cs-fixer.dist.php --allow-risky=yes
+          preset: laravel
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: Fix styling
+          skip_fetch: true

.github/workflows/update-changelog.yml

@@ -0,0 +1,28 @@
+name: "Update Changelog"
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: main
+
+      - name: Update Changelog
+        uses: stefanzweifel/changelog-updater-action@v1
+        with:
+          latest-version: ${{ github.event.release.name }}
+          release-notes: ${{ github.event.release.body }}
+
+      - name: Commit updated CHANGELOG
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: main
+          commit_message: Update CHANGELOG
+          file_pattern: CHANGELOG.md

.php-cs-fixer.dist.php

@@ -6,14 +6,13 @@
 [![Total Downloads](https://img.shields.io/packagist/dt/palpalani/laravel-sqs-queue-json-reader.svg?style=flat-square)](https://packagist.org/packages/palpalani/laravel-sqs-queue-json-reader)
 
 
-Custom SQS queue reader for Laravel projects that supports raw JSON payloads. 
-Laravel expects SQS messages to be generated in a 
+Custom SQS queue reader for Laravel projects that supports raw JSON payloads and reads multiple messages. Laravel expects SQS messages to be generated in a 
 specific format that includes job handler class and a serialized job.
 
 Note: Implemented to read multiple messages from queue.
 
-But in certain cases you may want to parse messages from 3rd party 
-applications, custom JSON messages and so on.
+This library is very useful when you want to parse messages from 3rd party 
+applications such as stripe webhooks, shopify webhooks, mailgun web hooks, custom JSON messages and so on.
 
 ## Installation
 
@@ -44,7 +43,7 @@ return [
         ],
         'mailgun-webhooks' => [
             'class' => App\Jobs\MailgunHandler::class,
-            'count' => 100,
+            'count' => 10,
         ]
     ],
 
@@ -71,8 +70,8 @@ Add `sqs-json` connection to your config/queue.php, Ex:
             'driver' => 'sqs-json',
             'key'    => env('AWS_ACCESS_KEY_ID', ''),
             'secret' => env('AWS_SECRET_ACCESS_KEY', ''),
-            'prefix' => env('SQS_PREFIX', 'https://sqs.us-west-2.amazonaws.com/1234567890'),
-            'queue'  => env('SQS_QUEUE', 'stripe-webhooks'),
+            'prefix' => env('AWS_SQS_PREFIX', 'https://sqs.us-west-2.amazonaws.com/1234567890'),
+            'queue'  => env('AWS_SQS_QUEUE', 'external-webhooks'),
             'region' => env('AWS_DEFAULT_REGION', 'us-west-2'),
         ],
     ]
@@ -97,7 +96,7 @@ class ExampleController extends Controller
     {
         // Dispatch job with some data.
         $job = new DispatcherJob([
-            'music' => 'Sample SQS message',
+            'music' => 'Ponni nathi from PS-1',
             'singer' => 'AR. Rahman',
             'time' => time()
         ]);
@@ -120,6 +119,31 @@ Above code will push the following JSON object to SQS queue:
 'job' field is not used, actually. It's just kept for compatibility with Laravel
 Framework.
 
+### Processing job
+
+Run the following commnd for testing the dispatched job.
+
+`php artisan queue:work sqs-json`
+
+For production, use supervisor with the following configuration.
+
+```
+[program:sqs-json-reader]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/html/app/artisan queue:work sqs-json --sleep=30 --timeout=50 --tries=2 --memory=128 --daemon
+directory=/var/html/app
+autostart=true
+autorestart=true
+startretries=10
+user=root
+numprocs=1
+redirect_stderr=true
+stdout_logfile=/var/html/app/horizon.log
+stderr_logfile=/tmp/horizon-error.log
+stopwaitsecs=3600
+priority=1000
+```
+
 ### Receiving from SQS
 
 If a 3rd-party application or API Gateway to SQS implementation is creating 
@@ -151,8 +175,12 @@ class SqsHandlerJob extends Job
 }
 ```
 
+For more information about AWS SQS check [offical docs](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-queue-parameters.html).
+
 ## Testing
 
+We already configured the script, just run the command:
+
 ```bash
 composer test
 ```
@@ -165,6 +193,16 @@ Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed re
 
 Please see [CONTRIBUTING](.github/CONTRIBUTING.md) for details.
 
+## Other Laravel packages
+
+[GrumPHP rector task](https://github.com/palpalani/grumphp-rector-task) GrumPHP with a task that runs RectorPHP for your Laravel projects.
+[Email Deny List (blacklist) Check - IP Deny List (blacklist) Check](https://github.com/palpalani/laravel-dns-deny-list-check) Deny list (blacklist) checker will test a mail server IP address against over 50 DNS based email blacklists. (Commonly called Realtime blacklist, DNSBL or RBL).
+[Spamassassin spam score of emails](https://github.com/palpalani/laravel-spamassassin-score) Checks the spam score of email contents using spamassassin database.
+[Laravel Login Notifications](https://github.com/palpalani/laravel-login-notifications) A login event notification for Laravel projects. By default, it will send notification only on production environment only.
+[Laravel Toastr](https://github.com/palpalani/laravel-toastr) Implements toastr.js for Laravel. Toastr.js is a Javascript library for non-blocking notifications.
+[Beast](https://github.com/palpalani/beast) Beast is Screenshot as a Service using Nodejs, Chrome and Aws Lamda. Convert a webpage to an image using headless Chrome Takes screenshot of any given URL/Html content and returns base64 encoded buffer.
+[eCommerce Product Recommendations](https://github.com/palpalani/eCommerce-Product-Recommendations) Analyse order history of customers and recommend products for new customers which enables higher sales volume.
+
 ## Security Vulnerabilities
 
 Please review [our security policy](../../security/policy) on how to report security vulnerabilities.

README.md

@@ -5,8 +5,10 @@
         "palpalani",
         "sqs-reader",
         "sqs-json",
-        "plain-message",
-        "bulk-message",
+        "sqs-text-reader",
+        "sqs-plain-message",
+        "sqs-bulk-message",
+        "laravel-sqs",
         "laravel-sqs-queue-json-reader"
     ],
     "homepage": "https://github.com/palpalani/laravel-sqs-queue-json-reader",
@@ -15,7 +17,7 @@
         {
             "name": "palPalani",
             "email": "palani.p@gmail.com",
-            "homepage": "https://southdreamz.com",
+            "homepage": "https://github.com/palpalani",
             "role": "Developer"
         }
     ],
@@ -28,10 +30,13 @@
         "aws/aws-sdk-php": "^3.0"
     },
     "require-dev": {
+        "laravel/pint": "^1.1",
+        "nunomaduro/collision": "^6.2",
+        "nunomaduro/larastan": "^2.1",
         "orchestra/testbench": "^6.9|^7.0",
-        "phpunit/phpunit": "^9.3",
-        "psalm/plugin-laravel": "^2.0",
-        "vimeo/psalm": "^4.4"
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": {
@@ -44,12 +49,16 @@
         }
     },
     "scripts": {
-        "psalm": "vendor/bin/psalm",
+        "analyse": "vendor/bin/phpstan analyse",
         "test": "./vendor/bin/testbench package:test --parallel --no-coverage",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
+        "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
+        "format": "vendor/bin/pint"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "phpstan/extension-installer": true
+        }
     },
     "extra": {
         "laravel": {

composer.json

@@ -14,7 +14,7 @@
         'mailgun-webhooks' => [
             'class' => App\Jobs\MailgunHandler::class,
             'count' => 100,
-        ]
+        ],
     ],
 
     // If no handlers specified then default handler will be executed.
@@ -25,5 +25,5 @@
 
         // Number of messages need to read from SQS.
         'count' => 1,
-    ]
+    ],
 ];