merge with origin

Author: intheair

doc/ChangeLog

@@ -16,6 +16,11 @@
 	test/main/Utils/AMQP/AMQPPeclTest.class.php:
 		added suppot for pecl amqp 1.0.4
 
+2012-09-06	Igor V. Gulyaev
+
+	* main/Base/Hstore.class.php
+		test/main/HstoreTest.class.php: fix hstore key exist check
+
 2012-08-28	Artem A. Naumenko
 
 	* main/Net/GenericUri.class.php: utf modifier added to RegExp pattern

main/Base/Hstore.class.php

@@ -85,7 +85,7 @@ public function drop($key)
 
 		public function isExists($key)
 		{
-			return isset($this->properties[$key]);
+			return key_exists($key, $this->properties);
 		}
 
 		/**

test/main/HstoreTest.class.php

@@ -16,11 +16,15 @@ public function testRun()
 			$array = array(
 				'1' => 'qqer',
 				'f' => 'qs34$9&)_@+#qer',
+				'null' => null
 			);
 
 			$test = Hstore::make($array);
 			$test2= Hstore::create($test->toString());
 
 			$this->assertEquals($test->toString(), $test2->toString());
+
+			$this->assertTrue($test->isExists('null'));
+			$this->assertFalse($test->isExists('notExist'));
 		}
 	}