Merge remote-tracking branch 'upstream/main' into settledresult-throw-bc-fix

Author: inxilpro

.github/workflows/tests.yml

@@ -4,20 +4,23 @@ on:
   push:
     branches:
       - main
-
   pull_request:
-    types: [ opened, synchronize, reopened ]
+    types:
+      - opened
+      - synchronize
+      - reopened
 
 jobs:
   test:
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.1', '8.2', '8.3' ]
-        laravel: [ '8.*', '9.*', '10.*', '11.*' ]
-        guzzle: [ '6.*', '7.*' ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
+        php: ['8.1', '8.2', '8.3']
+        laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
+        guzzle: ['6.*', '7.*']
+        dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 8.*
             testbench: 6.*
@@ -27,8 +30,10 @@ jobs:
             testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
-
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
+          # Laravel 8 exclusions
           - laravel: 8.*
             php: 8.1
             dependency-version: prefer-lowest
@@ -39,23 +44,31 @@ jobs:
             php: 8.3
             dependency-version: prefer-lowest
 
+          # Laravel 9 exclusions
           - laravel: 9.*
             php: 8.2
             dependency-version: prefer-lowest
           - laravel: 9.*
             php: 8.3
             dependency-version: prefer-lowest
 
+          # Laravel 11 exclusions
           - laravel: 11.*
             php: 8.1
 
-          # Guzzle restrictions
+          # Laravel 12 exclusions
+          - laravel: 12.*
+            php: 8.1
+
+          # Guzzle exclusions
           - laravel: 9.*
             guzzle: 6.*
           - laravel: 10.*
             guzzle: 6.*
           - laravel: 11.*
             guzzle: 6.*
+          - laravel: 12.*
+            guzzle: 6.*
 
     name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
 

README.md

@@ -22,18 +22,15 @@ You can write functions in any of the following runtimes and execute them straig
 
 - Node.js 20
 - Node.js 18
-- Node.js 16
 - Python 3.12
 - Python 3.11
 - Python 3.10
 - Python 3.9
-- Python 3.8
 - Java 21
 - Java 17
 - Java 11
 - Java 8
 - .NET 8
-- .NET 7
 - .NET 6
 - Ruby 3.3
 - Ruby 3.2
@@ -42,7 +39,7 @@ You can write functions in any of the following runtimes and execute them straig
 
 Any runtime that [Lambda supports](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html), you can use!
 
-Sidecar is maintained by [Aaron Francis](https://twitter.com/aarondfrancis), go follow me on Twitter! 
+Sidecar is maintained by [Aaron Francis](https://twitter.com/aarondfrancis), go follow me on Twitter!
 
 ### What It Looks Like
 

composer.json

@@ -11,15 +11,15 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/filesystem": "^8|^9|^10|^11",
-        "illuminate/console": "^8|^9|^10|^11",
-        "illuminate/support": "^8|^9|^10|^11",
+        "illuminate/filesystem": "^8|^9|^10|^11|^12.0",
+        "illuminate/console": "^8|^9|^10|^11|^12.0",
+        "illuminate/support": "^8|^9|^10|^11|^12.0",
         "maennchen/zipstream-php": "^3.1",
         "guzzlehttp/guzzle": "^6.5.8|^7.2",
         "aws/aws-sdk-php": "^3.216.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^5|^6|^7|^8|^9",
+        "orchestra/testbench": "^5|^6|^7|^8|^9|^10.0",
         "mockery/mockery": "^1.3.3",
         "phpunit/phpunit": ">=8.5.23|^9|^10"
     },

docs/functions/customization.md

@@ -9,18 +9,15 @@ Lambda supports multiple languages through the use of runtimes. You can choose a
 
 - Node.js 20: `nodejs20.x`
 - Node.js 18: `nodejs18.x`
-- Node.js 16: `nodejs16.x`
 - Python 3.12: `python3.12`
 - Python 3.11: `python3.11`
 - Python 3.10: `python3.10`
 - Python 3.9: `python3.9`
-- Python 3.8: `python3.8`
 - Java 21: `java21`
 - Java 17: `java17`
 - Java 11: `java11`
 - Java 8: `java8.al2`
 - .NET 8: `dotnet8`
-- .NET 7: `dotnet7`
 - .NET 6: `dotnet6`
 - Ruby 3.3: `ruby3.3`
 - Ruby 3.2: `ruby3.2`
@@ -231,6 +228,26 @@ You likely won't need to change this, but if you do, *you must include the envir
     }
 ```
 
+### Description
+
+By default, Sidecar will generate a description for your Lambda function based on the deployment environment and the name of your app. 
+
+You likely won't need to customise it, however, you can if you want, although it has no direct impact.
+
+```php
+    class ExampleFunction extends LambdaFunction
+    {
+        public function description()
+        {
+            return sprintf('%s [%s]: Sidecar function `%s`.', ...[
+                config('sidecar.app_name'),
+                Sidecar::getEnvironment(),
+                static::class,
+            ]);
+        }
+    }
+```
+
 ## Tags
 
 A key-value array of strings of tags to be applied to your function, this can be used to organize your functions by owner, project or departement.

phpunit.xml.dist

@@ -10,7 +10,7 @@
     </testsuite>
   </testsuites>
   <php>
-
+    <server name="APP_ENV" value="testing"/>
   </php>
   <source>
     <include>

src/LambdaFunction.php

@@ -161,7 +161,7 @@ public function description()
     {
         return sprintf('%s [%s]: Sidecar function `%s`.', ...[
             config('sidecar.app_name'),
-            config('app.env'),
+            Sidecar::getEnvironment(),
             static::class,
         ]);
     }

src/Runtime.php

@@ -8,6 +8,7 @@ abstract class Runtime
 
     public const NODEJS_18 = 'nodejs18.x';
 
+    /** @deprecated */
     public const NODEJS_16 = 'nodejs16.x';
 
     /** @deprecated */
@@ -21,6 +22,7 @@ abstract class Runtime
 
     public const PYTHON_39 = 'python3.9';
 
+    /** @deprecated */
     public const PYTHON_38 = 'python3.8';
 
     /** @deprecated */
@@ -39,6 +41,7 @@ abstract class Runtime
 
     public const DOT_NET_8 = 'dotnet8';
 
+    /** @deprecated */
     public const DOT_NET_7 = 'dotnet7';
 
     public const DOT_NET_6 = 'dotnet6';

tests/Unit/Commands/ActivateTest.php

@@ -67,8 +67,7 @@ public function assertEvents($deployed = true, $activated = true)
         }
     }
 
-    /** @test */
-    public function it_should_activate_functions()
+    public function test_it_should_activate_functions()
     {
         $this->mockActivating();
 
@@ -88,8 +87,7 @@ protected function mockInvokeAsync($with = [], $return = null)
         return $this->mockMethod('invokeAsync', $with, $return);
     }
 
-    /** @test */
-    public function it_should_pre_warm_functions_if_the_latest_version_is_different()
+    public function test_it_should_pre_warm_functions_if_the_latest_version_is_different()
     {
         // The latest version is not the active version.
         $this->lambda->shouldReceive('latestVersionHasAlias')
@@ -128,8 +126,7 @@ public function it_should_pre_warm_functions_if_the_latest_version_is_different(
         $this->artisan('sidecar:activate --pre-warm');
     }
 
-    /** @test */
-    public function it_should_not_pre_warm_functions_if_the_latest_version_is_the_same()
+    public function test_it_should_not_pre_warm_functions_if_the_latest_version_is_the_same()
     {
         $this->lambda->shouldReceive('latestVersionHasAlias')
             ->andReturn(true);
@@ -152,8 +149,7 @@ public function it_should_not_pre_warm_functions_if_the_latest_version_is_the_sa
         $this->artisan('sidecar:activate --pre-warm');
     }
 
-    /** @test */
-    public function it_should_activate_functions_with_env()
+    public function test_it_should_activate_functions_with_env()
     {
         $this->mockActivating();
 

tests/Unit/Commands/ConfigureTest.php

@@ -157,8 +157,7 @@ protected function createRolePayload()
         ];
     }
 
-    /** @test */
-    public function basic_happy_path()
+    public function test_basic_happy_path()
     {
         $this->mockS3(function ($mock) {
             $this->mockHeadBucketNotFound($mock);

tests/Unit/Commands/DeployTest.php

@@ -11,8 +11,7 @@
 
 class DeployTest extends DeploymentTest
 {
-    /** @test */
-    public function it_deploys_the_functions_in_the_config()
+    public function test_it_deploys_the_functions_in_the_config()
     {
         $this->lambda->shouldReceive('functionExists')->andReturn(false);
         $this->lambda->shouldReceive('getVersions')->andReturn([]);
@@ -27,8 +26,7 @@ public function it_deploys_the_functions_in_the_config()
         $this->assertEvents($deployed = true, $activated = false);
     }
 
-    /** @test */
-    public function it_deploys_and_activates_the_functions_in_the_config()
+    public function test_it_deploys_and_activates_the_functions_in_the_config()
     {
         $this->lambda->shouldReceive('functionExists')->andReturn(false);
         $this->lambda->shouldReceive('getVersions')->andReturn([]);
@@ -46,8 +44,7 @@ public function it_deploys_and_activates_the_functions_in_the_config()
         $this->assertEvents($deployed = true, $activated = true);
     }
 
-    /** @test */
-    public function it_uses_a_fake_environment()
+    public function test_it_uses_a_fake_environment()
     {
         $this->lambda->shouldReceive('functionExists')->andReturn(false);
         $this->lambda->shouldReceive('getVersions')->andReturn([]);