Merge pull request #14 from ensi-platform/laravel-11

laravel-11

Author: MsNatali

.github/CONTRIBUTING.md

@@ -0,0 +1,55 @@
+# Contributing
+
+Contributions are **welcome** and will be fully **credited**.
+
+Please read and understand the contribution guide before creating an issue or pull request.
+
+## Etiquette
+
+This project is open source, and as such, the maintainers give their free time to build and maintain the source code
+held within. They make the code freely available in the hope that it will be of use to other developers. It would be
+extremely unfair for them to suffer abuse or anger for their hard work.
+
+Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the
+world that developers are civilized and selfless people.
+
+It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
+quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
+
+## Viability
+
+When requesting or submitting new features, first consider whether it might be useful to others. Open
+source projects are used by many developers, who may have entirely different needs to your own. Think about
+whether or not your feature is likely to be used by other users of the project.
+
+## Procedure
+
+Before filing an issue:
+
+- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident.
+- Check to make sure your feature suggestion isn't already present within the project.
+- Check the pull requests tab to ensure that the bug doesn't have a fix in progress.
+- Check the pull requests tab to ensure that the feature isn't already in progress.
+
+Before submitting a pull request:
+
+- Check the codebase to ensure that your feature doesn't already exist.
+- Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
+
+## Requirements
+
+If the project maintainer has any additional requirements, you will find them listed here.
+
+- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
+
+- **Use hooks!** - You can make use of .git hooks if you install them using `npm i`
+
+- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
+
+- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option.
+
+- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
+
+- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
+
+**Happy coding**!

.github/SECURITY.md

@@ -0,0 +1,3 @@
+# Security Policy
+
+If you discover any security related issues, please email mail@greensight.ru instead of using the issue tracker.

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,23 @@
+name: Check & fix styling
+
+on: [push]
+
+jobs:
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Run PHP CS Fixer
+        uses: docker://oskarstark/php-cs-fixer-ga
+        with:
+          args: --config=.php-cs-fixer.php --allow-risky=yes
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Fix styling

.github/workflows/run-tests.yml

@@ -0,0 +1,53 @@
+name: run-tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.0, 8.1, 8.2, 8.3]
+        laravel: [10.*, 11.*]
+        include:
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }}
+
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, rdkafka
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-stable --prefer-dist --no-interaction
+      - name: Execute tests
+        run: composer test

composer.json

@@ -18,21 +18,21 @@
     "require": {
         "php": "^8.0",
         "ext-rdkafka": "*",
-        "ensi/laravel-phprdkafka": "^0.3",
-        "illuminate/contracts": "^8.37 || ^9.0 || ^10.0",
-        "illuminate/pipeline": "^8.37 || ^9.0 || ^10.0",
-        "illuminate/support": "^8.37 || ^9.0 || ^10.0"
+        "ensi/laravel-phprdkafka": "^0.3.4",
+        "illuminate/contracts": "^10.0 || ^11.0",
+        "illuminate/pipeline": "^10.0 || ^11.0",
+        "illuminate/support": "^10.0 || ^11.0"
     },
     "require-dev": {
         "brianium/paratest": "^6.2 || ^7.0",
         "friendsofphp/php-cs-fixer": "^3.2",
         "kwn/php-rdkafka-stubs": "^2.2",
-        "nunomaduro/collision": "^5.3 || ^6.0 || ^7.0",
-        "orchestra/testbench": "^6.15 || ^7.0 || ^8.0",
+        "nunomaduro/collision": "^6.0 || ^7.0 || ^8.1",
+        "orchestra/testbench": "^8.0 || ^9.0",
         "pestphp/pest": "^1.18 || ^2.0",
         "pestphp/pest-plugin-laravel": "^1.1 || ^2.0",
         "php-parallel-lint/php-var-dump-check": "^0.5.0",
-        "phpunit/phpunit": "^9.3 || ^10.0",
+        "phpunit/phpunit": "^10.0 || ^11.0",
         "spatie/laravel-ray": "^1.9"
     },
     "autoload": {

src/Commands/KafkaCheckOffsetsCommand.php

@@ -32,6 +32,7 @@ protected function checkTopic(string $consumerName, string $topicName): bool
         $partitions = $consumer->getPartitions($topicName);
         if (!$partitions) {
             $this->getOutput()->writeln("    <fg=red>Topic {$topicName} doesn't exists!</>");
+
             return false;
         }
         $success = true;

src/Commands/KafkaConsumeCommand.php

@@ -40,12 +40,14 @@ public function getSubscribedSignals(): array
         return $this->getStopSignalsFromConfig();
     }
 
-    public function handleSignal(int $signal): void
+    public function handleSignal(int $signal, int|false $previousExitCode = 0): int|false
     {
-        if ($this->consumer && in_array($signal, $this->getStopSignalsFromConfig())) {
+        if ($this->consumer) {
             $this->line("Stopping the consumer...");
             $this->consumer->forceStop();
         }
+
+        return $previousExitCode;
     }
 
     /**

src/Commands/KafkaSetOffset.php

@@ -27,6 +27,7 @@ public function handle()
 
         if (!in_array($offset, [self::EARLIEST, self::LATEST]) && !is_numeric($offset)) {
             $this->getOutput()->writeln("<fg=red>Error: Invalid offset</>");
+
             return self::INVALID;
         }
 

src/HighLevelConsumer.php

@@ -186,7 +186,7 @@ public function setOffset(string $topicName, int $partitionId, int $offset): voi
                 $topicName,
                 $partitionId,
                 $offset
-            )
+            ),
         ]);
     }
 }