version 3.0.0-beta

Author: ddrv

.gitignore

@@ -0,0 +1 @@
+/.idea/*

README.md

@@ -11,108 +11,68 @@ PHP Class for sending email.
 ## With [Composer](https://getcomposer.org/)
 1. Run in console:
     ```text
-    php composer.phar require ddrv/mailer
-    php composer.phar install
+    php composer.phar require ddrv/mailer:~3
     ```
 1. Include autoload file
     ```php
     require_once('vendor/autoload.php');
     ```
-## Manually install
-1. Download [Archive](https://github.com/ddrv/mailer/archive/master.zip)
-1. Unzip archive to /path/to/libraries/
-1. Include files
-    ```php
-    require_once('/path/to/libraries/mailer/src/Mailer.php');
-    ```
 
 # Usage
 
 ```php
-/**
- * Inititalization Mailer class. 
+<?php
+
+/*
+ * Initialization Mailer class. 
  */
 $mailer = new \Ddrv\Mailer\Mailer();
 
-/**
+/*
  * If need use SMTP server, setting it
  */
-$mailer->smtp('smtp.host.name',25,'from@host.name','password for from', 'http://host.name');
-
-/**
- * Set sender from@host.name as Site Administrator
- */
-$mailer->sender('from@host.name','Site Administrator');
-
-/**
- * Set subject of mail
- */
-$mailer->subject('Subject of mail');
-
-/**
- * Add text of mail in HTML format
- */
-$mailer->body('<p>Simple text</p>');
-
-/**
- * In need adding attachment from string, run
- */
-$mailer->attachFromString('content','attach1.txt');
-
-/**
- * In need adding attachment from file, run
+$mailer->smtp(
+    'smtp.host.name',    // host
+    25,                  // port
+    'from@host.name',    // login
+    'password for from', // password
+    'from@host.name',    // sender
+    null,                // encryption: 'tls', 'ssl' or null
+    'http://host.name'   // domain
+);
+
+/*
+ * If need switch provider back to mail() function, use 
  */
-$mailer->attachFromFile('/path/to/file','attach2.txt');
+$mailer->legacy('-f');
 
-/**
- * Add addresses
+/*
+ * Create message
  */
-$mailer->addAddress('address1@host.name', 'My best Friend');
-$mailer->addAddress('address2@host.name', 'My second Friend');
+$message = new \Ddrv\Mailer\Message('from@host.name', 'subject', '<p>Simple text</p>', true);
 
-/**
- * If error, remove address
+/*
+ * You can set named sender from@host.name as Site Administrator
  */
-$mailer->removeAddress('address2@host.name');
+$message->setSender('from@host.name', 'Site Administrator');
 
-/**
- * Send email to addresses
+/*
+ * If need adding attachment from string, run
  */
-$mailer->send();
-```
+$message->attachFromString('attach1.txt', 'content', 'text/plain');
 
-## Templates
-
-Content of file /path/to/template.tmpl:
-```text
-<h1>This template</h1>
-<p>Hello, {username}!</p>
-<p>This message generated automatically.</p>
-<p>{date}</p>
-```
-
-PHP code:
-```php
-/**
- * You can using templates for your mails
- */
- 
-/**
- * Add template from string
+/*
+ * If need adding attachment from file, run
  */
-$mailer->addTemplateFromString('tmpl1', '<p>Hello, {username}</p>');
+$message->attachFromFile('attach2.txt', '/path/to/file');
 
-/**
- * Add template from file
+/*
+ * Send email to addresses (one mail for all addresses)
  */
-$mailer->addTemplateFromFile('tmpl2', '/path/to/template.tmpl');
+$mailer->send($message, array('email1@host.name', 'email2@host.name'));
 
-/**
- * Set body from template
+/*
+ * or send personal mailing one mail per addresses
  */
-$context = [
-    'username' => 'Anonymous',
-    'date' => date('Y-m-d'),
-];
-$mailer->template('tmpl2',$context);
-```
+$mailer->send($message, array('email1@host.name', 'email2@host.name', true));
+```

composer.json

@@ -1,12 +1,16 @@
 {
     "name": "ddrv/mailer",
-    "version":"2.2.0",
+    "version":"3.0.0-beta",
     "require":{
-        "php":">=5.4.0"
+        "php":">=5.3.0",
+        "ext-mbstring": "*"
+    },
+    "suggest": {
+        "ext-fileinfo": "Mime-Type detecting"
     },
     "type": "library",
     "description": "PHP Class for sending email",
-    "keywords": ["email", "mail", "send", "attachments"],
+    "keywords": ["email", "mail", "send", "attachments", "smtp"],
     "license": "MIT",
     "authors": [
         {