wip

Author: romainmenke

.github/workflows/test.yml

@@ -52,10 +52,6 @@ jobs:
     - name: checkout
       uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-    - name: poke s3
-      run: |
-        curl --fail 127.0.0.1:9090 > /dev/null
-
     - name: setup wordpress tests
       env:
         WP_VERSION: ${{ matrix.wordpress }}
@@ -69,5 +65,6 @@ jobs:
         S3_UPLOADS_SECRET: valid-secret
         S3_UPLOADS_BUCKET_URL: "http://127.0.0.1:9090"
         S3_UPLOADS_REGION: ''
+        S3_UPLOADS_BASE_URL: "http://127.0.0.1:9090"
       run: |
         phpunit

.gitignore

@@ -2,3 +2,4 @@
 .idea/
 *.phar
 vendor
+wp-test-root

compose.yml

@@ -0,0 +1,21 @@
+services:
+
+  db:
+    image: mysql:8
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: 1
+      MYSQL_DATABASE: wp_tests_db
+      MYSQL_USER: wp_test
+      MYSQL_PASSWORD: password
+      MYSQL_HOST: 127.0.0.1
+    ports:
+      - 3306:3306
+
+  s3:
+    image: adobe/s3mock
+    environment:
+      COM_ADOBE_TESTING_S3MOCK_STORE_INITIAL_BUCKETS: "test-bucket"
+      COM_ADOBE_TESTING_S3MOCK_STORE_VALID_KMS_KEYS: "arn:aws:kms:us-east-1:1234567890:key/valid-secret"
+    ports:
+      - 9090:9090
+      - 9191:9191

inc/class-s3-uploads-stream-wrapper.php

@@ -50,7 +50,6 @@ public function stream_flush() {
 		$this->params = apply_filters( 's3_uploads_putObject_params', $this->params );
 
 		return parent::stream_flush();
-
 	}
 
 	/**
@@ -84,8 +83,9 @@ public function stream_open( $path, $mode, $options, &$opened_path ) {
 		 * As a work around, we attempt to write an empty object.
 		 */
 		try {
-			$p         = $this->params;
-			$p['Body'] = '';
+			$p              = $this->params;
+			$p['Body']      = '';
+
 			static::$client->putObject( $p );
 		} catch ( \Exception $e ) {
 			return $this->triggerError( $e->getMessage() );

inc/class-s3-uploads.php

@@ -196,6 +196,10 @@ public function s3() {
 
 		$params = array();
 
+		if ( defined( 'S3_UPLOADS_BASE_URL' ) ) {
+			$params['base_url'] = S3_UPLOADS_BASE_URL;
+		}
+
 		if ( $this->key && $this->secret ) {
 			$params['key']    = $this->key;
 			$params['secret'] = $this->secret;

tests/bootstrap.php

@@ -11,7 +11,7 @@
 // 2. Plugin installed inside of WordPress.org developer checkout
 // 3. Tests checked out to /tmp
 if ( false !== getenv( 'WP_DEVELOP_DIR' ) ) {
-	$test_root = getenv( 'WP_DEVELOP_DIR' ) . '/tests/phpunit';
+	$test_root = getenv( 'WP_DEVELOP_DIR' );
 } elseif ( file_exists( '../../../../tests/phpunit/includes/bootstrap.php' ) ) {
 	$test_root = '../../../../tests/phpunit';
 } elseif ( file_exists( '/tmp/wordpress-tests-lib/includes/bootstrap.php' ) ) {
@@ -45,4 +45,8 @@ function _manually_load_plugin() {
 	define( 'S3_UPLOADS_REGION', getenv( 'S3_UPLOADS_REGION' ) );
 }
 
+if ( getenv( 'S3_UPLOADS_BASE_URL' ) ) {
+	define( 'S3_UPLOADS_BASE_URL', getenv( 'S3_UPLOADS_BASE_URL' ) );
+}
+
 require $test_root . '/includes/bootstrap.php';