Merge branch 'main' into feature/allow-tagging-feature

Author: aarondfrancis

.github/workflows/tests.yml

@@ -14,49 +14,57 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
-        laravel: [ 7.*, 8.*, 9.* ]
+        php: [  7.3, 7.4, 8.0, 8.1, 8.2 ]
+        laravel: [ 8.*, 9.*, 10.* ]
         guzzle: [ 6.*, 7.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 7.*
-            testbench: 5.*
-
-          - laravel: 7.*
-            dependency-version: prefer-lowest
-            composer-version: --1
-
           - laravel: 8.*
             testbench: 6.*
 
           - laravel: 9.*
             testbench: 7.*
 
-        exclude:
-          - laravel: 7.*
-            php: 8.1
-            
-            # Laravel 8 requires PHP 7.3.
-          - laravel: 8.*
-            php: 7.2
+          - laravel: 10.*
+            testbench: 8.*
 
-          # PHP 8.1 requires Laravel 8.65, so skip lowest
+        exclude:
+            # PHP 8.1 requires Laravel 8.65, so skip lowest
           - laravel: 8.*
             php: 8.1
             dependency-version: prefer-lowest
 
-            # Laravel 9 requires PHP 8.0
-          - laravel: 9.*
-            php: 7.2
           - laravel: 9.*
             php: 7.3
+
           - laravel: 9.*
             php: 7.4
 
             # Laravel 9 requires Guzzle ^7.2
           - laravel: 9.*
             guzzle: 6.*
 
+            # Only test PHP 8.2 with Laravel 9
+          - laravel: 8.*
+            php: 8.2
+
+            # PHP 8.2 requires Laravel 9.33 at least, so skip lowest
+          - laravel: 9.*
+            php: 8.2
+            dependency-version: prefer-lowest
+
+            # Laravel 10 requires PHP 8.1
+          - laravel: 10.*
+            php: 7.3
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
+            php: 8.0
+
+            # Laravel 10 requires Guzzle ^7.2
+          - laravel: 10.*
+            guzzle: 6.*
+
     name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
 
     steps:
@@ -83,4 +91,4 @@ jobs:
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit

composer.json

@@ -10,16 +10,16 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "illuminate/support": "^7.0|^8.0|^9.0",
-        "illuminate/filesystem": "^7.0|^8.0|^9.0",
-        "illuminate/console": "^7.0|^8.0|^9.0",
+        "php": "^7.3|^8.0",
+        "illuminate/support": "^8.0|^9.0|^10",
+        "illuminate/filesystem": "^8.0|^9.0|^10",
+        "illuminate/console": "^8.0|^9.0|^10",
         "maennchen/zipstream-php": "^2.1",
         "guzzlehttp/guzzle": "^6.3|^7.2",
         "aws/aws-sdk-php": "^3.216.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^5|^6|^7",
+        "orchestra/testbench": "^5|^6|^7|^8",
         "mockery/mockery": "^1.3.3",
         "phpunit/phpunit": ">=8.5.23|^9"
     },

docs/overview.md

@@ -3,25 +3,20 @@
 
 Sidecar packages, deploys, and executes AWS Lambda functions from your Laravel application. {.text-xl .font-bold}
 
-It works with _any_ Laravel 7 or Laravel 8 application, hosted _anywhere_, including your local machine. {.font-bold}
+It works with _any_ Laravel 7, 8, 9 or 10 application, hosted _anywhere_, including your local machine. {.font-bold}
 
 You can write functions in any of the following runtimes and execute them straight from PHP:
 
 - Node.js 16
 - Node.js 14
 - Node.js 12
-- Node.js 10
 - Python 3.8
 - Python 3.7
-- Python 3.6
-- Python 2.7
 - Ruby 2.7
-- Ruby 2.5
 - Java 11
 - Java 8
 - Go 1.x
 - .NET Core 3.1
-- .NET Core 2.1
 
 Any runtime that [Lambda supports](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html), you can use!
 
@@ -128,4 +123,4 @@ If you need other services, you are encouraged to use the instances that Vapor h
 **Sidecar does not provide a way to execute a function via HTTP. You must execute it from your Laravel app through the provided methods.**
 
 
