diff --git a/.gitmodules b/.gitmodules index b2b112a0..ce2abc73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,11 @@ [submodule "test-server/ruby-v3-server/local-ruby-sdk"] path = test-server/ruby-v3-server/local-ruby-sdk url = git@github.com:aws/aws-sdk-ruby-staging.git +[submodule "test-server/php-v2-server/local-php-sdk"] + path = test-server/php-v2-server/local-php-sdk + url = git@github.com:aws/private-aws-sdk-php-staging.git + branch = s3ec/transitional +[submodule "test-server/php-v3-server/local-php-sdk"] + path = test-server/php-v3-server/local-php-sdk + url = git@github.com:aws/private-aws-sdk-php-staging.git + branch = s3ec/improved diff --git a/test-server/php-v2-server/composer.json b/test-server/php-v2-server/composer.json index e9c399ac..d5177951 100644 --- a/test-server/php-v2-server/composer.json +++ b/test-server/php-v2-server/composer.json @@ -3,9 +3,18 @@ "description": "PHP v2 implementation of the S3EC Test Server framework", "type": "project", "license": "Apache-2.0", + "repositories": [ + { + "type": "path", + "url": "./local-php-sdk", + "options": { + "symlink": true + } + } + ], "require": { "php": ">=7.4", - "aws/aws-sdk-php": "^3.356", + "aws/aws-sdk-php": "@dev", "ramsey/uuid": "^4.9" }, "autoload": { @@ -19,6 +28,9 @@ ] }, "config": { - "optimize-autoloader": true + "optimize-autoloader": true, + "platform": { + "php": "8.1" + } } } \ No newline at end of file diff --git a/test-server/php-v2-server/local-php-sdk b/test-server/php-v2-server/local-php-sdk new file mode 160000 index 00000000..d78bd3b2 --- /dev/null +++ b/test-server/php-v2-server/local-php-sdk @@ -0,0 +1 @@ +Subproject commit d78bd3b221890aac679ec3b6cb5abcb01fd42699 diff --git a/test-server/php-v3-server/composer.json b/test-server/php-v3-server/composer.json index 7ed1daf3..32c2b00c 100644 --- a/test-server/php-v3-server/composer.json +++ b/test-server/php-v3-server/composer.json @@ -1,11 +1,20 @@ { - "name": "aws/s3ec-php-v2-test-server", - "description": "PHP v2 implementation of the S3EC Test Server framework", + "name": "aws/s3ec-php-v3-test-server", + "description": "PHP v3 implementation of the S3EC Test Server framework", "type": "project", "license": "Apache-2.0", + "repositories": [ + { + "type": "path", + "url": "./local-php-sdk", + "options": { + "symlink": true + } + } + ], "require": { "php": ">=7.4", - "aws/aws-sdk-php": "^3.356", + "aws/aws-sdk-php": "@dev", "ramsey/uuid": "^4.9" }, "autoload": { @@ -19,6 +28,9 @@ ] }, "config": { - "optimize-autoloader": true + "optimize-autoloader": true, + "platform": { + "php": "8.1" + } } } \ No newline at end of file diff --git a/test-server/php-v3-server/local-php-sdk b/test-server/php-v3-server/local-php-sdk new file mode 160000 index 00000000..d78bd3b2 --- /dev/null +++ b/test-server/php-v3-server/local-php-sdk @@ -0,0 +1 @@ +Subproject commit d78bd3b221890aac679ec3b6cb5abcb01fd42699