Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.lock

composer.json

@@ -1,24 +1,34 @@
 {
   "name": "phpmailer/apix-log-phpmailer",
-  "description": "A PHPMailer logger for Apix log",
+  "description": "A PHPMailer logger for APIx Log",
   "type": "library",
   "minimum-stability": "stable",
   "license": "BSD-3-Clause",
   "authors": [
     {
       "name": "Marcus Bointon",
       "email": "[email protected]"
+    },
+    {
+      "name": "Franck Cassedanne",
+      "email": "[email protected]"
     }
   ],
   "require": {
     "php": ">=5.3",
     "apix/log": "^1.2",
     "phpmailer/phpmailer": "^5.2"
   },
+  "require-dev": {
+    "phpunit/phpunit": "4.8.*"
+  },
   "autoload": {
-      "psr-4": {
-          "Apix\\Log\\Logger\\": "src/",
-          "Apix\\Log\\Logger\\tests\\": "tests/"
-      }
+    "psr-4": { "Apix\\Log\\Logger\\": "src/" }
+  },
+  "autoload-dev": {
+    "psr-4": { "Apix\\Log\\Logger\\tests\\": "tests/" }
+  },
+  "provide": {
+    "psr/log-implementation": "1.0.0"
   }
 }