-Finally, Sidecar doesn't replace Vapor in any way. In fact, PHP is not even one of the default AWS supported runtimes!
+Finally, Sidecar doesn't replace Vapor in any way. In fact, PHP is not even one of the default AWS supported runtimes!

phpunit.xml.dist

@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
     <include>
       <directory suffix=".php">src/</directory>
@@ -23,5 +14,6 @@
     </testsuite>
   </testsuites>
   <php>
-  </php>
+
+    </php>
 </phpunit>

src/Clients/LambdaClient.php

@@ -31,7 +31,6 @@ public function __construct(array $args)
     }
 
     /**
-     * @param  LambdaFunction  $function
      * @return string
      */
     public function getLatestVersion(LambdaFunction $function)
@@ -42,8 +41,6 @@ public function getLatestVersion(LambdaFunction $function)
     /**
      * Test whether the latest deployed version is the one that is aliased.
      *
-     * @param  LambdaFunction  $function
-     * @param $alias
      * @return bool
      */
     public function latestVersionHasAlias(LambdaFunction $function, $alias)
@@ -56,7 +53,6 @@ public function latestVersionHasAlias(LambdaFunction $function, $alias)
     }
 
     /**
-     * @param  LambdaFunction  $function
      * @param  null|string  $marker
      * @return \Aws\Result
      */
@@ -78,7 +74,6 @@ public function getVersions(LambdaFunction $function, $marker = null)
     }
 
     /**
-     * @param  LambdaFunction  $function
      * @param  string  $alias
      * @param  string|null  $version
      * @return int
@@ -112,8 +107,6 @@ public function aliasVersion(LambdaFunction $function, $alias, $version = null)
     }
 
     /**
-     * @param  LambdaFunction  $function
-     * @param $name
      * @return \Aws\Result|false
      */
     public function getAliasWithoutException(LambdaFunction $function, $name)
@@ -133,7 +126,6 @@ public function getAliasWithoutException(LambdaFunction $function, $name)
     }
 
     /**
-     * @param  LambdaFunction  $function
      * @return int
      *
      * @throws Exception
@@ -269,7 +261,6 @@ protected function addPendingRetryMiddleware()
     /**
      * Delete a particular version of a function.
      *
-     * @param  LambdaFunction  $function
      * @param  string  $version
      */
     public function deleteFunctionVersion(LambdaFunction $function, $version)
@@ -281,7 +272,6 @@ public function deleteFunctionVersion(LambdaFunction $function, $version)
     }
 
     /**
-     * @param  LambdaFunction  $function
      * @param  null  $checksum
      * @return bool
      */

src/Commands/Actions/BaseAction.php

@@ -19,10 +19,6 @@ abstract class BaseAction
      */
     public $region;
 
-    /**
-     * @param $region
-     * @param  Configure  $command
-     */
     public function __construct($region, Configure $command)
     {
         $this->region = $region;
@@ -32,9 +28,6 @@ public function __construct($region, Configure $command)
 
     abstract public function invoke();
 
-    /**
-     * @param $message
-     */
     protected function progress($message)
     {
         $this->command->text("==> $message");

src/Concerns/HandlesLogging.php

@@ -21,7 +21,6 @@ trait HandlesLogging
     protected $sublog = false;
 
     /**
-     * @param $closure
      * @return $this
      */
     public function addLogger($closure)
@@ -31,9 +30,6 @@ public function addLogger($closure)
         return $this;
     }
 
-    /**
-     * @param  Command  $command
-     */
     public function addCommandLogger(Command $command)
     {
         $this->addLogger(function ($message, $level = 'info') use ($command) {
@@ -45,26 +41,16 @@ public function addCommandLogger(Command $command)
         });
     }
 
-    /**
-     * @param $message
-     */
     public function log($message)
     {
         $this->write($message, 'info');
     }
 
-    /**
-     * @param $message
-     */
     public function warning($message)
     {
         $this->write($message, 'warning');
     }
 
-    /**
-     * @param $message
-     * @param $level
-     */
     protected function write($message, $level)
     {
         foreach ($this->loggers as $logger) {
@@ -73,7 +59,6 @@ protected function write($message, $level)
     }
 
     /**
-     * @param $callback
      * @return mixed|Closure
      */
     public function sublog($callback)