Merge pull request #4 from intouchinsight/ip-8350-adding-laravel-12-support

IP 8350: Adding Laravel 12 Support

Author: lukewaite-intouch

.github/workflows/tests.yml

@@ -0,0 +1,56 @@
+name: Tests
+on:
+  push:
+    branches: [ "**" ]
+  pull_request:
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ["8.3", "8.4"]
+        laravel: ["11", "12"]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          tools: composer
+          extensions: json, mbstring, ctype, openssl, tokenizer, pdo, curl
+
+      - name: Validate composer.json
+        run: composer validate --no-check-publish
+
+      - name: Install deps for Laravel ${{ matrix.laravel }}
+        shell: bash
+        run: |
+          composer update --no-interaction --prefer-dist --ansi \
+            --with "illuminate/support:^${{ matrix.laravel }}" \
+            --with-all-dependencies
+
+      - name: Run tests
+        run: vendor/bin/phpunit --no-coverage
+
+  phplint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 10
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.3'
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Run laravel pint
+        run: ./vendor/bin/pint --test

.github/workflows/unit-tests.yml

@@ -15,18 +15,17 @@
     }
   },
   "require": {
-    "php": "^8.0",
+    "php": "^8.3|^8.4",
     "aws/aws-sdk-php": "^3.20",
-    "illuminate/support": "^10|^11"
+    "illuminate/support": "^11.0|^12.0"
   },
   "require-dev": {
     "laravel/pint": "^1.15",
     "mockery/mockery": "^1.4.4",
-    "laravel/framework": "^10|^11",
-    "phpunit/phpunit": "^10.0",
-    "squizlabs/php_codesniffer": "^2.8",
-    "scrutinizer/ocular": "^1.9",
-    "symfony/console": "^6.0"
+    "laravel/framework": "^11.0|^12.0",
+    "phpunit/phpunit": "^10.0|^11.0",
+    "squizlabs/php_codesniffer": "^3.7",
+    "symfony/console": "^6.0|^7.0"
   },
   "scripts": {
     "cs": "phpcs --standard=psr2 src/",

composer.json

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Laravel Cache Adapter for AWS Credential Caching.
  *

src/LaravelCacheAdapter.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Laravel Cache Adapter for AWS Credential Caching.
  *

src/ServiceProvider.php

@@ -4,6 +4,7 @@
 
 use LukeWaite\LaravelAwsCacheAdapter\LaravelCacheAdapter;
 use Mockery as m;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 class LaravelCacheAdapterTest extends TestCase
@@ -13,12 +14,12 @@ class LaravelCacheAdapterTest extends TestCase
 
     protected $repository;
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         m::close();
     }
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->manager = m::mock('Illuminate\Cache\CacheManager');
         $this->manager->shouldReceive('store')
@@ -27,51 +28,62 @@ public function setUp(): void
             ->andReturn($this->repository = m::mock('StdClass'));
     }
 
-    public function testGetWithPrefix()
+    #[Test]
+    public function test_get_with_prefix()
     {
         $this->repository->shouldReceive('get')->with('aws_credentials_testkey')->once()->andReturn('testValue');
 
         $adapter = new LaravelCacheAdapter($this->manager, 'file', 'test');
         $this->assertEquals('testValue', $adapter->get('key'));
     }
 
-    public function testRemoveWithoutPrefix()
+    #[Test]
+    public function test_remove_without_prefix()
     {
         $this->repository->shouldReceive('forget')->with('aws_credentials_key_to_remove')->once();
 
         $adapter = new LaravelCacheAdapter($this->manager, 'file', '');
         $adapter->remove('key_to_remove');
+        $this->assertTrue(true); // Add assertion to avoid risky test
     }
 
-    public function testSetLessThan60SecondsRoundsUp()
+    #[Test]
+    public function test_set_less_than60_seconds_rounds_up()
     {
         $this->repository->shouldReceive('put')->with('aws_credentials_key', 'value', 1)->once();
 
         $adapter = new LaravelCacheAdapter($this->manager, 'file', '');
         $adapter->set('key', 'value', 59);
+        $this->assertTrue(true); // Add assertion to avoid risky test
     }
 
-    public function testSetGreaterThan60SecondsRoundsDown()
+    #[Test]
+    public function test_set_greater_than60_seconds_rounds_down()
     {
         $this->repository->shouldReceive('put')->with('aws_credentials_key', 'value', 1)->once();
 
         $adapter = new LaravelCacheAdapter($this->manager, 'file', '');
         $adapter->set('key', 'value', 61);
+        $this->assertTrue(true); // Add assertion to avoid risky test
     }
 
-    public function testSetGreaterThan120SecondsRoundsDown()
+    #[Test]
+    public function test_set_greater_than120_seconds_rounds_down()
     {
         $this->repository->shouldReceive('put')->with('aws_credentials_key', 'value', 2)->once();
 
         $adapter = new LaravelCacheAdapter($this->manager, 'file', '');
         $adapter->set('key', 'value', 121);
+        $this->assertTrue(true); // Add assertion to avoid risky test
     }
 
-    public function testSet0Retains0()
+    #[Test]
+    public function test_set0_retains0()
     {
         $this->repository->shouldReceive('put')->with('aws_credentials_key', 'value', 0)->once();
 
         $adapter = new LaravelCacheAdapter($this->manager, 'file', '');
         $adapter->set('key', 'value', 0);
+        $this->assertTrue(true); // Add assertion to avoid risky test
     }
 }