Merge branch 'develop' into feature/refactoring

Conflicts:
	tests/Enum/EnumTest.php

Author: Petr Knap

src/Enum/AbstractEnum.php

@@ -164,7 +164,7 @@ public static function getEnumByValue($value)
     {
         foreach (self::getMembers() as $n => $v) {
             if ($value === $v) {
-                return self::__callStatic($n, []);
+                return self::__callStatic($n, array());
             }
         }
         throw new EnumNotFoundException(

tests/Enum/EnumTest.php

@@ -23,11 +23,11 @@ public function testCallStaticsWorks($name, $expectedValue)
 
     public function dataCallStaticsWorks()
     {
-        return [
-            ["MY_TRUE", 1],
-            ["MY_FALSE", 2],
-            ["MY_NULL", new EnumNotFoundException()]
-        ];
+        return array(
+            array("MY_TRUE", 1),
+            array("MY_FALSE", 2),
+            array("MY_NULL", new EnumNotFoundException())
+        );
     }
 
     /**
@@ -46,11 +46,11 @@ public function testGetEnumByValueWorks($value, $expectedEnum)
 
     public function dataGetEnumByValueWorks()
     {
-        return [
-            [1, MyBoolean::MY_TRUE()],
-            [2, MyBoolean::MY_FALSE()],
-            [3, new EnumNotFoundException()]
-        ];
+        return array(
+            array(1, MyBoolean::MY_TRUE()),
+            array(2, MyBoolean::MY_FALSE()),
+            array(3, new EnumNotFoundException())
+        );
     }
 
     public function testComparableWorks()
@@ -64,10 +64,10 @@ public function testComparableWorks()
 
     public function testGetMembersWorks()
     {
-        $this->assertEquals([
+        $this->assertEquals(array(
             "MY_TRUE" => 1,
             "MY_FALSE" => 2
-        ], MyBoolean::getMembers());
+        ), MyBoolean::getMembers());
     }
 
     /**
@@ -85,9 +85,9 @@ public function testToStringWorks($enum, $expectedString)
 
     public function dataToStringWorks()
     {
-        return [
-            [MyBoolean::MY_TRUE(), MyBoolean::getClass() . "::MY_TRUE"],
-            [MyBoolean::MY_FALSE(), MyBoolean::getClass() . "::MY_FALSE"],
-        ];
+        return array(
+            array(MyBoolean::MY_TRUE(), MyBoolean::getClass() . "::MY_TRUE"),
+            array(MyBoolean::MY_FALSE(), MyBoolean::getClass() . "::MY_FALSE")
+        );
     }
 }