Skip to content

Commit cf35618

Browse files
committed
Merge branch 'release/v1.3.1'
2 parents 1ffbeea + f6b7d82 commit cf35618

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

.github/workflows/test.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ on:
99
jobs:
1010
test:
1111
runs-on: ${{ matrix.os }}
12+
13+
env:
14+
latest_php: 8.3
15+
latest_laravel: 11
16+
1217
strategy:
1318
fail-fast: false
1419
matrix:
@@ -78,8 +83,7 @@ jobs:
7883
composer update --prefer-dist --no-interaction --no-progress
7984
8085
- name: Migrate phpunit XML configuration
81-
continue-on-error: true
82-
run: vendor/bin/phpunit --migrate-configuration
86+
run: vendor/bin/phpunit --migrate-configuration || true
8387

8488
- name: Run test suite
8589
run: vendor/bin/phpunit --coverage-clover=coverage.xml
@@ -90,3 +94,4 @@ jobs:
9094
token: ${{ secrets.CODECOV_TOKEN }}
9195
files: ./coverage.xml
9296
fail_ci_if_error: false
97+
if: matrix.php == env.latest_php && matrix.laravel == env.latest_laravel

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
/build
21
/vendor
32
composer.lock

phpunit.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
4+
backupGlobals="false"
35
backupStaticAttributes="false"
46
beStrictAboutTestsThatDoNotTestAnything="false"
57
bootstrap="vendor/autoload.php"

src/AwsSessionTokenServiceProvider.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class AwsSessionTokenServiceProvider extends ServiceProvider
1414
*/
1515
public function register()
1616
{
17-
if (!Config::get('aws-session-token.enable', true)) {
17+
if (! Config::get('aws-session-token.enable', true)) {
1818
return; // @codeCoverageIgnore
1919
}
2020

@@ -34,7 +34,7 @@ public function register()
3434
public function boot()
3535
{
3636
$this->publishes(
37-
[__DIR__ . '/../config/aws-session-token.php' => config_path('aws-session-token.php')],
37+
[__DIR__.'/../config/aws-session-token.php' => config_path('aws-session-token.php')],
3838
'aws-session-token-config'
3939
);
4040
}

tests/AwsSessionTokenServiceProviderTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
class AwsSessionTokenServiceProviderTest extends TestCase
1010
{
1111
/**
12-
* @param Application $app
13-
*
14-
* @return array
12+
* @param Application $app
1513
*/
1614
protected function getPackageProviders($app): array
1715
{
@@ -21,21 +19,21 @@ protected function getPackageProviders($app): array
2119
}
2220

2321
/**
24-
* @param Application $app
22+
* @param Application $app
2523
*/
2624
protected function resolveApplicationConfiguration($app): void
2725
{
2826
parent::resolveApplicationConfiguration($app);
2927

3028
$app['config']->set('services.ses', [
31-
'key' => 'key',
29+
'key' => 'key',
3230
'secret' => 'secret',
3331
'region' => 'us-east-1',
3432
]);
3533

3634
$app['config']->set('aws-session-token', [
3735
'enable' => true,
38-
'keys' => ['services.ses'],
36+
'keys' => ['services.ses'],
3937
]);
4038

4139
$_SERVER['AWS_SESSION_TOKEN'] = 'dummy-session-token';

0 commit comments

Comments
 (0)