applied changes from 3.0.8

Author: gregdev

inc/class-stream-wrapper.php

@@ -486,7 +486,7 @@ function () use ( $parts, $path ) {
 	private function statDirectory( $parts, $path, $flags ) {
 		// Stat "directories": buckets, or "s3://"
 		if ( ! $parts['Bucket'] ||
-			$this->getClient()->doesBucketExist( $parts['Bucket'] )
+			$this->getClient()->doesBucketExistV2( $parts['Bucket'], false )
 		) {
 			return $this->formatUrlStat( $path );
 		}
@@ -723,9 +723,13 @@ public function dir_readdir() {
 		$this->objectIterator->next();
 
 		// Remove the prefix from the result to emulate other stream wrappers.
-		return $this->openedBucketPrefix
+		$retVal = $this->openedBucketPrefix
 			? substr( $result, strlen( $this->openedBucketPrefix ) )
 			: $result;
+		if ( $retVal === '' ) {
+			$retVal = false;
+		}
+		return $retVal;
 	}
 
 	private function formatKey( string $key ) : string {
@@ -816,9 +820,10 @@ private function validate( $path, $mode ) {
 		/** @var string */
 		$key = $this->getOption( 'Key' );
 		if ( $mode == 'x' &&
-			$this->getClient()->doesObjectExist(
+			$this->getClient()->doesObjectExistV2(
 				$bucket,
 				$key,
+				false,
 				$this->getOptions( true )
 			)
 		) {
@@ -1031,7 +1036,7 @@ private function formatUrlStat( $result = null ) {
 	 * @return bool Returns true on success or false on failure
 	 */
 	private function createBucket( $path, array $params ) {
-		if ( $this->getClient()->doesBucketExist( $params['Bucket'] ) ) {
+		if ( $this->getClient()->doesBucketExistV2( $params['Bucket'], false ) ) {
 			return $this->triggerError( "Bucket already exists: {$path}" );
 		}
 
@@ -1058,7 +1063,7 @@ private function createSubfolder( string $path, array $params ) {
 		$params['Body'] = '';
 
 		// Fail if this pseudo directory key already exists
-		if ( $this->getClient()->doesObjectExist(
+		if ( $this->getClient()->doesObjectExistV2(
 			$params['Bucket'],
 			$params['Key']
 		)