From 043658f9967352dd9a4647c4ab1f5de4ffb1684c Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Sat, 15 Oct 2016 02:20:46 +0200 Subject: [PATCH] Added meta files (#195) * Added meta files * Style fixes from StyleCI --- .editorconfig | 9 +++++++++ .gitattributes | 15 +++++++++++++++ .php_cs | 13 +++++++++++++ .scrutinizer.yml | 8 ++++++++ .styleci.yml | 12 ++++++++++++ src/Mailgun/Connection/RestClient.php | 10 ++++++---- src/Mailgun/Mailgun.php | 1 + src/Mailgun/Messages/MessageBuilder.php | 16 ++++++++-------- tests/Functional/FileFromMemoryTest.php | 10 +++++----- tests/Functional/SendMessageTest.php | 6 +++--- tests/MailgunTest.php | 4 ++-- tests/Messages/BatchMessageTest.php | 4 ++-- tests/Messages/ComplexMessageTest.php | 22 +++++++++++----------- tests/Messages/MessageBuilderTest.php | 16 ++++++++-------- tests/Messages/StandardMessageTest.php | 6 +++--- 15 files changed, 106 insertions(+), 46 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .php_cs create mode 100644 .scrutinizer.yml create mode 100644 .styleci.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..677e36e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c47225a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +.editorconfig export-ignore +.gitattributes export-ignore +/.github/ export-ignore +.gitignore export-ignore +/.php_cs export-ignore +/.scrutinizer.yml export-ignore +/.styleci.yml export-ignore +/.travis.yml export-ignore +/behat.yml.dist export-ignore +/features/ export-ignore +/phpspec.ci.yml export-ignore +/phpspec.yml.dist export-ignore +/phpunit.xml.dist export-ignore +/spec/ export-ignore +/tests/ export-ignore diff --git a/.php_cs b/.php_cs new file mode 100644 index 0000000..23ba165 --- /dev/null +++ b/.php_cs @@ -0,0 +1,13 @@ +prepareFile($fieldName, $file, $fileIndex); - $fileIndex++; + ++$fileIndex; } } else { $postFiles[] = $this->prepareFile($fieldName, $files[$fieldName]); @@ -144,13 +145,13 @@ class RestClient $index = 0; foreach ($value as $subValue) { $postDataMultipart[] = [ - 'name' => sprintf('%s[%d]', $key, $index++), + 'name' => sprintf('%s[%d]', $key, $index++), 'contents' => $subValue, ]; } } else { $postDataMultipart[] = [ - 'name' => $key, + 'name' => $key, 'contents' => $value, ]; } @@ -296,7 +297,7 @@ class RestClient $fieldName .= '['.$fileIndex.']'; return [ - 'name' => $fieldName, + 'name' => $fieldName, 'contents' => $resource, 'filename' => $filename, ]; @@ -352,6 +353,7 @@ class RestClient * @param bool $sslEnabled * * @return RestClient + * * @deprecated To be removed in 3.0 */ public function setSslEnabled($sslEnabled) diff --git a/src/Mailgun/Mailgun.php b/src/Mailgun/Mailgun.php index 5f9caa8..557752a 100644 --- a/src/Mailgun/Mailgun.php +++ b/src/Mailgun/Mailgun.php @@ -173,6 +173,7 @@ class Mailgun * @param bool $sslEnabled * * @return Mailgun + * * @deprecated This will be removed in 3.0. Mailgun does not support non-secure connections to their API. */ public function setSslEnabled($sslEnabled) diff --git a/src/Mailgun/Messages/MessageBuilder.php b/src/Mailgun/Messages/MessageBuilder.php index b5fe0af..7caa9c4 100644 --- a/src/Mailgun/Messages/MessageBuilder.php +++ b/src/Mailgun/Messages/MessageBuilder.php @@ -44,15 +44,15 @@ class MessageBuilder */ protected $counters = [ 'recipients' => [ - 'to' => 0, - 'cc' => 0, + 'to' => 0, + 'cc' => 0, 'bcc' => 0, ], 'attributes' => [ - 'attachment' => 0, - 'campaign_id' => 0, + 'attachment' => 0, + 'campaign_id' => 0, 'custom_option' => 0, - 'tag' => 0, + 'tag' => 0, ], ]; @@ -280,14 +280,14 @@ class MessageBuilder { if (isset($this->files['attachment'])) { $attachment = [ - 'filePath' => $attachmentPath, + 'filePath' => $attachmentPath, 'remoteName' => $attachmentName, ]; array_push($this->files['attachment'], $attachment); } else { $this->files['attachment'] = [ [ - 'filePath' => $attachmentPath, + 'filePath' => $attachmentPath, 'remoteName' => $attachmentName, ], ]; @@ -311,7 +311,7 @@ class MessageBuilder } $this->files['inline'][] = [ - 'filePath' => $inlineImagePath, + 'filePath' => $inlineImagePath, 'remoteName' => $inlineImageName, ]; diff --git a/tests/Functional/FileFromMemoryTest.php b/tests/Functional/FileFromMemoryTest.php index 2754cef..443aef9 100644 --- a/tests/Functional/FileFromMemoryTest.php +++ b/tests/Functional/FileFromMemoryTest.php @@ -20,7 +20,7 @@ class FileFromMemoryTest extends \PHPUnit_Framework_TestCase // Convert resources to strings $attachments = array_map(function ($f) { return [ - 'name' => $f['name'], + 'name' => $f['name'], 'contents' => fread($f['contents'], 50), 'filename' => $f['filename'], ]; @@ -40,10 +40,10 @@ class FileFromMemoryTest extends \PHPUnit_Framework_TestCase $mailgun = MockedMailgun::create($this, 'POST', 'domain/messages', [], $fileValidator); $mailgun->sendMessage('domain', [ - 'from' => 'bob@example.com', - 'to' => 'alice@example.com', - 'subject' => 'Foo', - 'text' => 'Bar', ], [ + 'from' => 'bob@example.com', + 'to' => 'alice@example.com', + 'subject' => 'Foo', + 'text' => 'Bar', ], [ 'attachment' => $attachments, ]); } diff --git a/tests/Functional/SendMessageTest.php b/tests/Functional/SendMessageTest.php index b50354b..4a3ac10 100644 --- a/tests/Functional/SendMessageTest.php +++ b/tests/Functional/SendMessageTest.php @@ -30,9 +30,9 @@ class SendMessageTest extends \PHPUnit_Framework_TestCase $mailgun = MockedMailgun::create($this, 'POST', 'domain/messages', [], $fileValidator); $mailgun->sendMessage('domain', [ - 'from' => 'bob@example.com', - 'to' => 'alice@example.com', + 'from' => 'bob@example.com', + 'to' => 'alice@example.com', 'subject' => 'Foo', - 'text' => 'Bar', ]); + 'text' => 'Bar', ]); } } diff --git a/tests/MailgunTest.php b/tests/MailgunTest.php index 589adfe..fe626f9 100644 --- a/tests/MailgunTest.php +++ b/tests/MailgunTest.php @@ -26,7 +26,7 @@ class MailgunTest extends \Mailgun\Tests\MailgunTestCase $client = new Mailgun('key-3ax6xnjp29jd6fds4gc373sgvjxteol0'); $postData = [ 'timestamp' => '1403645220', - 'token' => '5egbgr1vjgqxtrnp65xfznchgdccwh5d6i09vijqi3whgowmn6', + 'token' => '5egbgr1vjgqxtrnp65xfznchgdccwh5d6i09vijqi3whgowmn6', 'signature' => '9cfc5c41582e51246e73c88d34db3af0a3a2692a76fbab81492842f000256d33', ]; assert($client->verifyWebhookSignature($postData)); @@ -37,7 +37,7 @@ class MailgunTest extends \Mailgun\Tests\MailgunTestCase $client = new Mailgun('key-3ax6xnjp29jd6fds4gc373sgvjxteol0'); $postData = [ 'timestamp' => '1403645220', - 'token' => 'owyldpe6nxhmrn78epljl6bj0orrki1u3d2v5e6cnlmmuox8jr', + 'token' => 'owyldpe6nxhmrn78epljl6bj0orrki1u3d2v5e6cnlmmuox8jr', 'signature' => '9cfc5c41582e51246e73c88d34db3af0a3a2692a76fbab81492842f000256d33', ]; assert(!$client->verifyWebhookSignature($postData)); diff --git a/tests/Messages/BatchMessageTest.php b/tests/Messages/BatchMessageTest.php index 97a606c..12ff1d1 100644 --- a/tests/Messages/BatchMessageTest.php +++ b/tests/Messages/BatchMessageTest.php @@ -103,7 +103,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase public function testAddMultipleBatchRecipients() { $message = $this->client->BatchMessage($this->sampleDomain); - for ($i = 0; $i < 100; $i++) { + for ($i = 0; $i < 100; ++$i) { $message->addToRecipient("$i@samples.mailgun.org", ['first' => 'Test', 'last' => "User $i"]); } $messageObj = $message->getMessage(); @@ -116,7 +116,7 @@ class BatchMessageTest extends \Mailgun\Tests\MailgunTestCase $message->setFromAddress('samples@mailgun.org', ['first' => 'Test', 'last' => 'User']); $message->setSubject('This is the subject of the message!'); $message->setTextBody('This is the text body of the message!'); - for ($i = 0; $i < 1001; $i++) { + for ($i = 0; $i < 1001; ++$i) { $message->addToRecipient("$i@samples.mailgun.org", ['first' => 'Test', 'last' => "User $i"]); } $messageObj = $message->getMessage(); diff --git a/tests/Messages/ComplexMessageTest.php b/tests/Messages/ComplexMessageTest.php index e2f8f17..1ac7524 100644 --- a/tests/Messages/ComplexMessageTest.php +++ b/tests/Messages/ComplexMessageTest.php @@ -53,21 +53,21 @@ class ComplexMessageTest extends \Mailgun\Tests\MailgunTestCase public function testSendComplexMessage() { $message = [ - 'to' => 'test@test.mailgun.org', - 'from' => 'sender@test.mailgun.org', + 'to' => 'test@test.mailgun.org', + 'from' => 'sender@test.mailgun.org', 'subject' => 'This is my test subject', - 'text' => 'Testing!', + 'text' => 'Testing!', ]; $files = [ 'inline' => [ [ 'remoteName' => 'mailgun_icon1.png', - 'filePath' => 'tests/TestAssets/mailgun_icon1.png', + 'filePath' => 'tests/TestAssets/mailgun_icon1.png', ], [ 'remoteName' => 'mailgun_icon2.png', - 'filePath' => 'tests/TestAssets/mailgun_icon2.png', + 'filePath' => 'tests/TestAssets/mailgun_icon2.png', ], ], ]; @@ -84,27 +84,27 @@ class ComplexMessageTest extends \Mailgun\Tests\MailgunTestCase foreach ($result->files as $file) { if ($file['name'] == 'to') { $this->assertEquals($file['contents'], 'test@test.mailgun.org'); - $testCount++; + ++$testCount; } if ($file['name'] == 'from') { $this->assertEquals($file['contents'], 'sender@test.mailgun.org'); - $testCount++; + ++$testCount; } if ($file['name'] == 'subject') { $this->assertEquals($file['contents'], 'This is my test subject'); - $testCount++; + ++$testCount; } if ($file['name'] == 'text') { $this->assertEquals($file['contents'], 'Testing!'); - $testCount++; + ++$testCount; } if ($file['name'] == 'inline[0]') { $this->assertEquals($file['filename'], 'mailgun_icon1.png'); - $testCount++; + ++$testCount; } if ($file['name'] == 'inline[1]') { $this->assertEquals($file['filename'], 'mailgun_icon2.png'); - $testCount++; + ++$testCount; } } diff --git a/tests/Messages/MessageBuilderTest.php b/tests/Messages/MessageBuilderTest.php index 5e39cad..6ef3cf5 100644 --- a/tests/Messages/MessageBuilderTest.php +++ b/tests/Messages/MessageBuilderTest.php @@ -160,11 +160,11 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase $this->assertEquals( [ [ - 'filePath' => '@../TestAssets/mailgun_icon.png', + 'filePath' => '@../TestAssets/mailgun_icon.png', 'remoteName' => null, ], [ - 'filePath' => '@../TestAssets/rackspace_logo.png', + 'filePath' => '@../TestAssets/rackspace_logo.png', 'remoteName' => null, ], ], @@ -181,11 +181,11 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase $this->assertEquals( [ [ - 'filePath' => '@../TestAssets/mailgun_icon.png', + 'filePath' => '@../TestAssets/mailgun_icon.png', 'remoteName' => null, ], [ - 'filePath' => '@../TestAssets/rackspace_logo.png', + 'filePath' => '@../TestAssets/rackspace_logo.png', 'remoteName' => null, ], ], @@ -202,11 +202,11 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase $this->assertEquals( [ [ - 'filePath' => '@../TestAssets/mailgun_icon.png', + 'filePath' => '@../TestAssets/mailgun_icon.png', 'remoteName' => 'mg_icon.png', ], [ - 'filePath' => '@../TestAssets/rackspace_logo.png', + 'filePath' => '@../TestAssets/rackspace_logo.png', 'remoteName' => 'rs_logo.png', ], ], @@ -223,11 +223,11 @@ class MessageBuilderTest extends \Mailgun\Tests\MailgunTestCase $this->assertEquals( [ [ - 'filePath' => '@../TestAssets/mailgun_icon.png', + 'filePath' => '@../TestAssets/mailgun_icon.png', 'remoteName' => 'mg_icon.png', ], [ - 'filePath' => '@../TestAssets/rackspace_logo.png', + 'filePath' => '@../TestAssets/rackspace_logo.png', 'remoteName' => 'rs_logo.png', ], ], diff --git a/tests/Messages/StandardMessageTest.php b/tests/Messages/StandardMessageTest.php index 79f56a2..af4ff3e 100644 --- a/tests/Messages/StandardMessageTest.php +++ b/tests/Messages/StandardMessageTest.php @@ -43,10 +43,10 @@ class StandardMessageTest extends \Mailgun\Tests\MailgunTestCase public function testSendMessage() { - $message = ['to' => 'test@test.mailgun.org', - 'from' => 'sender@test.mailgun.org', + $message = ['to' => 'test@test.mailgun.org', + 'from' => 'sender@test.mailgun.org', 'subject' => 'This is my test subject', - 'text' => 'Testing!', + 'text' => 'Testing!', ]; $result = $this->client->sendMessage('test.mailgun.org', $message); $this->assertEquals('test.mailgun.org/messages', $result->http_endpoint_url);