Fixes #2490: attributes initialize to NULL instead of empty string or 0. Updated tests to reflect this

git-svn-id: http://code.elgg.org/elgg/trunk@7376 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 37 insertions, 37 deletions

diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
index 24c6859b1..97cf44392 100644
--- a/engine/tests/objects/entities.php
+++ b/engine/tests/objects/entities.php
@@ -26,16 +26,16 @@ class ElggCoreEntityTest extends ElggCoreUnitTest {
 	 */
 	public function testElggEntityAttributes() {
 		$test_attributes = array();
-		$test_attributes['guid'] = '';
-		$test_attributes['type'] = '';
-		$test_attributes['subtype'] = '';
+		$test_attributes['guid'] = NULL;
+		$test_attributes['type'] = NULL;
+		$test_attributes['subtype'] = NULL;
 		$test_attributes['owner_guid'] = get_loggedin_userid();
 		$test_attributes['container_guid'] = get_loggedin_userid();
-		$test_attributes['site_guid'] = 0;
+		$test_attributes['site_guid'] = NULL;
 		$test_attributes['access_id'] = ACCESS_PRIVATE;
-		$test_attributes['time_created'] = '';
-		$test_attributes['time_updated'] = '';
-		$test_attributes['last_action'] = '';
+		$test_attributes['time_created'] = NULL;
+		$test_attributes['time_updated'] = NULL;
+		$test_attributes['last_action'] = NULL;
 		$test_attributes['enabled'] = 'yes';
 		$test_attributes['tables_split'] = 1;
 		$test_attributes['tables_loaded'] = 0;
diff --git a/engine/tests/objects/objects.php b/engine/tests/objects/objects.php
index 479c83766..95f507695 100644
--- a/engine/tests/objects/objects.php
+++ b/engine/tests/objects/objects.php
@@ -38,21 +38,21 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
 
 	public function testElggObjectConstructor() {
 		$attributes = array();
-		$attributes['guid'] = '';
+		$attributes['guid'] = NULL;
 		$attributes['type'] = 'object';
-		$attributes['subtype'] = '';
+		$attributes['subtype'] = NULL;
 		$attributes['owner_guid'] = get_loggedin_userid();
 		$attributes['container_guid'] = get_loggedin_userid();
-		$attributes['site_guid'] = 0;
+		$attributes['site_guid'] = NULL;
 		$attributes['access_id'] = ACCESS_PRIVATE;
-		$attributes['time_created'] = '';
-		$attributes['time_updated'] = '';
-		$attributes['last_action'] = '';
+		$attributes['time_created'] = NULL;
+		$attributes['time_updated'] = NULL;
+		$attributes['last_action'] = NULL;
 		$attributes['enabled'] = 'yes';
 		$attributes['tables_split'] = 2;
 		$attributes['tables_loaded'] = 0;
-		$attributes['title'] = '';
-		$attributes['description'] = '';
+		$attributes['title'] = NULL;
+		$attributes['description'] = NULL;
 		ksort($attributes);
 
 		$entity_attributes = $this->entity->expose_attributes();
diff --git a/engine/tests/objects/sites.php b/engine/tests/objects/sites.php
index d8c458bc4..4d079c30f 100644
--- a/engine/tests/objects/sites.php
+++ b/engine/tests/objects/sites.php
@@ -41,22 +41,22 @@ class ElggCoreSiteTest extends ElggCoreUnitTest {
 	 */
 	public function testElggSiteConstructor() {
 		$attributes = array();
-		$attributes['guid'] = '';
+		$attributes['guid'] = NULL;
 		$attributes['type'] = 'site';
-		$attributes['subtype'] = '';
+		$attributes['subtype'] = NULL;
 		$attributes['owner_guid'] = get_loggedin_userid();
 		$attributes['container_guid'] = get_loggedin_userid();
-		$attributes['site_guid'] = 0;
+		$attributes['site_guid'] = NULL;
 		$attributes['access_id'] = ACCESS_PRIVATE;
-		$attributes['time_created'] = '';
-		$attributes['time_updated'] = '';
-		$attributes['last_action'] = '';
+		$attributes['time_created'] = NULL;
+		$attributes['time_updated'] = NULL;
+		$attributes['last_action'] = NULL;
 		$attributes['enabled'] = 'yes';
 		$attributes['tables_split'] = 2;
 		$attributes['tables_loaded'] = 0;
-		$attributes['name'] = '';
-		$attributes['description'] = '';
-		$attributes['url'] = '';
+		$attributes['name'] = NULL;
+		$attributes['description'] = NULL;
+		$attributes['url'] = NULL;
 		ksort($attributes);
 
 		$entity_attributes = $this->site->expose_attributes();
diff --git a/engine/tests/objects/users.php b/engine/tests/objects/users.php
index fe5b48b03..c0566c9b4 100644
--- a/engine/tests/objects/users.php
+++ b/engine/tests/objects/users.php
@@ -46,26 +46,26 @@ class ElggCoreUserTest extends ElggCoreUnitTest {
 	 */
 	public function testElggUserConstructor() {
 		$attributes = array();
-		$attributes['guid'] = '';
+		$attributes['guid'] = NULL;
 		$attributes['type'] = 'user';
-		$attributes['subtype'] = '';
+		$attributes['subtype'] = NULL;
 		$attributes['owner_guid'] = get_loggedin_userid();
 		$attributes['container_guid'] = get_loggedin_userid();
-		$attributes['site_guid'] = 0;
+		$attributes['site_guid'] = NULL;
 		$attributes['access_id'] = ACCESS_PRIVATE;
-		$attributes['time_created'] = '';
-		$attributes['time_updated'] = '';
-		$attributes['last_action'] = '';
+		$attributes['time_created'] = NULL;
+		$attributes['time_updated'] = NULL;
+		$attributes['last_action'] = NULL;
 		$attributes['enabled'] = 'yes';
 		$attributes['tables_split'] = 2;
 		$attributes['tables_loaded'] = 0;
-		$attributes['name'] = '';
-		$attributes['username'] = '';
-		$attributes['password'] = '';
-		$attributes['salt'] = '';
-		$attributes['email'] = '';
-		$attributes['language'] = '';
-		$attributes['code'] = '';
+		$attributes['name'] = NULL;
+		$attributes['username'] = NULL;
+		$attributes['password'] = NULL;
+		$attributes['salt'] = NULL;
+		$attributes['email'] = NULL;
+		$attributes['language'] = NULL;
+		$attributes['code'] = NULL;
 		$attributes['banned'] = 'no';
 		$attributes['admin'] = 'no';
 		ksort($attributes);