Skip to content

Commit

Permalink
PHPCBF
Browse files Browse the repository at this point in the history
  • Loading branch information
mlewis-everley committed Jan 16, 2020
1 parent 77ecf3b commit 8dc6b32
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
14 changes: 8 additions & 6 deletions src/SystemMessages.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,18 @@ class SystemMessages extends ViewableData
*
* @return SystemMessage
*/
public function Message() {
public function Message()
{
return $this->OpenMessages()->first();
}

/**
* Get the most recent message and render into a template
*
*
* @return string HTML of the message
*/
public function RenderedMessage() {
public function RenderedMessage()
{
return $this->renderWith(
SystemMessage::class,
array(
Expand All @@ -49,7 +51,8 @@ public function RenderedMessage() {
);
}

public function OpenMessages() {
public function OpenMessages()
{
$now = DBDatetime::now()->Value;
$return = ArrayList::create();
$member = Member::currentUser();
Expand All @@ -72,5 +75,4 @@ public function OpenMessages() {

return $return;
}

}
}
5 changes: 2 additions & 3 deletions src/admin/SystemMessageAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use ilateral\SilverStripe\SystemMessages\SystemMessage;

/**
* Admin interface
* Admin interface
*
*/
class SystemMessageAdmin extends ModelAdmin
Expand All @@ -20,5 +20,4 @@ class SystemMessageAdmin extends ModelAdmin
private static $managed_models = array(
SystemMessage::class
);

}
}
2 changes: 1 addition & 1 deletion src/extensions/SystemMessageControllerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function closesystemmessage()
$member = Member::currentUser();
$action = $this->owner->request->getVars();

// If not a message then generate an error
// If not a message then generate an error
if (!$message) {
return $this->owner->httpError(500);
}
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/SystemMessageMemberExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ class SystemMessageMemberExtension extends Extension
private static $many_many = array(
"ClosedMessages" => SystemMessage::class
);
}
}
2 changes: 1 addition & 1 deletion tests/SystemMessageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ public function testNotStarted()

DBDatetime::clear_mock_now();
}
}
}

0 comments on commit 8dc6b32

Please sign in to comment.