diff --git a/Test/Case/Utility/NetCommonsTimeTest.php b/Test/Case/Utility/NetCommonsTimeTest.php index bc707f18..6350efe1 100644 --- a/Test/Case/Utility/NetCommonsTimeTest.php +++ b/Test/Case/Utility/NetCommonsTimeTest.php @@ -177,7 +177,7 @@ public function testToServerDatetimeArray() { * @return void */ public function testGetSiteTimezone() { - $siteTimezoneProperty = new ReflectionProperty('NetCommonsTime', '_siteTimezone'); + $siteTimezoneProperty = new ReflectionProperty('NetCommonsTime', 'siteTimezone'); $siteTimezoneProperty->setAccessible(true); $siteTimezoneProperty->setValue(null); @@ -197,7 +197,7 @@ public function testGetSiteTimezone() { $method->invoke($netCommonsTime); // 2回目はSiteSettingを呼び出さない - $siteTimezoneProperty = new ReflectionProperty('NetCommonsTime', '_siteTimezone'); + $siteTimezoneProperty = new ReflectionProperty('NetCommonsTime', 'siteTimezone'); $siteTimezoneProperty->setAccessible(true); $siteTimezoneProperty->setValue(null); } @@ -252,4 +252,4 @@ public function testMethodChainUseMemory() { echo memory_get_usage() . '/'; unset($instance1, $instance2); } -} \ No newline at end of file +} diff --git a/Utility/CurrentPage.php b/Utility/CurrentPage.php index 1fbc72cc..15a24bb6 100644 --- a/Utility/CurrentPage.php +++ b/Utility/CurrentPage.php @@ -215,7 +215,7 @@ public function setTopPage() { ), 'order' => array('Page.lft' => 'asc') )); - Current::$current['TopPage'] = $result['Page']; + Current::$current['TopPage'] = Hash::get($result, 'Page'); } /** diff --git a/Utility/NetCommonsTime.php b/Utility/NetCommonsTime.php index 16e4fbf3..279b853f 100644 --- a/Utility/NetCommonsTime.php +++ b/Utility/NetCommonsTime.php @@ -37,12 +37,14 @@ class NetCommonsTime { /** * @var int 現在日時 unixtime */ - static protected $_now = null; + protected static $_now = null; /** + * Unitテストで自由に変更できるようするため、publicにする + * * @var string サイトデフォルトタイムゾーン */ - static protected $_siteTimezone = null; + public static $siteTimezone = null; /** * サイトのデフォルトタイムゾーンを返す @@ -50,11 +52,11 @@ class NetCommonsTime { * @return string タイムゾーン */ public function getSiteTimezone() { - if (self::$_siteTimezone === null) { + if (self::$siteTimezone === null) { $SiteSetting = ClassRegistry::init('SiteManager.SiteSetting'); - self::$_siteTimezone = $SiteSetting->getSiteTimezone(); + self::$siteTimezone = $SiteSetting->getSiteTimezone(); } - return self::$_siteTimezone; + return self::$siteTimezone; } /** @@ -172,4 +174,4 @@ public function getUserTimezone() { } return $userTimezone; } -} \ No newline at end of file +}