diff options
Diffstat (limited to 'tests')
21 files changed, 30 insertions, 30 deletions
diff --git a/tests/cache/cache_memory_test.php b/tests/cache/cache_memory_test.php index 9f92e8d8dc..ba1010bcf3 100644 --- a/tests/cache/cache_memory_test.php +++ b/tests/cache/cache_memory_test.php @@ -116,7 +116,7 @@ class phpbb_cache_memory_test extends phpbb_database_test_case  				$results[] = $row;  			}  			$this->cache->sql_freeresult($query_id); -			$this->assertEquals($query[1], sizeof($results)); +			$this->assertEquals($query[1], count($results));  		}  		$this->cache->destroy('sql', $table); diff --git a/tests/cron/manager_test.php b/tests/cron/manager_test.php index f4dd69b19b..76f8c753bf 100644 --- a/tests/cron/manager_test.php +++ b/tests/cron/manager_test.php @@ -40,7 +40,7 @@ class phpbb_cron_manager_test extends \phpbb_test_case  	public function test_manager_finds_all_ready_tasks()  	{  		$tasks = $this->manager->find_all_ready_tasks(); -		$this->assertEquals(3, sizeof($tasks)); +		$this->assertEquals(3, count($tasks));  	}  	public function test_manager_finds_one_ready_task() diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index 98709fb043..4fa5cc37a2 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -67,7 +67,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case  		$result = $db->sql_query($sql);  		$rows = $db->sql_fetchrowset($result); -		$this->assertEquals(1, sizeof($rows)); +		$this->assertEquals(1, count($rows));  		$this->assertEquals('config2', $rows[0]['config_name']);  		$db->sql_freeresult($result); diff --git a/tests/error_collector_test.php b/tests/error_collector_test.php index 273284c8fc..8ed89bbe52 100644 --- a/tests/error_collector_test.php +++ b/tests/error_collector_test.php @@ -52,8 +52,8 @@ class phpbb_error_collector_test extends phpbb_test_case  		1/0; $line = __LINE__;  		// Cause a notice -		$array = array('ITEM' => 'value'); -		$value = $array[ITEM]; $line2 = __LINE__; +		$array = array(0 => 'value'); +		$value = $array[1]; $line2 = __LINE__;  		$collector->uninstall(); diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php index 607f442fdf..2eeb48ea05 100644 --- a/tests/event/md_exporter_test.php +++ b/tests/event/md_exporter_test.php @@ -92,7 +92,7 @@ class phpbb_event_md_exporter_test extends phpbb_test_case  	public function test_crawl_eventsmd($file, $min_version, $max_version, $events)  	{  		$exporter = new \phpbb\event\md_exporter(dirname(__FILE__) . '/fixtures/', null, $min_version, $max_version); -		$this->assertSame(sizeof($events), $exporter->crawl_eventsmd($file, 'adm')); +		$this->assertSame(count($events), $exporter->crawl_eventsmd($file, 'adm'));  		$this->assertEquals($events, $exporter->get_events());  	} @@ -146,7 +146,7 @@ class phpbb_event_md_exporter_test extends phpbb_test_case  		$exporter->crawl_eventsmd('docs/events.md', $filter);  		$events = $exporter->crawl_file_for_events($file); -		$this->assertGreaterThanOrEqual(0, sizeof($events)); +		$this->assertGreaterThanOrEqual(0, count($events));  		$this->assertTrue($exporter->validate_events_from_file($file, $events));  	}  } diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 8a71a5ce04..e980c5a04b 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -26,7 +26,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case  	{  		parent::setUpBeforeClass(); -		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper = new phpbb_test_case_helpers(__CLASS__);  		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/../extension/ext/', self::$fixtures);  	} diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 18eb9ad4c6..58c3878b8b 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -34,7 +34,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c  	{  		parent::setUpBeforeClass(); -		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper = new phpbb_test_case_helpers(__CLASS__);  		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);  	} diff --git a/tests/functional/extension_global_lang_test.php b/tests/functional/extension_global_lang_test.php index f615114c08..a1e2547745 100644 --- a/tests/functional/extension_global_lang_test.php +++ b/tests/functional/extension_global_lang_test.php @@ -30,7 +30,7 @@ class phpbb_functional_extension_global_lang_test extends phpbb_functional_test_  	{  		parent::setUpBeforeClass(); -		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper = new phpbb_test_case_helpers(__CLASS__);  		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);  	} diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index 95107665cd..d3a66b9b35 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -29,7 +29,7 @@ class phpbb_functional_extension_module_test extends phpbb_functional_test_case  	{  		parent::setUpBeforeClass(); -		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper = new phpbb_test_case_helpers(__CLASS__);  		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);  	} diff --git a/tests/functional/extension_permission_lang_test.php b/tests/functional/extension_permission_lang_test.php index 92d8d596c7..f570d45215 100644 --- a/tests/functional/extension_permission_lang_test.php +++ b/tests/functional/extension_permission_lang_test.php @@ -30,7 +30,7 @@ class phpbb_functional_extension_permission_lang_test extends phpbb_functional_t  	{  		parent::setUpBeforeClass(); -		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper = new phpbb_test_case_helpers(__CLASS__);  		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);  	} diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php index 88f8999005..426ebcee53 100644 --- a/tests/functional/fileupload_remote_test.php +++ b/tests/functional/fileupload_remote_test.php @@ -102,7 +102,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case  			->set_allowed_extensions(array('gif'))  			->set_max_filesize(2000);  		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/test.gif'); -		$this->assertEquals(0, sizeof($file->error)); +		$this->assertEquals(0, count($file->error));  		$this->assertTrue(file_exists($file->get('filename')));  		$this->assertTrue($file->is_uploaded());  	} @@ -115,7 +115,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case  			->set_allowed_extensions(array('gif'))  			->set_max_filesize(100);  		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/test.gif'); -		$this->assertEquals(1, sizeof($file->error)); +		$this->assertEquals(1, count($file->error));  		$this->assertEquals('WRONG_FILESIZE', $file->error[0]);  	}  } diff --git a/tests/functional/metadata_manager_test.php b/tests/functional/metadata_manager_test.php index 0d2fdf082e..8456c40f00 100644 --- a/tests/functional/metadata_manager_test.php +++ b/tests/functional/metadata_manager_test.php @@ -35,7 +35,7 @@ class phpbb_functional_metadata_manager_test extends phpbb_functional_test_case  	{  		parent::setUpBeforeClass(); -		self::$helper = new phpbb_test_case_helpers(self); +		self::$helper = new phpbb_test_case_helpers(__CLASS__);  		self::$helper->copy_ext_fixtures(dirname(__FILE__) . '/fixtures/ext/', self::$fixtures);  	} diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php index 1550aa37e6..75e5a6dc61 100644 --- a/tests/functions/get_remote_file_test.php +++ b/tests/functions/get_remote_file_test.php @@ -58,7 +58,7 @@ class phpbb_functions_get_remote_file extends phpbb_test_case  		$this->assertGreaterThanOrEqual(  			2, -			sizeof($lines), +			count($lines),  			'Failed asserting that the version file has at least two lines.'  		); diff --git a/tests/mock/sql_insert_buffer.php b/tests/mock/sql_insert_buffer.php index c751764d45..e57983684d 100644 --- a/tests/mock/sql_insert_buffer.php +++ b/tests/mock/sql_insert_buffer.php @@ -15,7 +15,7 @@ class phpbb_mock_sql_insert_buffer extends \phpbb\db\sql_insert_buffer  {  	public function flush()  	{ -		return (sizeof($this->buffer)) ? true : false; +		return (count($this->buffer)) ? true : false;  	}  	public function get_buffer() diff --git a/tests/notification/base.php b/tests/notification/base.php index b64e25cf8c..80b9a0d777 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -163,7 +163,7 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case  			'order_dir'		=> 'ASC',  		), $options)); -		$this->assertEquals(sizeof($expected), $notifications['unread_count']); +		$this->assertEquals(count($expected), $notifications['unread_count']);  		$i = 0;  		foreach ($notifications['notifications'] as $notification) diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index b7386e9a3e..df7c669865 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -229,7 +229,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test  	{  		// http://stackoverflow.com/questions/3838288/phpunit-assert-two-arrays-are-equal-but-order-of-elements-not-important  		// but one array_diff is not enough! -		if (sizeof(array_diff($one, $two)) || sizeof(array_diff($two, $one))) +		if (count(array_diff($one, $two)) || count(array_diff($two, $one)))  		{  			// get a nice error message  			$this->assertEquals($one, $two); diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index 147029d699..b58e9c752b 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -621,7 +621,7 @@ class phpbb_database_test_connection_manager  				}  				// Combine all of the SETVALs into one query -				if (sizeof($setval_queries)) +				if (count($setval_queries))  				{  					$queries[] = 'SELECT ' . implode(', ', $setval_queries);  				} diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index c9943c4302..2d8224f7dc 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -425,7 +425,7 @@ class phpbb_functional_test_case extends phpbb_test_case  		$meta_refresh = $crawler->filter('meta[http-equiv="refresh"]');  		// Wait for extension to be fully enabled -		while (sizeof($meta_refresh)) +		while (count($meta_refresh))  		{  			preg_match('#url=.+/(adm+.+)#', $meta_refresh->attr('content'), $match);  			$url = $match[1]; @@ -990,7 +990,7 @@ class phpbb_functional_test_case extends phpbb_test_case  		$this->assertEquals(  			1, -			sizeof($result), +			count($result),  			$message ?: 'Failed asserting that exactly one checkbox with name' .  				" $name exists in crawler scope."  		); diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php index b875d3212b..d38d14f45c 100644 --- a/tests/test_framework/phpbb_ui_test_case.php +++ b/tests/test_framework/phpbb_ui_test_case.php @@ -317,7 +317,7 @@ class phpbb_ui_test_case extends phpbb_test_case  			$meta_refresh = $this->find_element('cssSelector', 'meta[http-equiv="refresh"]');  			// Wait for extension to be fully enabled -			while (sizeof($meta_refresh)) +			while (count($meta_refresh))  			{  				preg_match('#url=.+/(adm+.+)#', $meta_refresh->getAttribute('content'), $match);  				$this->getDriver()->execute(array('method' => 'post', 'url' => $match[1])); diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php index fb72823f08..5b3357237d 100644 --- a/tests/upload/fileupload_test.php +++ b/tests/upload/fileupload_test.php @@ -173,7 +173,7 @@ class phpbb_fileupload_test extends phpbb_test_case  			->set_max_filesize(1000);  		$file = $this->gen_valid_filespec();  		$upload->common_checks($file); -		$this->assertEquals(0, sizeof($file->error)); +		$this->assertEquals(0, count($file->error));  	}  	public function test_local_upload() @@ -184,7 +184,7 @@ class phpbb_fileupload_test extends phpbb_test_case  		copy($this->path . 'jpg', $this->path . 'jpg.jpg');  		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg'); -		$this->assertEquals(0, sizeof($file->error)); +		$this->assertEquals(0, count($file->error));  		$this->assertFalse($file->additional_checks());  		$this->assertTrue($file->move_file('../tests/upload/fixture/copies', true));  		$file->remove(); @@ -198,10 +198,10 @@ class phpbb_fileupload_test extends phpbb_test_case  		copy($this->path . 'jpg', $this->path . 'jpg.jpg');  		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg'); -		$this->assertEquals(0, sizeof($file->error)); +		$this->assertEquals(0, count($file->error));  		$this->assertFalse($file->move_file('../tests/upload/fixture'));  		$this->assertFalse($file->get('file_moved')); -		$this->assertEquals(1, sizeof($file->error)); +		$this->assertEquals(1, count($file->error));  	}  	public function test_move_existent_file_overwrite() @@ -213,9 +213,9 @@ class phpbb_fileupload_test extends phpbb_test_case  		copy($this->path . 'jpg', $this->path . 'jpg.jpg');  		copy($this->path . 'jpg', $this->path . 'copies/jpg.jpg');  		$file = $upload->handle_upload('files.types.local', $this->path . 'jpg.jpg'); -		$this->assertEquals(0, sizeof($file->error)); +		$this->assertEquals(0, count($file->error));  		$file->move_file('../tests/upload/fixture/copies', true); -		$this->assertEquals(0, sizeof($file->error)); +		$this->assertEquals(0, count($file->error));  		unlink($this->path . 'copies/jpg.jpg');  	} diff --git a/tests/wrapper/version_compare_test.php b/tests/wrapper/version_compare_test.php index 8260d99504..ee23fe779c 100644 --- a/tests/wrapper/version_compare_test.php +++ b/tests/wrapper/version_compare_test.php @@ -66,7 +66,7 @@ class phpbb_wrapper_version_compare_test extends phpbb_test_case  			'3.2-A1',  		); -		for ($i = 0, $size = sizeof($releases); $i < $size - 1; ++$i) +		for ($i = 0, $size = count($releases); $i < $size - 1; ++$i)  		{  			$version1 = $releases[$i];  			$version2 = $releases[$i + 1];  | 
