Merge pull request #6 from vadimjustus/master

Fixes #5 - Getting ready for PHP 7

.travis.yml

@@ -6,12 +6,7 @@ php:
   - 5.5
   - 5.4
 
-matrix:
-  allow_failures:
-    - php: 7.0
-
 before_install:
-  - pecl install pthreads-2.0.10
   - pecl install xdebug
   - phpenv rehash
   - wget https://scrutinizer-ci.com/ocular.phar

build.default.properties

@@ -8,4 +8,4 @@
 #--------------------------------------------------------------------------------
 
 # ---- Module Release Settings --------------------------------------------------
-release.version = 2.0.0
+release.version = 3.0.0

composer.json

@@ -1,40 +1,41 @@
 {
-	"name" : "appserver-io/properties",
-	"type" : "package",
-	"description" : "Package that provides basic functionality to handle property files.",
-	"homepage" : "https://github.com/appserver-io/properties",
-	"license" : "OSL-3.0",
-	"require" : {
-		"php" : ">=5.4.0",
-		"appserver-io/collections" : "~1.0",
-        "appserver-io/lang" : "~1.0"
-	},
-	"require-dev" : {
-		"appserver-io/build" : "~1.0"
-	},
-	"autoload" : {
-		"psr-0" : {
-			"AppserverIo\\Properties" : [
-				"src/",
-				"tests/"
-			]
-		}
-	},
-	"authors" : [{
-			"name" : "Tim Wagner",
-			"email" : "tw@appserver.io",
-			"homepage" : "https://github.com/wagnert",
-			"role" : "Developer"
-		}
-	],
-	"support" : {
-		"email" : "t.wagner@techdivision.com",
-		"issues" : "https://github.com/appserver-io/properties/issues",
-		"source" : "https://github.com/appserver-io/properties"
-	},
-	"keywords" : [
-		"properties",
-		"resources",
-		"settings"
-	]
+    "name": "appserver-io/properties",
+    "type": "package",
+    "description": "Package that provides basic functionality to handle property files.",
+    "homepage": "https://github.com/appserver-io/properties",
+    "license": "OSL-3.0",
+    "require": {
+        "php": ">=5.4.0 <8.0",
+        "appserver-io/collections": "~2.0",
+        "appserver-io/lang": "~3.0"
+    },
+    "require-dev": {
+        "appserver-io/build": "~1.0"
+    },
+    "autoload": {
+        "psr-0": {
+            "AppserverIo\\Properties": [
+                "src/",
+                "tests/"
+            ]
+        }
+    },
+    "authors": [
+        {
+            "name": "Tim Wagner",
+            "email": "tw@appserver.io",
+            "homepage": "https://github.com/wagnert",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "email": "t.wagner@techdivision.com",
+        "issues": "https://github.com/appserver-io/properties/issues",
+        "source": "https://github.com/appserver-io/properties"
+    },
+    "keywords": [
+        "properties",
+        "resources",
+        "settings"
+    ]
 }

src/AppserverIo/Properties/Properties.php

@@ -20,7 +20,7 @@
 
 namespace AppserverIo\Properties;
 
-use AppserverIo\Lang\String;
+use AppserverIo\Lang\Strng;
 use AppserverIo\Lang\NullPointerException;
 use AppserverIo\Collections\HashMap;
 use Metadata\MergeableClassMetadata;
@@ -266,7 +266,7 @@ public function __toString()
      */
     public function toString()
     {
-        return new String($this->__toString());
+        return new Strng($this->__toString());
     }
 
     /**