Skip to content

Commit 219ff1f

Browse files
zackijackzackijack
committed
Refactor
1 parent ce474b8 commit 219ff1f

File tree

9 files changed

+71
-77
lines changed

9 files changed

+71
-77
lines changed

‎composer.json‎

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,54 @@
11
{
2-
"name": "joblocal/laravel-sqs-sns-subscription-queue",
3-
"description": "A simple Laravel service provider which adds a new queue connector to handle SNS subscription queues.",
4-
"license": "MIT",
5-
"keywords": ["laravel", "lumen", "queue", "sns subscription", "aws", "sqs", "sns"],
6-
"authors": [
7-
{
8-
"name": "Johannes Hofmann",
9-
"email": "johannes.hofmann@joblocal.de",
10-
"role": "Developer"
11-
},
12-
{
13-
"name": "Julius Liebert",
14-
"email": "julius.liebert@joblocal.de",
15-
"role": "Developer"
16-
}
17-
],
18-
"require": {
19-
"php": ">=5.6.4",
20-
"illuminate/queue": "^5.5",
21-
"illuminate/support": "^5.5",
22-
"aws/aws-sdk-php": "^3.36"
23-
},
24-
"require-dev": {
25-
"phpunit/phpunit": "^6.2",
26-
"fiunchinho/phpunit-randomizer": "^3.0",
27-
"squizlabs/php_codesniffer": "^3.0",
28-
"orchestra/testbench": "^3.4"
29-
},
30-
"autoload": {
31-
"psr-4": {
32-
"Joblocal\\LaravelSqsSnsSubscriptionQueue\\": "src/"
33-
}
34-
},
35-
"autoload-dev": {
36-
"psr-4": {
37-
"Joblocal\\LaravelSqsSnsSubscriptionQueue\\Tests\\": "tests/"
38-
}
39-
},
40-
"scripts": {
41-
"lint": [
42-
"./vendor/bin/phpcs --standard=phpcs.xml --colors -p ."
2+
"name": "zackyjack/laravel-sqs-sns",
3+
"description": "A simple Laravel service provider which adds a new queue connector to handle SNS subscription queues.",
4+
"license": "MIT",
5+
"keywords": ["laravel", "lumen", "queue", "sns subscription", "aws", "sqs", "sns"],
6+
"authors": [
7+
{
8+
"name": "Johannes Hofmann",
9+
"email": "johannes.hofmann@joblocal.de",
10+
"role": "Developer"
11+
},
12+
{
13+
"name": "Julius Liebert",
14+
"email": "julius.liebert@joblocal.de",
15+
"role": "Developer"
16+
},
17+
{
18+
"name": "Zackky Muhammad",
19+
"email": "m.zackky@gmail.com",
20+
"role": "Developer"
21+
}
4322
],
44-
"test": [
45-
"./vendor/bin/phpunit-randomizer -c phpunit.xml --order rand"
46-
]
47-
},
48-
"minimum-stability": "stable"
23+
"require": {
24+
"php": ">=5.6.4",
25+
"illuminate/queue": "^5.5",
26+
"illuminate/support": "^5.5",
27+
"aws/aws-sdk-php": "^3.36"
28+
},
29+
"require-dev": {
30+
"phpunit/phpunit": "^6.2",
31+
"fiunchinho/phpunit-randomizer": "^3.0",
32+
"squizlabs/php_codesniffer": "^3.0",
33+
"orchestra/testbench": "^3.4"
34+
},
35+
"autoload": {
36+
"psr-4": {
37+
"Zackyjack\\LaravelSqsSns\\": "src/"
38+
}
39+
},
40+
"autoload-dev": {
41+
"psr-4": {
42+
"Zackyjack\\LaravelSqsSns\\Tests\\": "tests/"
43+
}
44+
},
45+
"scripts": {
46+
"lint": [
47+
"./vendor/bin/phpcs --standard=phpcs.xml --colors -p ."
48+
],
49+
"test": [
50+
"./vendor/bin/phpunit-randomizer -c phpunit.xml --order rand"
51+
]
52+
},
53+
"minimum-stability": "dev"
4954
}

‎src/Queue/Connectors/SqsSnsConnector.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Connectors;
3+
namespace Zackyjack\LaravelSqsSns\Queue\Connectors;
44

55
use Aws\Sqs\SqsClient;
66
use Illuminate\Queue\Connectors\SqsConnector;
77
use Illuminate\Support\Arr;
8-
9-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\SqsSnsQueue;
8+
use Zackyjack\LaravelSqsSns\Queue\SqsSnsQueue;
109

1110
class SqsSnsConnector extends SqsConnector
1211
{

‎src/Queue/Jobs/SqsSnsJob.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Jobs;
3+
namespace Zackyjack\LaravelSqsSns\Queue\Jobs;
44

55
use Aws\Sqs\SqsClient;
66
use Illuminate\Queue\Jobs\SqsJob;
@@ -59,7 +59,7 @@ private function resolveSnsSubscription(array $job, array $routes)
5959
'command' => serialize(new $commandName(
6060
$body['Subject'],
6161
json_decode($body['Message'], true)
62-
))
62+
)),
6363
],
6464
]);
6565
}

‎src/Queue/SqsSnsQueue.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue\Queue;
3+
namespace Zackyjack\LaravelSqsSns\Queue;
44

