Merge branch 'removing-alpha-mail'

Conflicts: CHANGELOG.md
Webador · Jun 12, 2014 · a017e39 · a017e39
2 parents 200b3ef + f0ca542
commit a017e39
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 939 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 `sendTemplate` methods.
 - `getScheduledMessages`, `cancelScheduledMessage` and `rescheduleMessage` methods have been also added to the
 Mandrill service to handle those messages.
+- AlphaMail is dead and no longer operates. It is therefore removed from SlmMail.
 
 ## 1.4.1
 

diff --git a/README.md b/README.md
@@ -22,7 +22,6 @@ or MailJet) are out-of-the scope of this module.
 
 Here are the currently supported services:
 
-* [AlphaMail](http://www.amail.io) (complete)
 * [Amazon SES](http://aws.amazon.com/ses) (nearly complete, [attachments are missing](https://github.com/juriansluiman/SlmMail/issues/44))
 * [Elastic Email](http://elasticemail.com) (complete)
 * [Mailgun](http://www.mailgun.com) (complete)
@@ -75,7 +74,6 @@ Documentation
 
 Documentation for SlmMail is splitted for each provider:
 
-* [AlphaMail](/docs/AlphaMail.md)
 * [Amazon SES](/docs/Ses.md)
 * [Elastic Email](/docs/ElasticEmail.md)
 * [Mailgun](/docs/Mailgun.md)

diff --git a/composer.json b/composer.json
@@ -6,8 +6,6 @@
     "keywords": [
         "zf2",
         "email",
-        "alpha mail",
-        "alphamail",
         "elastic email",
         "elasticemail",
         "mailgun",

diff --git a/config/module.config.php b/config/module.config.php
@@ -44,7 +44,6 @@
             /**
              * Transport
              */
-            'SlmMail\Mail\Transport\AlphaMailTransport'    => 'SlmMail\Factory\AlphaMailTransportFactory',
             'SlmMail\Mail\Transport\ElasticEmailTransport' => 'SlmMail\Factory\ElasticEmailTransportFactory',
             'SlmMail\Mail\Transport\MailgunTransport'      => 'SlmMail\Factory\MailgunTransportFactory',
             'SlmMail\Mail\Transport\MandrillTransport'     => 'SlmMail\Factory\MandrillTransportFactory',
@@ -56,7 +55,6 @@
             /**
              * Services
              */
-            'SlmMail\Service\AlphaMailService'    => 'SlmMail\Factory\AlphaMailServiceFactory',
             'SlmMail\Service\ElasticEmailService' => 'SlmMail\Factory\ElasticEmailServiceFactory',
             'SlmMail\Service\MailgunService'      => 'SlmMail\Factory\MailgunServiceFactory',
             'SlmMail\Service\MandrillService'     => 'SlmMail\Factory\MandrillServiceFactory',

diff --git a/config/slm_mail.alpha_mail.local.php.dist b/config/slm_mail.alpha_mail.local.php.dist
diff --git a/docs/AlphaMail.md b/docs/AlphaMail.md
diff --git a/docs/Pricing.md b/docs/Pricing.md
@@ -5,7 +5,6 @@ prices appear to be outdated, please create an issue!
 
 Provider     | Price | Example with 100 000 emails/month |
 ------------ | ----- | ---------------------------------
-Alpha Mail   | up to 6 000 emails/month: free, up to 40 000 emails/month: 9.49 $/month, up to 100 000 emails/month: 79.49$/month, 199.49 $/month, up to 700 000 emails/month: 399.49$/month | 79.49 $ / month
 Amazon SES   | 2 000 messages/day for free, then 0.10$ for 1000 | 4 $ / month
 Elastic Mail | depends on what you send AND your reputation accross time | between 95$ and 50$ / month
 Mailgun      | five plans depending on a minimum required per month. Free plan: 200 mails / day ; standard plan: 1$ for 1000, minimum of 19$ per month required ; express plan: 0.50$ per 1000, minimum of 59$ per month required ; priority plan: 0.40$ per 1000, minimum of 199$ per month required ; first-class plan: 0.10$ per 1000, minimum of 499$ per month required | 10$ / month with the first-class plan or 40$ / month with the priority plan

diff --git a/src/SlmMail/Factory/AlphaMailServiceFactory.php b/src/SlmMail/Factory/AlphaMailServiceFactory.php
diff --git a/src/SlmMail/Factory/AlphaMailTransportFactory.php b/src/SlmMail/Factory/AlphaMailTransportFactory.php