mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-14 04:30:29 +01:00
Code Issues Releases Wiki Activity

[ticket/12273] Fix method name of test and fix undefined index

Browse Source 
PHPBB3-12273
This commit is contained in:
Joas Schilling 2014-04-20 17:08:06 +02:00
parent 5889255529
commit a2c3b2534a
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/event/md_exporter.php
View File

@ -241,6 +241,11 @@ class md_exporter
$files = explode("\n + ", $file_details);
foreach ($files as $file)
{
if (!file_exists($this->root_path . $file))
{
throw new \LogicException("Invalid file '{$file}' not found for event '{$this->current_event}'", 1);
}
if (($this->filter !== 'adm') && strpos($file, 'styles/prosilver/template/') === 0)
{
$files_list['prosilver'][] = substr($file, strlen('styles/prosilver/template/'));
@ -312,6 +317,12 @@ class md_exporter
{
return true;
}
else if (empty($this->events_by_file[$file]))
{
$event_list = implode("', '", $events);
throw new \LogicException("File '{$file}' should not contain events, but contains: "
. "'{$event_list}'", 1);
}
else if (empty($events))
{
$event_list = implode("', '", $this->events_by_file[$file]);

6
tests/event/md_exporter_test.php
View File

@ -28,7 +28,7 @@ class phpbb_event_md_exporter_test extends phpbb_test_case
$this->assertGreaterThan(0, $exporter->crawl_eventsmd('docs/events.md', $filter));
}
static public function crawl_adm_files_data()
static public function crawl_template_file_data()
{
global $phpbb_root_path;
$exporter = new \phpbb\event\md_exporter($phpbb_root_path);
@ -52,9 +52,9 @@ class phpbb_event_md_exporter_test extends phpbb_test_case
}
/**
* @dataProvider crawl_adm_files_data
* @dataProvider crawl_template_file_data
*/
public function test_crawl_adm_files($filter, $file)
public function test_crawl_template_file($filter, $file)
{
global $phpbb_root_path;
$exporter = new \phpbb\event\md_exporter($phpbb_root_path);