Merge branch 'release/3.0.4'

getgrav · Jan 17, 2020 · 34f5655 · 34f5655
2 parents f0bba1e + ea3d4ca
commit 34f5655
Show file tree

Hide file tree

Showing 59 changed files with 726 additions and 558 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v3.0.4
+## 01/17/2019
+
+1. [](#improved)
+    * Added ZOHO configuration example
+    * Updated SwiftMailer library for PHP 7.4 support
+
 # v3.0.3
 ## 08/16/2019
 

diff --git a/README.md b/README.md
@@ -159,6 +159,25 @@ mailer:
 
 It's that easy!
 
+#### ZOHO
+
+ZOHO is a popular solution for hosted email due to it's great 'FREE' tier.  It's paid options are also very reasonable and combined with the latest UI updates and outstanding security features, it's a solid email option.
+
+In order to get ZOHO working with Grav, you need to send email via a user account.  You can either use your users' password or generate an **App Password** via your ZOHO account (clicking on your avatar once logged in), then navigating to `Two Factor Authentication -> App Passwords -> Generate`. Just enter a unique app name (i.e. `Grav Website`).
+
+NOTE: The SMTP host required can be found in `Settings -> Mail - > Mail Accounts -> POP/IMAP -> SMTP`.  This will provide the SMTP server for this account (it may not be `imap.zoho.com` depending on what region you are in)
+
+```
+mailer:
+  engine: smtp
+  smtp:
+    server: smtp.zoho.com
+    port: 587
+    encryption: tls
+    user: 'ZOHO_EMAIL_ADDRESS'
+    password: 'ZOHO_EMAIL_PASSWORD'
+```
+
 #### Sendmail
 
 Although not as reliable as SMTP not providing as much debug information, sendmail is a simple option as long as your hosting provider is not blocking the default SMTP port `25`:

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Email
-version: 3.0.3
+version: 3.0.4
 testing: false
 description: Enables the emailing system for Grav
 icon: envelope

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -377,7 +377,7 @@ private function findFileWithExtension($class, $ext)
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath.'\\';
+                $search = $subPath . '\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {

diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
@@ -6,5 +6,4 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
@@ -13,4 +13,5 @@
     'Grav\\Plugin\\Email\\' => array($baseDir . '/classes'),
     'Grav\\Plugin\\Console\\' => array($baseDir . '/cli'),
     'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/EmailValidator'),
+    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer'),
 );