Skip to content

phpunitエラー修正 #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 21, 2017
Merged

phpunitエラー修正 #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9eab81
phpunitエラー修正
s-nakajima Jan 21, 2017
ebbfa27
Pageに関係ないところでNoticeがでるため、修正
s-nakajima Jan 21, 2017
10699a5
phpunitエラー修正
s-nakajima Jan 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Test/Case/Utility/NetCommonsTimeTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
}
Expand Down Expand Up @@ -252,4 +252,4 @@ public function testMethodChainUseMemory() {
echo memory_get_usage() . '/';
unset($instance1, $instance2);
}
}
}
2 changes: 1 addition & 1 deletion Utility/CurrentPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public function setTopPage() {
),
'order' => array('Page.lft' => 'asc')
));
Current::$current['TopPage'] = $result['Page'];
Current::$current['TopPage'] = Hash::get($result, 'Page');
}

/**
Expand Down
14 changes: 8 additions & 6 deletions Utility/NetCommonsTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,26 @@ 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;

/**
* サイトのデフォルトタイムゾーンを返す
*
* @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;
}

/**
Expand Down Expand Up @@ -172,4 +174,4 @@ public function getUserTimezone() {
}
return $userTimezone;
}
}
}