From a63ac28fa569fceab6c16cff71633415b1966fc5 Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Tue, 28 Feb 2023 10:53:25 -0800
Subject: [PATCH 1/3] try CMD to run multiple lines of code

---
 .github/workflows/ci.yml | 23 ++++++++++++-----------
 composer.json            |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b6f9dd..bf6cd1b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,11 +40,12 @@ jobs:
         make
 
     - name: Install dependencies
+      # get path to composer.phar so we can run it with custom php.ini
+      # Force to install phpunit@4.8.36 to support php@5.5
       run: |
-        php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-        php composer-setup.php
-        php -c php.ini composer.phar require --dev --ignore-platform-reqs phpunit/phpunit "4.8.36"
-        php -c php.ini composer.phar update --no-interaction
+        COMPOSER_PHAR=$(realpath $(which composer))
+        php -c php.ini $COMPOSER_PHAR require --dev --ignore-platform-reqs phpunit/phpunit "4.8.36"
+        php -c php.ini $COMPOSER_PHAR update --no-interaction
 
   php-linux-x64:
     runs-on: ubuntu-latest
@@ -111,19 +112,19 @@ jobs:
       uses: cmb69/setup-php-sdk@v0.6
       with:
         version: '8.0'
-        arch: x64
+        arch: ${{ matrix.arch }}
         ts: ts
         deps: openssl
     - uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: ${{ matrix.arch }}
         toolset: ${{steps.setup-php-sdk.outputs.toolset}}
-    # CMD only execute one commend per run
-    - run: phpize
-    - run: .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl
-    - run: nmake
-    - run: nmake generate-php-ini
-    - run: .\dev-scripts\run_tests.bat ${{steps.setup-php-sdk.outputs.prefix}}\php
+    - run: |
+       phpize
+       .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl
+       nmake
+       nmake generate-php-ini
+       .\dev-scripts\run_tests.bat ${{steps.setup-php-sdk.outputs.prefix}}\php
 
   # windows-vc14:
   #   runs-on: windows-latest
diff --git a/composer.json b/composer.json
index 6f1e6ee..95127dd 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "php": ">=5.5"
     },
     "require-dev": {
-        "phpunit/phpunit":"^5.6.3"
+        "phpunit/phpunit":"^4.8.35|^5.6.3"
     },
     "autoload": {
         "classmap": [

From a9ab031603342067fa3c0a264c1bc96663915d5d Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Tue, 28 Feb 2023 11:07:07 -0800
Subject: [PATCH 2/3] try to not force the special version of phpunit

---
 .github/workflows/ci.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf6cd1b..c897b9f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,10 +41,8 @@ jobs:
 
     - name: Install dependencies
       # get path to composer.phar so we can run it with custom php.ini
-      # Force to install phpunit@4.8.36 to support php@5.5
       run: |
         COMPOSER_PHAR=$(realpath $(which composer))
-        php -c php.ini $COMPOSER_PHAR require --dev --ignore-platform-reqs phpunit/phpunit "4.8.36"
         php -c php.ini $COMPOSER_PHAR update --no-interaction
 
   php-linux-x64:
@@ -119,12 +117,12 @@ jobs:
       with:
         arch: ${{ matrix.arch }}
         toolset: ${{steps.setup-php-sdk.outputs.toolset}}
-    - run: |
-       phpize
-       .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl
-       nmake
-       nmake generate-php-ini
-       .\dev-scripts\run_tests.bat ${{steps.setup-php-sdk.outputs.prefix}}\php
+    # CMD only execute one commend per run
+    - run: phpize
+    - run: .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl
+    - run: nmake
+    - run: nmake generate-php-ini
+    - run: .\dev-scripts\run_tests.bat ${{steps.setup-php-sdk.outputs.prefix}}\php
 
   # windows-vc14:
   #   runs-on: windows-latest

From 6bc427dd4cd977c6faf6f0a4ef405157fc458a6a Mon Sep 17 00:00:00 2001
From: Dengke Tang <dengket@amazon.com>
Date: Tue, 28 Feb 2023 11:25:02 -0800
Subject: [PATCH 3/3] update comments

---
 .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 c897b9f..4586e22 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -117,7 +117,7 @@ jobs:
       with:
         arch: ${{ matrix.arch }}
         toolset: ${{steps.setup-php-sdk.outputs.toolset}}
-    # CMD only execute one commend per run
+    # not sure why CMD can't do multiline run statements
     - run: phpize
     - run: .\configure --with-prefix=${{steps.setup-php-sdk.outputs.prefix}} --enable-awscrt=shared --enable-cli --enable-openssl
     - run: nmake