Skip to content

Commit 3e4db6f

Browse files
aarondfrancisaarondfrancis
authored
Merge branch 'main' into feature/allow-tagging-feature
2 parents 8c42c3d + 0924e02 commit 3e4db6f

31 files changed

+52
-181
lines changed

‎.github/workflows/tests.yml

100644100755
Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,49 +14,57 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php: [ 7.2, 7.3, 7.4, 8.0, 8.1 ]
18-
laravel: [ 7.*, 8.*, 9.* ]
17+
php: [ 7.3, 7.4, 8.0, 8.1, 8.2 ]
18+
laravel: [ 8.*, 9.*, 10.* ]
1919
guzzle: [ 6.*, 7.* ]
2020
dependency-version: [ prefer-lowest, prefer-stable ]
2121
include:
22-
- laravel: 7.*
23-
testbench: 5.*
24-
25-
- laravel: 7.*
26-
dependency-version: prefer-lowest
27-
composer-version: --1
28-
2922
- laravel: 8.*
3023
testbench: 6.*
3124

3225
- laravel: 9.*
3326
testbench: 7.*
3427

35-
exclude:
36-
- laravel: 7.*
37-
php: 8.1
38-
39-
# Laravel 8 requires PHP 7.3.
40-
- laravel: 8.*
41-
php: 7.2
28+
- laravel: 10.*
29+
testbench: 8.*
4230

43-
# PHP 8.1 requires Laravel 8.65, so skip lowest
31+
exclude:
32+
# PHP 8.1 requires Laravel 8.65, so skip lowest
4433
- laravel: 8.*
4534
php: 8.1
4635
dependency-version: prefer-lowest
4736

48-
# Laravel 9 requires PHP 8.0
49-
- laravel: 9.*
50-
php: 7.2
5137
- laravel: 9.*
5238
php: 7.3
39+
5340
- laravel: 9.*
5441
php: 7.4
5542

5643
# Laravel 9 requires Guzzle ^7.2
5744
- laravel: 9.*
5845
guzzle: 6.*
5946

47+
# Only test PHP 8.2 with Laravel 9
48+
- laravel: 8.*
49+
php: 8.2
50+
51+
# PHP 8.2 requires Laravel 9.33 at least, so skip lowest
52+
- laravel: 9.*
53+
php: 8.2
54+
dependency-version: prefer-lowest
55+
56+
# Laravel 10 requires PHP 8.1
57+
- laravel: 10.*
58+
php: 7.3
59+
- laravel: 10.*
60+
php: 7.4
61+
- laravel: 10.*
62+
php: 8.0
63+
64+
# Laravel 10 requires Guzzle ^7.2
65+
- laravel: 10.*
66+
guzzle: 6.*
67+
6068
name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
6169

6270
steps:
@@ -83,4 +91,4 @@ jobs:
8391
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
8492
8593
- name: Execute tests
86-
run: vendor/bin/phpunit
94+
run: vendor/bin/phpunit

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.2|^8.0",
14-
"illuminate/support": "^7.0|^8.0|^9.0",
15-
"illuminate/filesystem": "^7.0|^8.0|^9.0",
16-
"illuminate/console": "^7.0|^8.0|^9.0",
13+
"php": "^7.3|^8.0",
14+
"illuminate/support": "^8.0|^9.0|^10",
15+
"illuminate/filesystem": "^8.0|^9.0|^10",
16+
"illuminate/console": "^8.0|^9.0|^10",
1717
"maennchen/zipstream-php": "^2.1",
1818
"guzzlehttp/guzzle": "^6.3|^7.2",
1919
"aws/aws-sdk-php": "^3.216.1"
2020
},
2121
"require-dev": {
22-
"orchestra/testbench": "^5|^6|^7",
22+
"orchestra/testbench": "^5|^6|^7|^8",
2323
"mockery/mockery": "^1.3.3",
2424
"phpunit/phpunit": ">=8.5.23|^9"
2525
},

‎docs/overview.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,20 @@
33

44
Sidecar packages, deploys, and executes AWS Lambda functions from your Laravel application. {.text-xl .font-bold}
55

6-
It works with _any_ Laravel 7 or Laravel 8 application, hosted _anywhere_, including your local machine. {.font-bold}
6+
It works with _any_ Laravel 7, 8, 9 or 10 application, hosted _anywhere_, including your local machine. {.font-bold}
77

88
You can write functions in any of the following runtimes and execute them straight from PHP:
99

1010
- Node.js 16
1111
- Node.js 14
1212
- Node.js 12
13-
- Node.js 10
1413
- Python 3.8
1514
- Python 3.7
16-
- Python 3.6
17-
- Python 2.7
1815
- Ruby 2.7
19-
- Ruby 2.5
2016
- Java 11
2117
- Java 8
2218
- Go 1.x
2319
- .NET Core 3.1
24-
- .NET Core 2.1
2520

2621
Any runtime that [Lambda supports](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html), you can use!
2722

@@ -128,4 +123,4 @@ If you need other services, you are encouraged to use the instances that Vapor h
128123
**Sidecar does not provide a way to execute a function via HTTP. You must execute it from your Laravel app through the provided methods.**
129124

