From 648d603f851426fd6e1d401f6ae685c7e5d6a825 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:59:32 +0000 Subject: [PATCH 01/15] Bump dependencies for Laravel 9 --- composer.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index d41594d..9189e45 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,15 @@ { "name": "renoki-co/aws-elastic-client", "description": "Just a simple Elasticsearch Client handler that signs the requests for AWS Elasticsearch service with the provided credentials.", - "keywords": ["laravel", "php", "elastic", "elasticsearch", "handler", "client", "aws"], + "keywords": [ + "laravel", + "php", + "elastic", + "elasticsearch", + "handler", + "client", + "aws" + ], "license": "Apache-2.0", "homepage": "https://github.com/renoki-co/aws-elastic-client", "authors": [ @@ -14,9 +22,9 @@ "require": { "php": "^7.4|^8.0", "aws/aws-sdk-php": "^3.200", - "guzzlehttp/guzzle": "^6.5|^7.3", + "guzzlehttp/guzzle": "^6.5|^7.3|^7.2", "guzzlehttp/ring": "^1.1.1", - "illuminate/support": "^7.40|^8.40" + "illuminate/support": "^7.40|^8.40|^9.0" }, "autoload": { "psr-4": { @@ -33,8 +41,8 @@ }, "require-dev": { "babenkoivan/elastic-client": "^1.2", - "mockery/mockery": "^1.5", - "orchestra/testbench": "^6.24.0" + "mockery/mockery": "^1.5|^1.4.4", + "orchestra/testbench": "^6.24.0|^7.0" }, "config": { "sort-packages": true From c56de14169a577b62a1dbe3cc4376c895437e8a3 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:59:33 +0000 Subject: [PATCH 02/15] Add phpunit/phpunit --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9189e45..374bcc3 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,8 @@ "require-dev": { "babenkoivan/elastic-client": "^1.2", "mockery/mockery": "^1.5|^1.4.4", - "orchestra/testbench": "^6.24.0|^7.0" + "orchestra/testbench": "^6.24.0|^7.0", + "phpunit/phpunit": "^9.0" }, "config": { "sort-packages": true From cdc72a2b1aad511f2d24763f5423e7be490eee0e Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:59:33 +0000 Subject: [PATCH 03/15] Add mockery/mockery --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 374bcc3..77a2de1 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ }, "require-dev": { "babenkoivan/elastic-client": "^1.2", - "mockery/mockery": "^1.5|^1.4.4", + "mockery/mockery": "^1.5", "orchestra/testbench": "^6.24.0|^7.0", "phpunit/phpunit": "^9.0" }, From 22025b236e7d0394c3697e9f77412f37cb8fd50a Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:59:33 +0000 Subject: [PATCH 04/15] Add orchestra/testbench --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 77a2de1..c116b31 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "require-dev": { "babenkoivan/elastic-client": "^1.2", "mockery/mockery": "^1.5", - "orchestra/testbench": "^6.24.0|^7.0", + "orchestra/testbench": "^7.0", "phpunit/phpunit": "^9.0" }, "config": { From 15075fe638af23bc77ccea9162bf5c6e96606d08 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:09:22 +0200 Subject: [PATCH 05/15] Update composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c116b31..446d8be 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,11 @@ } ], "require": { - "php": "^7.4|^8.0", + "php": "^8.0", "aws/aws-sdk-php": "^3.200", - "guzzlehttp/guzzle": "^6.5|^7.3|^7.2", + "guzzlehttp/guzzle": "^6.5|^7.3", "guzzlehttp/ring": "^1.1.1", - "illuminate/support": "^7.40|^8.40|^9.0" + "illuminate/support": "^9.0" }, "autoload": { "psr-4": { From f9ded040cfafe8e1e691b689670fc0a543645bd2 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:14:03 +0200 Subject: [PATCH 06/15] Update ci.yml --- .github/workflows/ci.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18c6ea7..5f795b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,34 +17,32 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: true matrix: php: - - '7.4' - '8.0' + - '8.1' es: - - '7.11.2' - - '7.12.1' - - '7.13.2' - - '7.14.1' + - '7.14.2' + - '7.15.2' + - '7.16.3' + - '7.17.0' laravel: - - 7.* - - 8.* + - 9.* prefer: # - 'prefer-lowest' - 'prefer-stable' include: - - laravel: '7.*' - testbench: '5.*' - laravel: '8.*' - testbench: '6.*' - - es: '7.11.2' - es-php: '7.11.*' - - es: '7.12.1' - es-php: '7.12.*' - - es: '7.13.2' - es-php: '7.13.*' - - es: '7.14.1' + testbench: '7.*' + - es: '7.14.2' es-php: '7.14.*' + - es: '7.15.2' + es-php: '7.15.*' + - es: '7.16.3' + es-php: '7.16.*' + - es: '7.17.0' + es-php: '7.17.*' name: PHP ${{ matrix.php }} - ES ${{ matrix.es }} Laravel ${{ matrix.laravel }} --${{ matrix.prefer }} From 042dcb41800d15f4ceaf6d387052add23de05051 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:16:06 +0200 Subject: [PATCH 07/15] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f795b1..4ac4f15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: # - 'prefer-lowest' - 'prefer-stable' include: - - laravel: '8.*' + - laravel: '9.*' testbench: '7.*' - es: '7.14.2' es-php: '7.14.*' From dea49f0996205e072db9026691e11a4d8bb8afba Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:20:25 +0200 Subject: [PATCH 08/15] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ac4f15..f01ad79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: - '8.1' es: - '7.14.2' - - '7.15.2' - - '7.16.3' + - '7.15.0' + - '7.16.0' - '7.17.0' laravel: - 9.* @@ -37,9 +37,9 @@ jobs: testbench: '7.*' - es: '7.14.2' es-php: '7.14.*' - - es: '7.15.2' + - es: '7.15.0' es-php: '7.15.*' - - es: '7.16.3' + - es: '7.16.0' es-php: '7.16.*' - es: '7.17.0' es-php: '7.17.*' From 8bf67a5fe1e61ff959dbe53416ac88766f682039 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:45:58 +0200 Subject: [PATCH 09/15] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f01ad79..dae3deb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: - fail-fast: true + fail-fast: false matrix: php: - '8.0' From e3c36fd37b5f97b2d707a9a2f207a74836765f1d Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 21:09:26 +0200 Subject: [PATCH 10/15] Update ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dae3deb..7f03320 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: - '7.16.0' - '7.17.0' laravel: + - 8.* - 9.* prefer: # - 'prefer-lowest' From 013cb90c15d38eb0c3ff8db4be00831820bc7777 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 21:10:30 +0200 Subject: [PATCH 11/15] Update composer.json --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 446d8be..9f24899 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,10 @@ } ], "require": { - "php": "^8.0", "aws/aws-sdk-php": "^3.200", "guzzlehttp/guzzle": "^6.5|^7.3", "guzzlehttp/ring": "^1.1.1", - "illuminate/support": "^9.0" + "illuminate/support": "^8.83|^9.0.1" }, "autoload": { "psr-4": { @@ -42,8 +41,9 @@ "require-dev": { "babenkoivan/elastic-client": "^1.2", "mockery/mockery": "^1.5", - "orchestra/testbench": "^7.0", - "phpunit/phpunit": "^9.0" + "orchestra/testbench": "^6.28|^7.0", + "orchestra/testbench-core": "^6.28|^7.0", + "phpunit/phpunit": "^9.5.13" }, "config": { "sort-packages": true From 25567f9bcbb8b96c8ef2e239136c1d07cea818d7 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 21:38:51 +0200 Subject: [PATCH 12/15] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f03320..1defa77 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,8 @@ jobs: # - 'prefer-lowest' - 'prefer-stable' include: + - laravel: '8.*' + testbench: '6.*' - laravel: '9.*' testbench: '7.*' - es: '7.14.2' From 93984339ecba0458ab1f66df5d8fc5bdf2189008 Mon Sep 17 00:00:00 2001 From: rennokki Date: Sat, 16 Jul 2022 21:33:58 +0300 Subject: [PATCH 13/15] Updated ES versions --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1defa77..9dd3caa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: - '8.1' es: - '7.14.2' - - '7.15.0' - - '7.16.0' + - '7.15.5' + - '7.16.3' - '7.17.0' laravel: - 8.* From 8277878d1b44af0a5790d4c5089766502214f170 Mon Sep 17 00:00:00 2001 From: rennokki Date: Sat, 16 Jul 2022 21:36:32 +0300 Subject: [PATCH 14/15] Fixed includes --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9dd3caa..e44d69d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,9 +24,9 @@ jobs: - '8.1' es: - '7.14.2' - - '7.15.5' + - '7.15.2' - '7.16.3' - - '7.17.0' + - '7.17.5' laravel: - 8.* - 9.* @@ -40,11 +40,11 @@ jobs: testbench: '7.*' - es: '7.14.2' es-php: '7.14.*' - - es: '7.15.0' + - es: '7.15.2' es-php: '7.15.*' - - es: '7.16.0' + - es: '7.16.3' es-php: '7.16.*' - - es: '7.17.0' + - es: '7.17.5' es-php: '7.17.*' name: PHP ${{ matrix.php }} - ES ${{ matrix.es }} Laravel ${{ matrix.laravel }} --${{ matrix.prefer }} From d02d985d007783552bac88a08028f963f2a2a30d Mon Sep 17 00:00:00 2001 From: rennokki Date: Sat, 16 Jul 2022 21:43:46 +0300 Subject: [PATCH 15/15] Disabled as 7.15.x is not on Dockerhub --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e44d69d..adcb987 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - '8.1' es: - '7.14.2' - - '7.15.2' + # - '7.15.2' - '7.16.3' - '7.17.5' laravel: @@ -40,8 +40,8 @@ jobs: testbench: '7.*' - es: '7.14.2' es-php: '7.14.*' - - es: '7.15.2' - es-php: '7.15.*' + # - es: '7.15.2' + # es-php: '7.15.*' - es: '7.16.3' es-php: '7.16.*' - es: '7.17.5'