Merge branch 'develop'

.travis.yml

@@ -16,7 +16,7 @@ before_script:
   - composer self-update
   - composer update --no-dev -o
 
-script: phpunit --stderr --coverage-text
+script: phpunit --stderr
 
 notifications:
   on_success: change

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.4 #
+The message as it would appear in the log is now built in the protected method `buildMessage()`
+
 # 1.3 #
 
  - `getBacktrace()` added

README.md

@@ -10,7 +10,7 @@ Latest release API documentation: [https://aloframework.github.io/log/](https://
 
 |                                                                                          dev-develop                                                                                         |                                                             Latest release                                                            |
 |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------------------------------:|
-| [![Dev Build Status](https://travis-ci.org/aloframework/log.svg?branch=develop)](https://travis-ci.org/aloframework/log)                                                                     | [![Release Build Status](https://travis-ci.org/aloframework/log.svg?branch=1.3)](https://travis-ci.org/aloframework/log)            |
+| [![Dev Build Status](https://travis-ci.org/aloframework/log.svg?branch=develop)](https://travis-ci.org/aloframework/log)                                                                     | [![Release Build Status](https://travis-ci.org/aloframework/log.svg?branch=1.4)](https://travis-ci.org/aloframework/log)            |
 | [![SensioLabsInsight](https://insight.sensiolabs.com/projects/c3500bba-d9af-4734-9dc7-31fddc7f8abe/mini.png)](https://insight.sensiolabs.com/projects/c3500bba-d9af-4734-9dc7-31fddc7f8abe) | [![SensioLabsInsight](https://i.imgur.com/KygqLtf.png)](https://insight.sensiolabs.com/projects/c3500bba-d9af-4734-9dc7-31fddc7f8abe) |
 
 

composer.json

@@ -1,40 +1,45 @@
 {
-  "name": "aloframework/log",
-  "description": "The logger of AloFramework",
-  "prefer-stable": true,
-  "type": "library",
-  "license": "GPL-3.0+",
-  "homepage": "https://github.com/aloframework/log",
-  "keywords": [
-    "PHP",
-    "5.4",
-    "log",
-    "logging",
-    "logger",
-    "PSR-3"
-  ],
-  "authors": [
-    {
-      "name": "Art",
-      "email": "[email protected]",
-      "role": "Developer",
-      "homepage": "https://github.com/Alorel"
-    }
-  ],
-  "support": {
-    "issues": "https://github.com/aloframework/log/issues"
-  },
-  "require": {
-    "php": ">=5.4",
-    "psr/log": "^1.0",
-    "aloframework/common": "^1.0"
-  },
-  "require-dev": {
-    "symfony/var-dumper": "^2.7"
-  },
-  "autoload": {
-    "psr-4": {
-      "AloFramework\\Log\\": "src/class/"
-    }
-  }
+   "name": "aloframework/log",
+   "description": "The logger of AloFramework",
+   "prefer-stable": true,
+   "type": "library",
+   "license": "GPL-3.0+",
+   "homepage": "https://github.com/aloframework/log",
+   "keywords": [
+      "PHP",
+      "5.4",
+      "log",
+      "logging",
+      "logger",
+      "PSR-3"
+   ],
+   "authors": [
+      {
+         "name": "Art",
+         "email": "[email protected]",
+         "role": "Developer",
+         "homepage": "https://github.com/Alorel"
+      }
+   ],
+   "support": {
+      "issues": "https://github.com/aloframework/log/issues"
+   },
+   "require": {
+      "php": ">=5.4",
+      "psr/log": "^1.0",
+      "aloframework/common": "^1.0"
+   },
+   "require-dev": {
+      "symfony/var-dumper": "^2.7"
+   },
+   "autoload": {
+      "psr-4": {
+         "AloFramework\\Log\\": "src/class/"
+      }
+   },
+   "extra": {
+      "branch-alias": {
+         "dev-master": "1.x-dev"
+      }
+   }
 }