Merge pull request #25 from humanmade/aws-sdk-3-0 (4c97cd35) · Commits · singing-chimes.co.uk / S3-Uploads

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

+958 −104

File changed.

Preview size limit exceeded, changes collapsed.

inc/class-s3-uploads.php

+26 −14

Original line number	Diff line number	Diff line
		@@ -17,13 +17,13 @@ class S3_Uploads {
		public static function get_instance() {

		if ( ! self::$instance ) {

		$key = defined( 'S3_UPLOADS_KEY' ) ? S3_UPLOADS_KEY : null;
		$secret = defined( 'S3_UPLOADS_SECRET' ) ? S3_UPLOADS_SECRET : null;
		$url = defined( 'S3_UPLOADS_BUCKET_URL' ) ? S3_UPLOADS_BUCKET_URL : null;
		$region = defined( 'S3_UPLOADS_REGION' ) ? S3_UPLOADS_REGION : null;

		self::$instance = new S3_Uploads( S3_UPLOADS_BUCKET, $key, $secret, $url, $region );
		self::$instance = new S3_Uploads(
		S3_UPLOADS_BUCKET,
		S3_UPLOADS_KEY,
		S3_UPLOADS_SECRET,
		defined( 'S3_UPLOADS_BUCKET_URL' ) ? S3_UPLOADS_BUCKET_URL : null,
		S3_UPLOADS_REGION
		);
		}

		return self::$instance;
		@@ -71,7 +71,7 @@ class S3_Uploads {
		if ( defined( 'S3_UPLOADS_USE_LOCAL' ) && S3_UPLOADS_USE_LOCAL ) {
		stream_wrapper_register( 's3', 'S3_Uploads_Local_Stream_Wrapper', STREAM_IS_URL );
		} else {
		S3_Uploads_Stream_Wrapper::register_streamwrapper( $this );
		S3_Uploads_Stream_Wrapper::register( $this->s3() );
		stream_context_set_option( stream_context_get_default(), 's3', 'ACL', 'public-read' );
		}

		@@ -127,6 +127,19 @@ class S3_Uploads {
		return apply_filters( 's3_uploads_bucket_url', 'https://' . $bucket . '.s3.amazonaws.com' . $path );
		}

		/**
		* Get the S3 bucket name
		*
		* @return string
		*/
		public function get_s3_bucket() {
		return $bucket = strtok( $this->bucket, '/' );
		}

		public function get_s3_bucket_region() {
		return $this->region;
		}

		public function get_original_upload_dir() {

		if ( empty( $this->original_upload_dir ) ) {
		@@ -145,11 +158,11 @@ class S3_Uploads {
		return $this->s3;
		}

		$params = array();
		$params = array( 'version' => 'latest' );

		if ( $this->key && $this->secret ) {
		$params['key'] = $this->key;
		$params['secret'] = $this->secret;
		$params['credentials']['key'] = $this->key;
		$params['credentials']['secret'] = $this->secret;
		}

		if ( $this->region ) {
		@@ -169,8 +182,7 @@ class S3_Uploads {
		}

		$params = apply_filters( 's3_uploads_s3_client_params', $params );

		$this->s3 = Aws\Common\Aws::factory( $params )->get( 's3' );
		$this->s3 = Aws\S3\S3Client::factory( $params );

		return $this->s3;
		}

lib/aws-sdk/Aws/Acm/AcmClient.php

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		<?php
		namespace Aws\Acm;

		use Aws\AwsClient;

		/**
		* This client is used to interact with the AWS Certificate Manager service.
		*
		* @method \Aws\Result addTagsToCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise addTagsToCertificateAsync(array $args = [])
		* @method \Aws\Result deleteCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise deleteCertificateAsync(array $args = [])
		* @method \Aws\Result describeCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise describeCertificateAsync(array $args = [])
		* @method \Aws\Result getCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise getCertificateAsync(array $args = [])
		* @method \Aws\Result listCertificates(array $args = [])
		* @method \GuzzleHttp\Promise\Promise listCertificatesAsync(array $args = [])
		* @method \Aws\Result listTagsForCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise listTagsForCertificateAsync(array $args = [])
		* @method \Aws\Result removeTagsFromCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise removeTagsFromCertificateAsync(array $args = [])
		* @method \Aws\Result requestCertificate(array $args = [])
		* @method \GuzzleHttp\Promise\Promise requestCertificateAsync(array $args = [])
		* @method \Aws\Result resendValidationEmail(array $args = [])
		* @method \GuzzleHttp\Promise\Promise resendValidationEmailAsync(array $args = [])
		*/
		class AcmClient extends AwsClient {}

lib/aws-sdk/Aws/Acm/Exception/AcmException.php

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		<?php
		namespace Aws\Acm\Exception;

		use Aws\Exception\AwsException;

		/**
		* Represents an error interacting with the AWS Certificate Manager service.
		*/
		class AcmException extends AwsException {}

lib/aws-sdk/Aws/Api/AbstractModel.php

0 → 100644

+67 −0

Original line number	Diff line number	Diff line
		<?php
		namespace Aws\Api;

		/**
		* Base class that is used by most API shapes
		*/
		abstract class AbstractModel implements \ArrayAccess
		{
		/** @var array */
		protected $definition;

		/** @var ShapeMap */
		protected $shapeMap;

		/**
		* @param array $definition Service description
		* @param ShapeMap $shapeMap Shapemap used for creating shapes
		*/
		public function __construct(array $definition, ShapeMap $shapeMap)
		{
		$this->definition = $definition;
		$this->shapeMap = $shapeMap;
		}

		public function toArray()
		{
		return $this->definition;
		}

		public function offsetGet($offset)
		{
		return isset($this->definition[$offset])
		? $this->definition[$offset] : null;
		}

		public function offsetSet($offset, $value)
		{
		$this->definition[$offset] = $value;
		}

		public function offsetExists($offset)
		{
		return isset($this->definition[$offset]);
		}

		public function offsetUnset($offset)
		{
		unset($this->definition[$offset]);
		}

		protected function shapeAt($key)
		{
		if (!isset($this->definition[$key])) {
		throw new \InvalidArgumentException('Expected shape definition at '
		. $key);
		}

		return $this->shapeFor($this->definition[$key]);
		}

		protected function shapeFor(array $definition)
		{
		return isset($definition['shape'])
		? $this->shapeMap->resolve($definition)
		: Shape::create($definition, $this->shapeMap);
		}
		}