55
use Aws\Sqs\SqsClient;
66
use Illuminate\Queue\SqsQueue;
7-
8-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Jobs\SqsSnsJob;
7+
use Zackyjack\LaravelSqsSns\Queue\Jobs\SqsSnsJob;
98

109
class SqsSnsQueue extends SqsQueue
1110
{

‎src/SqsSnsServiceProvider.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue;
3+
namespace Zackyjack\LaravelSqsSns;
44

55
use Illuminate\Support\ServiceProvider;
6-
7-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Connectors\SqsSnsConnector;
6+
use Zackyjack\LaravelSqsSns\Queue\Connectors\SqsSnsConnector;
87

98
class SqsSnsServiceProvider extends ServiceProvider
109
{

‎tests/SqsSnsConnectorTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue\Tests;
3+
namespace Zackyjack\LaravelSqsSns\Tests;
44

55
use PHPUnit\Framework\TestCase;
6-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Connectors\SqsSnsConnector;
7-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\SqsSnsQueue;
6+
use Zackyjack\LaravelSqsSns\Queue\Connectors\SqsSnsConnector;
7+
use Zackyjack\LaravelSqsSns\Queue\SqsSnsQueue;
88

99
class SqsSnsConnectorTest extends TestCase
1010
{

‎tests/SqsSnsJobTest.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue\Tests;
3+
namespace Zackyjack\LaravelSqsSns\Tests;
44

55
use PHPUnit\Framework\TestCase;
66
use Aws\Sqs\SqsClient;
77
use Illuminate\Container\Container;
8-
9-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Jobs\SqsSnsJob;
8+
use Zackyjack\LaravelSqsSns\Queue\Jobs\SqsSnsJob;
109

1110
class SqsSnsJobTest extends TestCase
1211
{
@@ -57,7 +56,6 @@ private function getSqsSnsJobTopicRoute()
5756
]);
5857
}
5958

60-
6159
public function testWillResolveSqsSubscriptionJob()
6260
{
6361
$jobPayload = $this->getSqsSnsJobSubjectRoute()->payload();
@@ -80,7 +78,6 @@ public function testWillResolveSqsSubscriptionCommand()
8078
$this->assertEquals($expectedCommand, $jobPayload['data']['command']);
8179
}
8280

83-
8481
public function testWillResolveSqsSubscriptionJobTopicRoute()
8582
{
8683
$jobPayload = $this->getSqsSnsJobTopicRoute()->payload();
@@ -103,7 +100,6 @@ public function testWillResolveSqsSubscriptionCommandTopicRoute()
103100
$this->assertEquals($expectedCommand, $jobPayload['data']['command']);
104101
}
105102

106-
107103
public function testWillLeaveDefaultSqsJobUntouched()
108104
{
109105
$body = [

‎tests/SqsSnsQueueTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use PHPUnit\Framework\TestCase;
66
use Aws\Sqs\SqsClient;
77
use Illuminate\Container\Container;
8-
98
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\SqsSnsQueue;
109
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Jobs\SqsSnsJob;
1110

@@ -31,15 +30,15 @@ public function testCanInstantiateQueue()
3130
public function testWillSetRoutes()
3231
{
3332
$queue = new SqsSnsQueue($this->sqsClient, 'default_queue', '', [
34-
"Subject#action" => '\\Job',
33+
'Subject#action' => '\\Job',
3534
]);
3635

3736
$queueReflection = new \ReflectionClass($queue);
3837
$routeReflectionProperty = $queueReflection->getProperty('routes');
3938
$routeReflectionProperty->setAccessible(true);
4039

4140
$this->assertEquals([
42-
"Subject#action" => '\\Job',
41+
'Subject#action' => '\\Job',
4342
], $routeReflectionProperty->getValue($queue));
4443
}
4544

‎tests/SqsSnsServiceProviderTest.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?php
22

3-
namespace Joblocal\LaravelSqsSnsSubscriptionQueue\Tests;
3+
namespace Zackyjack\LaravelSqsSns\Tests;
44

55
use Orchestra\Testbench\TestCase;
6-
use Illuminate\Queue\QueueManager;
7-
8-
use Joblocal\LaravelSqsSnsSubscriptionQueue\SqsSnsServiceProvider;
9-
use Joblocal\LaravelSqsSnsSubscriptionQueue\Queue\Connectors\SqsSnsConnector;
6+
use Zackyjack\LaravelSqsSns\Queue\Connectors\SqsSnsConnector;
107

118
class SqsSnsServiceProviderTest extends TestCase
129
{
@@ -21,9 +18,9 @@ protected function getEnvironmentSetUp($app)
2118
{
2219
$app['config']->set('queue.connections.sqs-sns', [
2320
'driver' => 'sqs-sns',
24-
'key' => env('AWS_ACCESS_KEY', 'your-public-key'),
21+
'key' => env('AWS_ACCESS_KEY', 'your-public-key'),
2522
'secret' => env('AWS_SECRET_ACCESS_KEY', 'your-secret-key'),
26-
'queue' => env('QUEUE_URL', 'your-queue-url'),
23+
'queue' => env('QUEUE_URL', 'your-queue-url'),
2724
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
2825
'routes' => [],
2926
]);
@@ -40,7 +37,7 @@ public function testWillRegisterSqsSnsQueueConnector()
4037
$this->app['queue'],
4138
'sqs-sns'
4239
);
43-
40+
4441
$this->assertInstanceOf(SqsSnsConnector::class, $connector);
4542
}
4643
}

0 commit comments

Comments
 (0)