Merge branch 'master' of github.com:tsekka/laravel-block-bots into tsekka-master

# Conflicts:
#	.github/workflows/test.yml

Author: gabrielpeixoto

.github/workflows/test.yml

@@ -1,23 +1,42 @@
 name: Tests
+
 on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   phpunit-tests:
     runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis:5.0.5-alpine
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    strategy:
+      matrix:
+        php: ['8.2', '8.3', '8.4']
+      fail-fast: false
     steps:
       - uses: actions/checkout@v3
-
-      # Install Docker Compose before using it
-      - name: Install Docker Compose
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y docker-compose-plugin
-          docker compose version
-
+      
+      - name: Update PHP version in Dockerfile
+        run: sed -i "s/FROM php:8.2-cli/FROM php:${{ matrix.php }}-cli/" Dockerfile
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
       - name: Build container
         run: docker compose build
-
+      
       - name: Install dependencies
         run: docker compose run --rm laravel_block_bots composer install
-
+      
       - name: Run tests
         run: docker compose run --rm laravel_block_bots composer run test

Dockerfile

@@ -14,4 +14,4 @@ VOLUME /var/www/html
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
-CMD ["composer", "install"]
+CMD composer install && tail -f /dev/null

composer.json

@@ -11,8 +11,8 @@
     "test": "XDEBUG_MODE=coverage phpunit --coverage-text"
   },
   "require": {
-    "php" : "^7.1 || ^8.0 || ^8.1 || ^8.2",
-    "laravel/framework": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0",
+    "php" : "^7.1 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
+    "laravel/framework": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
     "predis/predis": "^2.2",
     "guzzlehttp/guzzle": "^7.5.0",
     "ext-json": "*"