130125

131-
Finally, Sidecar doesn't replace Vapor in any way. In fact, PHP is not even one of the default AWS supported runtimes!
126+
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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit bootstrap="vendor/autoload.php"
3-
backupGlobals="false"
4-
backupStaticAttributes="false"
5-
colors="true"
6-
verbose="true"
7-
convertErrorsToExceptions="true"
8-
convertNoticesToExceptions="true"
9-
convertWarningsToExceptions="true"
10-
processIsolation="false"
11-
stopOnFailure="false">
2+
<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">
123
<coverage>
134
<include>
145
<directory suffix=".php">src/</directory>
@@ -23,5 +14,6 @@
2314
</testsuite>
2415
</testsuites>
2516
<php>
26-
</php>
17+
18+
</php>
2719
</phpunit>

‎src/Clients/LambdaClient.php

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public function __construct(array $args)
3131
}
3232

3333
/**
34-
* @param LambdaFunction $function
3534
* @return string
3635
*/
3736
public function getLatestVersion(LambdaFunction $function)
@@ -42,8 +41,6 @@ public function getLatestVersion(LambdaFunction $function)
4241
/**
4342
* Test whether the latest deployed version is the one that is aliased.
4443
*
45-
* @param LambdaFunction $function
46-
* @param $alias
4744
* @return bool
4845
*/
4946
public function latestVersionHasAlias(LambdaFunction $function, $alias)
@@ -56,7 +53,6 @@ public function latestVersionHasAlias(LambdaFunction $function, $alias)
5653
}
5754

5855
/**
59-
* @param LambdaFunction $function
6056
* @param null|string $marker
6157
* @return \Aws\Result
6258
*/
@@ -78,7 +74,6 @@ public function getVersions(LambdaFunction $function, $marker = null)
7874
}
7975

8076
/**
81-
* @param LambdaFunction $function
8277
* @param string $alias
8378
* @param string|null $version
8479
* @return int
@@ -112,8 +107,6 @@ public function aliasVersion(LambdaFunction $function, $alias, $version = null)
112107
}
113108

114109
/**
115-
* @param LambdaFunction $function
116-
* @param $name
117110
* @return \Aws\Result|false
118111
*/
119112
public function getAliasWithoutException(LambdaFunction $function, $name)
@@ -133,7 +126,6 @@ public function getAliasWithoutException(LambdaFunction $function, $name)
133126
}
134127

135128
/**
136-
* @param LambdaFunction $function
137129
* @return int
138130
*
139131
* @throws Exception
@@ -269,7 +261,6 @@ protected function addPendingRetryMiddleware()
269261
/**
270262
* Delete a particular version of a function.
271263
*
272-
* @param LambdaFunction $function
273264
* @param string $version
274265
*/
275266
public function deleteFunctionVersion(LambdaFunction $function, $version)
@@ -281,7 +272,6 @@ public function deleteFunctionVersion(LambdaFunction $function, $version)
281272
}
282273

283274
/**
284-
* @param LambdaFunction $function
285275
* @param null $checksum
286276
* @return bool
287277
*/

‎src/Commands/Actions/BaseAction.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ abstract class BaseAction
1919
*/
2020
public $region;
2121

22-
/**
23-
* @param $region
24-
* @param Configure $command
25-
*/
2622
public function __construct($region, Configure $command)
2723
{
2824
$this->region = $region;
@@ -32,9 +28,6 @@ public function __construct($region, Configure $command)
3228

3329
abstract public function invoke();
3430

35-
/**
36-
* @param $message
37-
*/
3831
protected function progress($message)
3932
{
4033
$this->command->text("==> $message");

‎src/Concerns/HandlesLogging.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ trait HandlesLogging
2121
protected $sublog = false;
2222

2323
/**
24-
* @param $closure
2524
* @return $this
2625
*/
2726
public function addLogger($closure)
@@ -31,9 +30,6 @@ public function addLogger($closure)
3130
return $this;
3231
}
3332

34-
/**
35-
* @param Command $command
36-
*/
3733
public function addCommandLogger(Command $command)
3834
{
3935
$this->addLogger(function ($message, $level = 'info') use ($command) {
@@ -45,26 +41,16 @@ public function addCommandLogger(Command $command)
4541
});
4642
}
4743

48-
/**
49-
* @param $message
50-
*/
5144
public function log($message)
5245
{
5346
$this->write($message, 'info');
5447
}
5548

56-
/**
57-
* @param $message
58-
*/
5949
public function warning($message)
6050
{
6151
$this->write($message, 'warning');
6252
}
6353

64-
/**
65-
* @param $message
66-
* @param $level
67-
*/
6854
protected function write($message, $level)
6955
{
7056
foreach ($this->loggers as $logger) {
@@ -73,7 +59,6 @@ protected function write($message, $level)
7359
}
7460

7561
/**
76-
* @param $callback
7762
* @return mixed|Closure
7863
*/
7964
public function sublog($callback)

0 commit comments

Comments
 (0)