Skip to content

Commit

Permalink
Update to latest ILAB Amazon SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
jawngee committed Jun 29, 2019
1 parent e03493e commit 40b7f63
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 49 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"require": {
"php": ">=5.5.0",
"league/flysystem": "^1.0.40",
"ilab/ilab-aws-media-cloud-sdk": "^0.2.2"
"ilab/ilab-aws-media-cloud-sdk": "^0.3.0"
},
"require-dev": {
"phpspec/phpspec": "^2.0.0",
Expand Down
84 changes: 42 additions & 42 deletions spec/AwsS3AdapterSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace spec\ILAB_League\Flysystem\AwsS3v3;

use ILAB_Aws\Command;
use ILAB_Aws\Result;
use ILAB_Aws\S3\Exception\DeleteMultipleObjectsException;
use ILAB_Aws\S3\Exception\S3Exception;
use ILAB_Aws\S3\Exception\S3MultipartUploadException;
use ILABAmazon\Command;
use ILABAmazon\Result;
use ILABAmazon\S3\Exception\DeleteMultipleObjectsException;
use ILABAmazon\S3\Exception\S3Exception;
use ILABAmazon\S3\Exception\S3MultipartUploadException;
use GuzzleHttp\Psr7;
use League\Flysystem\AdapterInterface;
use League\Flysystem\AwsS3v3\AwsS3Adapter;
Expand All @@ -18,14 +18,14 @@
class AwsS3AdapterSpec extends ObjectBehavior
{
/**
* @var \ILAB_Aws\S3\S3Client
* @var \ILABAmazon\S3\S3Client
*/
private $client;
private $bucket;
const PATH_PREFIX = 'path-prefix';

/**
* @param \ILAB_Aws\S3\S3Client $client
* @param \ILABAmazon\S3\S3Client $client
*/
public function let($client)
{
Expand Down Expand Up @@ -81,9 +81,9 @@ public function it_should_update_files_streamed()
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILAB_Aws\CommandInterface $headCommand
* @param \ILAB_Aws\CommandInterface $listCommand
* @param \ILABAmazon\CommandInterface $command
* @param \ILABAmazon\CommandInterface $headCommand
* @param \ILABAmazon\CommandInterface $listCommand
*/
public function it_should_delete_files($command, $headCommand, $listCommand)
{
Expand All @@ -100,15 +100,15 @@ public function it_should_delete_files($command, $headCommand, $listCommand)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_read_a_file($command)
{
$this->make_it_read_a_file($command, 'read', 'contents');
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_read_a_file_stream($command)
{
Expand All @@ -118,7 +118,7 @@ public function it_should_read_a_file_stream($command)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_return_when_trying_to_read_an_non_existing_file($command)
{
Expand All @@ -134,39 +134,39 @@ public function it_should_return_when_trying_to_read_an_non_existing_file($comma
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_retrieve_all_file_metadata($command)
{
$this->make_it_retrieve_file_metadata('getMetadata', $command);
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_retrieve_the_timestamp_of_a_file($command)
{
$this->make_it_retrieve_file_metadata('getTimestamp', $command);
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_retrieve_the_mimetype_of_a_file($command)
{
$this->make_it_retrieve_file_metadata('getMimetype', $command);
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_retrieve_the_size_of_a_file($command)
{
$this->make_it_retrieve_file_metadata('getSize', $command);
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_return_true_when_object_exists($command)
{
Expand All @@ -178,7 +178,7 @@ public function it_should_return_true_when_object_exists($command)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_return_true_when_prefix_exists($command)
{
Expand All @@ -201,8 +201,8 @@ public function it_should_return_true_when_prefix_exists($command)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILAB_Aws\S3\Exception\S3Exception $exception
* @param \ILABAmazon\CommandInterface $command
* @param \ILABAmazon\S3\Exception\S3Exception $exception
*/
public function it_should_return_false_when_listing_objects_returns_a_403($command, $exception)
{
Expand All @@ -225,8 +225,8 @@ public function it_should_return_false_when_listing_objects_returns_a_403($comma
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILAB_Aws\S3\Exception\S3Exception $exception
* @param \ILABAmazon\CommandInterface $command
* @param \ILABAmazon\S3\Exception\S3Exception $exception
*/
public function it_should_pass_through_when_listing_objects_throws_an_exception($command, $exception)
{
Expand All @@ -249,8 +249,8 @@ public function it_should_pass_through_when_listing_objects_throws_an_exception(
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILAB_Aws\CommandInterface $aclCommand
* @param \ILABAmazon\CommandInterface $command
* @param \ILABAmazon\CommandInterface $aclCommand
*/
public function it_should_copy_files($command, $aclCommand)
{
Expand All @@ -262,8 +262,8 @@ public function it_should_copy_files($command, $aclCommand)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILAB_Aws\CommandInterface $aclCommand
* @param \ILABAmazon\CommandInterface $command
* @param \ILABAmazon\CommandInterface $aclCommand
*/
public function it_should_return_false_when_copy_fails($command, $aclCommand)
{
Expand Down Expand Up @@ -291,8 +291,8 @@ public function it_should_create_directories()
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILAB_Aws\CommandInterface $aclCommand
* @param \ILABAmazon\CommandInterface $command
* @param \ILABAmazon\CommandInterface $aclCommand
*/
public function it_should_return_false_during_rename_when_copy_fails($command, $aclCommand)
{
Expand All @@ -304,11 +304,11 @@ public function it_should_return_false_during_rename_when_copy_fails($command, $
}

/**
* @param \ILAB_Aws\CommandInterface $copyCommand
* @param \ILAB_Aws\CommandInterface $deleteCommand
* @param \ILAB_Aws\CommandInterface $aclCommand
* @param \ILAB_Aws\CommandInterface $headCommand
* @param \ILAB_Aws\CommandInterface $listCommand
* @param \ILABAmazon\CommandInterface $copyCommand
* @param \ILABAmazon\CommandInterface $deleteCommand
* @param \ILABAmazon\CommandInterface $aclCommand
* @param \ILABAmazon\CommandInterface $headCommand
* @param \ILABAmazon\CommandInterface $listCommand
*/
public function it_should_copy_and_delete_during_renames($copyCommand, $deleteCommand, $aclCommand, $headCommand, $listCommand)
{
Expand Down Expand Up @@ -385,7 +385,7 @@ public function it_should_return_false_when_deleting_a_directory_fails()
}

/**
* @param \ILAB_Aws\CommandInterface $aclCommand
* @param \ILABAmazon\CommandInterface $aclCommand
*/
public function it_should_get_the_visibility_of_a_public_file($aclCommand)
{
Expand All @@ -396,7 +396,7 @@ public function it_should_get_the_visibility_of_a_public_file($aclCommand)
}

/**
* @param \ILAB_Aws\CommandInterface $aclCommand
* @param \ILABAmazon\CommandInterface $aclCommand
*/
public function it_should_get_the_visibility_of_a_private_file($aclCommand)
{
Expand All @@ -407,7 +407,7 @@ public function it_should_get_the_visibility_of_a_private_file($aclCommand)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_set_the_visibility_of_a_file_to_public($command)
{
Expand All @@ -424,7 +424,7 @@ public function it_should_set_the_visibility_of_a_file_to_public($command)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_set_the_visibility_of_a_file_to_private($command)
{
Expand All @@ -441,7 +441,7 @@ public function it_should_set_the_visibility_of_a_file_to_private($command)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_return_false_when_failing_to_set_visibility($command)
{
Expand All @@ -458,7 +458,7 @@ public function it_should_return_false_when_failing_to_set_visibility($command)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_return_false_when_failing_to_upload()
{
Expand All @@ -477,7 +477,7 @@ public function it_should_return_false_when_failing_to_upload()
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_return_path_in_response_without_prefix($command)
{
Expand Down Expand Up @@ -578,7 +578,7 @@ private function make_it_read_a_file($command, $method, $contents)
}

/**
* @param \ILAB_Aws\CommandInterface $command
* @param \ILABAmazon\CommandInterface $command
*/
public function it_should_read_a_file_streaming($command)
{
Expand Down
10 changes: 5 additions & 5 deletions src/AwsS3Adapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace ILAB_League\Flysystem\AwsS3v3;

use ILAB_Aws\Result;
use ILAB_Aws\S3\Exception\DeleteMultipleObjectsException;
use ILAB_Aws\S3\Exception\S3Exception;
use ILAB_Aws\S3\Exception\S3MultipartUploadException;
use ILAB_Aws\S3\S3Client;
use ILABAmazon\Result;
use ILABAmazon\S3\Exception\DeleteMultipleObjectsException;
use ILABAmazon\S3\Exception\S3Exception;
use ILABAmazon\S3\Exception\S3MultipartUploadException;
use ILABAmazon\S3\S3Client;
use League\Flysystem\Adapter\AbstractAdapter;
use League\Flysystem\Adapter\CanOverwriteFiles;
use League\Flysystem\AdapterInterface;
Expand Down
2 changes: 1 addition & 1 deletion stub/ResultPaginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace ILAB_League\Flysystem\AwsS3v3\Stub;

use GuzzleHttp\Promise;
use ILAB_Aws\Result;
use ILABAmazon\Result;
use GuzzleHttp\Promise\PromiseInterface;

class ResultPaginator implements \Iterator
Expand Down

0 comments on commit 40b7f63

Please sign in to comment.