summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Jack <cuonic@cuonic.com>2015-11-06 14:01:02 +0100
committerLiam Jack <cuonic@cuonic.com>2015-11-06 14:01:02 +0100
commit2f3e78c8b08d2ed107dcf9ace540e6b8433d5c75 (patch)
tree81e5ffc0b12f287b93d4b09544efc7946fe1db31
parent621dbd6295e4f29bd197c6f2eda385617f0807d9 (diff)
downloadPHPAuth-2f3e78c8b08d2ed107dcf9ace540e6b8433d5c75.zip
PHPAuth-2f3e78c8b08d2ed107dcf9ace540e6b8433d5c75.tar.gz
PHPAuth-2f3e78c8b08d2ed107dcf9ace540e6b8433d5c75.tar.bz2
Fixed issue #135: Added PHPMailer as an external dependancy, added PHPUnit as external dev dependancy, removed mcrypt dep (no longer used)
-rwxr-xr-xAuth.php5
-rw-r--r--composer.json4
2 files changed, 4 insertions, 5 deletions
diff --git a/Auth.php b/Auth.php
index 639a44b..d58c0ea 100755
--- a/Auth.php
+++ b/Auth.php
@@ -751,10 +751,7 @@ class Auth
if($sendmail === true)
{
- // Check configuration for SMTP parameters
-
- require 'PHPMailer/PHPMailerAutoload.php';
-
+ // Check configuration for SMTP parameters
$mail = new \PHPMailer;
if($this->config->smtp) {
$mail->isSMTP();
diff --git a/composer.json b/composer.json
index a306ed6..e1dd29e 100644
--- a/composer.json
+++ b/composer.json
@@ -7,9 +7,11 @@
"license": "MIT",
"require": {
"php": ">=5.4.0",
- "ext-mcrypt": "*",
"phpmailer/phpmailer": "^5.2"
},
+ "require-dev": {
+ "phpunit/phpunit": "4.*"
+ },
"autoload": {
"psr-4": {
"PHPAuth\\": "/"