From d0b09f6bfa7aa0c085bd5f94da91f5e35e87fb0c Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sun, 17 Apr 2016 23:38:55 +0200
Subject: [PATCH 1/2] Object: removed alias for ObjectMixin, it may interfere
 with nette/deprecated, which creates alias Nette\ObjectMixin

---
 src/Utils/Object.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Utils/Object.php b/src/Utils/Object.php
index 82b0d2275..2c4428e44 100644
--- a/src/Utils/Object.php
+++ b/src/Utils/Object.php
@@ -8,7 +8,6 @@
 namespace Nette;
 
 use Nette;
-use Nette\Utils\ObjectMixin;
 
 
 /**
@@ -72,7 +71,7 @@ public static function getReflection()
 	 */
 	public function __call($name, $args)
 	{
-		return ObjectMixin::call($this, $name, $args);
+		return Nette\Utils\ObjectMixin::call($this, $name, $args);
 	}
 
 
@@ -85,7 +84,7 @@ public function __call($name, $args)
 	 */
 	public static function __callStatic($name, $args)
 	{
-		return ObjectMixin::callStatic(get_called_class(), $name, $args);
+		return Nette\Utils\ObjectMixin::callStatic(get_called_class(), $name, $args);
 	}
 
 
@@ -105,9 +104,9 @@ public static function extensionMethod($name, $callback = NULL)
 			$class = $rc->getName();
 		}
 		if ($callback === NULL) {
-			return ObjectMixin::getExtensionMethod($class, $name);
+			return Nette\Utils\ObjectMixin::getExtensionMethod($class, $name);
 		} else {
-			ObjectMixin::setExtensionMethod($class, $name, $callback);
+			Nette\Utils\ObjectMixin::setExtensionMethod($class, $name, $callback);
 		}
 	}
 
@@ -120,7 +119,7 @@ public static function extensionMethod($name, $callback = NULL)
 	 */
 	public function &__get($name)
 	{
-		return ObjectMixin::get($this, $name);
+		return Nette\Utils\ObjectMixin::get($this, $name);
 	}
 
 
@@ -133,7 +132,7 @@ public function &__get($name)
 	 */
 	public function __set($name, $value)
 	{
-		ObjectMixin::set($this, $name, $value);
+		Nette\Utils\ObjectMixin::set($this, $name, $value);
 	}
 
 
@@ -144,7 +143,7 @@ public function __set($name, $value)
 	 */
 	public function __isset($name)
 	{
-		return ObjectMixin::has($this, $name);
+		return Nette\Utils\ObjectMixin::has($this, $name);
 	}
 
 
@@ -156,7 +155,7 @@ public function __isset($name)
 	 */
 	public function __unset($name)
 	{
-		ObjectMixin::remove($this, $name);
+		Nette\Utils\ObjectMixin::remove($this, $name);
 	}
 
 }

From f6586f827292bd35c8593df943437f2247ba5337 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Thu, 21 Apr 2016 11:36:23 +0200
Subject: [PATCH 2/2] travis: fixed PHP 5.3

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d0039d1c6..981d82050 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 php:
-    - 5.3.3
+    - 5.3
     - 5.4
     - 5.5
     - 5.6