From a02562d9b08236bdb5a2ca21015f48ca00a7f1f2 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Wed, 17 Jun 2009 07:07:57 -0400 Subject: [PATCH] remove unnecessary variable --- classes/views/ComicPressSidebarStandard.php | 10 +++++----- test/ComicPressSidebarStandardTest.php | 12 +++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/classes/views/ComicPressSidebarStandard.php b/classes/views/ComicPressSidebarStandard.php index c234b3e..56214ab 100644 --- a/classes/views/ComicPressSidebarStandard.php +++ b/classes/views/ComicPressSidebarStandard.php @@ -15,18 +15,18 @@ class ComicPressSidebarStandard extends ComicPressView { function _all_comic_dates_ok() { global $comicpress_manager; - $this->all_comic_dates_ok = true; - $this->all_comic_dates = array(); + $all_comic_dates_ok = true; + $all_comic_dates = array(); foreach ($comicpress_manager->comic_files as $comic_file) { if (($result = $comicpress_manager->breakdown_comic_filename(pathinfo($comic_file, PATHINFO_BASENAME))) !== false) { - if (isset($this->all_comic_dates[$result['date']])) { $this->all_comic_dates_ok = false; break; } - $this->all_comic_dates[$result['date']] = true; + if (isset($all_comic_dates[$result['date']])) { $all_comic_dates_ok = false; break; } + $all_comic_dates[$result['date']] = true; } } $this->too_many_comics_message = ""; - if ($this->all_comic_dates_ok) { + if (!$all_comic_dates_ok) { $this->too_many_comics_message = ", " . __("multiple files on the same date!", 'comicpress-manager') . ""; } } diff --git a/test/ComicPressSidebarStandardTest.php b/test/ComicPressSidebarStandardTest.php index ba76230..388c27f 100644 --- a/test/ComicPressSidebarStandardTest.php +++ b/test/ComicPressSidebarStandardTest.php @@ -15,7 +15,7 @@ class ComicPressSidebarStandardTest extends PHPUnit_Framework_TestCase { $v = new ComicPressSidebarStandard(); $v->_all_comic_dates_ok(); - $this->assertTrue($v->all_comic_dates_ok); + $this->assertTrue(empty($v->too_many_comics_message)); // one comic $comicpress_manager = $this->getMock('ComicPressManager', array('breakdown_comic_filename')); @@ -24,7 +24,7 @@ class ComicPressSidebarStandardTest extends PHPUnit_Framework_TestCase { $v = new ComicPressSidebarStandard(); $v->_all_comic_dates_ok(); - $this->assertTrue($v->all_comic_dates_ok); + $this->assertTrue(empty($v->too_many_comics_message)); // two comics @@ -34,7 +34,7 @@ class ComicPressSidebarStandardTest extends PHPUnit_Framework_TestCase { $v = new ComicPressSidebarStandard(); $v->_all_comic_dates_ok(); - $this->assertFalse($v->all_comic_dates_ok); + $this->assertTrue(!empty($v->too_many_comics_message)); } function providerTestThumbnailGenerationInfo() { @@ -112,6 +112,12 @@ class ComicPressSidebarStandardTest extends PHPUnit_Framework_TestCase { $this->assertTrue(!empty($result)); $this->assertEquals($info['result'], $result); } + + function testRender() { + global $comicpress_manager; + + // + } } ?> \ No newline at end of file