reapply humanmade/S3-Uploads#533

Author: gregdev

inc/class-local-stream-wrapper.php

@@ -512,7 +512,7 @@ public function url_stat( $uri, $flags ) {
 	 */
 	public function dir_opendir( $uri, $options ) {
 		$this->uri = $uri;
-		$this->handle = opendir( $this->getLocalPath() );
+		$this->handle = opendir( pathinfo($this->getLocalPath(), PATHINFO_DIRNAME) );
 
 		return (bool) $this->handle;
 	}

inc/class-plugin.php

@@ -5,6 +5,7 @@
 use Aws;
 use Exception;
 use WP_Error;
+use S3_Uploads\Local_Stream_Wrapper;
 
 /**
  * @psalm-consistent-constructor
@@ -144,9 +145,9 @@ public function tear_down() {
 	 */
 	public function register_stream_wrapper() {
 		if ( defined( 'S3_UPLOADS_USE_LOCAL' ) && S3_UPLOADS_USE_LOCAL ) {
-			stream_wrapper_register( 's3', 'S3_Uploads\Local_Stream_Wrapper', STREAM_IS_URL );
+			stream_wrapper_register( 's3', Local_Stream_Wrapper::class, STREAM_IS_URL );
 		} else {
-			Stream_Wrapper::register( $this );
+			Stream_Wrapper::register( $this, 's3', new Cache_Layer() );
 			$acl = defined( 'S3_UPLOADS_OBJECT_ACL' ) ? S3_UPLOADS_OBJECT_ACL : 'public-read';
 			stream_context_set_option( stream_context_get_default(), 's3', 'ACL', $acl );
 		}