Merge pull request #8 from michal-kocarek/tried-older-php-versions

Allow library to be used in PHP 5.5.

Author: Michal Kočárek

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 php:
+  - 5.5
   - 5.6
   - 7.0
   - hhvm

README.md

@@ -12,7 +12,7 @@ Here is a minimal example of a `composer.json` file that just defines a dependen
 
     {
         "require": {
-            "michal-kocarek/teamcity-messages": "^1.0"
+            "michal-kocarek/teamcity-messages": "^1.1"
         }
     }
 

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "michal-kocarek/teamcity-messages",
 	"description": "Write TeamCity service messages from PHP.",
-	"version": "1.0.0",
+	"version": "1.1.0",
 	"keywords": [
 		"teamcity"
 	],
@@ -14,10 +14,10 @@
 		}
 	],
 	"require": {
-		"php": ">=5.6"
+		"php": ">=5.5"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^5.2.9",
+		"phpunit/phpunit": "^4.8.9",
 		"satooshi/php-coveralls": "^1.0.1"
 	},
 	"autoload": {

src/Util.php

@@ -9,15 +9,6 @@
 
 class Util
 {
-    const ESCAPE_CHARACTER_MAP = [
-        '\'' => '|\'',
-        "\n" => '|n',
-        "\r" => '|r',
-        '|' => '||',
-        '[' => '|[',
-        ']' => '|]',
-    ];
-
     const TIMESTAMP_FORMAT = 'Y-m-d\TH:i:s.uO';
 
     /**
@@ -97,11 +88,26 @@ public static function formatTimestamp(DateTimeInterface $date = null)
      */
     private static function escape($value)
     {
-        return preg_replace_callback('/([\'\n\r|[\]])|\\\\u(\d{4})/', function($matches) {
+        $escapeCharacterMap = [
+            '\'' => '|\'',
+            "\n" => '|n',
+            "\r" => '|r',
+            '|' => '||',
+            '[' => '|[',
+            ']' => '|]',
+        ];
+
+        return preg_replace_callback(/**
+         * @param $matches
+         * @return mixed|string
+         */
+            '/([\'\n\r|[\]])|\\\\u(\d{4})/', function($matches) use($escapeCharacterMap) {
             if ($matches[1]) {
-                return self::ESCAPE_CHARACTER_MAP[$matches[1]];
+                return $escapeCharacterMap[$matches[1]];
             } elseif ($matches[2]) {
                 return '|0x'.$matches[2];
+            } else {
+                throw new LogicException('Unexpected match combination.');
             }
         }, $value);
     }

tests/MessageLoggerCallbacksTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Bileto\TeamcityMessages\Tests;
+namespace MichalKocarek\TeamcityMessages\Tests;
 
 use Exception;
 use LogicException;

tests/Writers/CallbackWriterTest.php

@@ -10,11 +10,13 @@
 class CallbackWriterTest extends PHPUnit_Framework_TestCase
 {
     /**
+     * Method accepts messages as an argument.
      * @dataProvider dataProviderWrite
-     * @param array $messages
      */
-    public function testWrite(...$messages)
+    public function testWrite(/* ...$messages */)
     {
+        $messages = func_get_args();
+        
         $result = '';
         $writer = new CallbackWriter(function($message) use(&$result) {
             $result .= $message;

tests/Writers/StdoutWriterTest.php

@@ -10,11 +10,13 @@
 class StdoutWriterTest extends PHPUnit_Framework_TestCase
 {
     /**
+     * Method accepts messages as an argument.
      * @dataProvider dataProviderWrite
-     * @param array $messages
      */
-    public function testWrite(...$messages)
+    public function testWrite(/* ...$messages */)
     {
+        $messages = func_get_args();
+
         $writer = new StdoutWriter();
 
         ob_start();