Commit Graph

582 Commits

Author SHA1 Message Date
Travis Swientek
f4c6fd012b Merge branch 'gmacon-verifyWebhookSignature' 2014-11-19 14:29:50 -08:00
Travis Swientek
b28a742efb Merge branch 'verifyWebhookSignature' of https://github.com/gmacon/mailgun-php into gmacon-verifyWebhookSignature
Conflicts:
	src/Mailgun/Mailgun.php
2014-11-19 14:29:08 -08:00
Travis Swientek
529e392386 Merge branch 'nathanntg-master' 2014-11-19 14:23:34 -08:00
Travis Swientek
59299b7fbf Merge branch 'master' of https://github.com/nathanntg/mailgun-php into nathanntg-master
Conflicts:
	src/Mailgun/Connection/Exceptions/GenericHTTPError.php
2014-11-19 14:22:40 -08:00
Travis Swientek
d744b0a809 Merge pull request #56 from jchamberlain/master
Don't require @ prefix for attachment filenames
2014-11-17 17:28:32 -08:00
Travis Swientek
24085530d9 Merge pull request #57 from jchamberlain/custom-data
Allow any data type for custom data
2014-11-17 17:25:43 -08:00
Travis Swientek
0a62c7cbe1 Merge pull request #60 from jchamberlain/raw-response
Return non-JSON response data
2014-11-17 17:24:52 -08:00
Travis Swientek
05d16d947d Merge pull request #64 from travelton/master
Removed legacy PHP closing braces
2014-10-06 16:02:25 -07:00
Travis Swientek
f781158019 Removed legacy PHP closing braces 2014-10-06 15:53:33 -07:00
Joshua Chamberlain
c6346e80df Return non-JSON response data 2014-09-15 16:01:24 -07:00
Joshua Chamberlain
f2af6df726 Allow any data type for custom data 2014-09-08 12:11:04 -07:00
Joshua Chamberlain
a674addd2a Don't require @ prefix for attachment filenames 2014-09-05 15:07:55 -07:00
Travis Swientek
7f2fa66030 Merge pull request #51 from Nyholm/patch-1
Added PHP 5.6 and HHVM to travis.yml
2014-08-25 13:57:55 -07:00
Tobias Nyholm
f4dec3fdc9 Added PHP 5.6 and HHVM to travis.yml 2014-07-15 07:17:27 +02:00
George Macon
46f63044ad Add Mailgun->verifyWebhookSignature 2014-06-24 17:36:21 -04:00
Travis Swientek
e538430f54 Update README.md 2014-06-20 15:43:14 -07:00
Nathan Perkins
5084053ec3 Preserve lack of line endings. 2014-06-16 10:48:56 -04:00
Nathan Perkins
ba8e7bda43 Throw more detailed generic HTTP error
Take advantage of new response code and body properties to allow better logging.
2014-06-16 10:40:18 -04:00
Nathan Perkins
9fe01151af Add HTTP properties to generic error
Allows generic HTTP error to accept more detailed information about the response from the server.
2014-06-16 10:38:42 -04:00
Travis Swientek
57d0160b00 Update SharedHostInstall.md 2014-05-27 11:00:52 -07:00
Travis Swientek
6aa6054d9b Update README.md 2014-05-27 11:00:26 -07:00
Travis Swientek
b16608bd5f Merge pull request #45 from tarjei/master
Depend on guzzle  >=3.8
2014-05-27 10:45:51 -07:00
Tarjei Huse
f47892e58c Depend on guzzle >=3.8
As guzzle 3.9.* is out, mailgun should support it as well - else it
creates conflicts on larger projects.
2014-05-22 07:03:36 +02:00
Travis Swientek
be27861e11 Merge pull request #44 from icambridge/setMessage
Add setMessage to MessageBuilder
2014-05-14 14:29:27 -05:00
Iain Cambridge
e75c245cd6 Fix 5.3 compat 2014-05-14 14:08:12 +01:00
Iain Cambridge
e9e0f39ca8 Apply coding style that is in src 2014-05-14 14:06:05 +01:00
Iain Cambridge
6196f8df49 Add setMessage 2014-05-14 14:03:12 +01:00
Travis Swientek
fea1279b93 Merge pull request #42 from icambridge/fixAllTheThings
Fixed Fatal error and Warnings added tests
2014-05-13 11:14:52 -05:00
Iain Cambridge
d28c6b81c9 Comment out possible php bug failure 2014-05-13 17:05:32 +01:00
Iain Cambridge
103fa04ede Whitespace changes. (Probably some PSR-2 stuff as well 2014-05-13 16:53:40 +01:00
Iain Cambridge
c203558234 Fix php 5.3 compat 2014-05-13 16:32:14 +01:00
Iain Cambridge
bdeadc1a01 Add tests to ensure exceptions are flung and fixed wrong variable name used 2014-05-13 16:12:32 +01:00
Iain Cambridge
35c65aaa57 Removed apiKey member since it's not used anywhere. 2014-05-13 14:59:11 +01:00
Iain Cambridge
34d8203262 Removed pointless try and catch. None of the functions threw an exception and it was just rethrowing. Also Exception didn't exist in that namespace 2014-05-13 14:58:12 +01:00
Iain Cambridge
33f3d27d7b Move fclose and unlink to before the return so they're actually called. 2014-05-13 14:57:23 +01:00
Iain Cambridge
502fac0b37 Fix fatal error in not finding exception.
Tried to throw MissingRequiredMIMEParameters which didn't exist in current namespace or added via use. Connection exceptions was included by MissingRequiredMIMEParameters is in messages exceptions so changed the added exception name to messages.

Exception message constant didn't exist. So added it.
2014-05-13 14:54:10 +01:00
Iain Cambridge
3af838f2c8 Move mocks
Created a Mocks directory to seperate mocks from classes.

I moved Mailgun\Tests\MailGunTest to Mailgun\Test\Mocks\Mailgun. As it's not a
test it's a mock. So shouldn't be suffixed with Test.

I mocked Mailgun\Tests\Connection\TestBroker to Mailgun\Tests\Mocks\Connection\TestBroker as it's a mock and should be with other mocks.
2014-05-13 14:25:26 +01:00
Travis Swientek
08e67d8e9e Merge pull request #41 from Milannv/patch-1
Fixed typo for including an Exception
2014-04-15 14:27:02 -07:00
Milannv
9b4668c564 Fixed typo for including an Exception 2014-03-10 13:40:59 +01:00
Travis Swientek
15f38e3737 Merge pull request #31 from travelton/ImproveOptInSecurity
Improved security of OptInHandler.
2014-02-14 10:53:02 -08:00
Travis Swientek
d8b57132d5 Merge pull request #33 from travelton/PatchAggregator
This patch swaps the aggregator to "PHPAggregator" if files are included...
2014-01-30 17:09:06 -08:00
Travis Swientek
8d23a5bb9f This patch swaps the aggregator to "PHPAggregator" if files are included. Also added straight download. 2014-01-30 17:05:40 -08:00
Travis Swientek
717cf5faed Improved security of OptInHandler. 2014-01-24 22:07:53 +00:00
Travis Swientek
6bfebad84d Update SharedHostInstall.md
Updated the require version.
2014-01-14 16:33:31 -08:00
Travis Swientek
cfa02122c9 Merge pull request #29 from travelton/RenameFiles
Ability to rename attachments and inline images & Duplicate Post/Put Fields
2014-01-14 16:30:25 -08:00
Travis Swientek
d3a0d6aed9 Fixed Guzzle post/put field aggregation. 2014-01-14 00:45:34 +00:00
Travis Swientek
af53fd50ff Ability to rename attachments and inline images. 2014-01-13 22:53:34 +00:00
Travis Swientek
ac23becab4 Merge pull request #26 from travelton/master
Added tip4commit on README.
2013-12-14 14:15:53 -08:00
Travis Swientek
535b063de3 Added tip4commit on README. 2013-12-14 14:12:53 -08:00
Travis Swientek
8025b17a13 Merge pull request #24 from nmenglund/patch-1
In README.md, added getFiles() reference to MessageBuilder example
2013-12-13 17:36:32 -08:00