Skip to content

Commit

Permalink
Merge branch 'release/1.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikaelcom committed Apr 9, 2019
2 parents 97112e2 + d14fc98 commit 6a450af
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# CHANGELOG

## 1.2.2
- Merged PR #9

## 1.2.1
- Fixed issue #7

Expand Down
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
{
"name": "NtlBldrv",
"role": "Contributor"
},
{
"name": "baijunyao",
"email": "[email protected]",
"role": "Contributor"
}
],
"support" : {
Expand Down
6 changes: 3 additions & 3 deletions src/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,13 @@ public function setNonceValue($nonceValue)
}

/**
* @param mixed $formated
* @param mixed $formatted
*
* @return int|string
*/
public function getTimestampValue($formated = false)
public function getTimestampValue($formatted = false)
{
return ($formated && $this->timestampValue > 0) ? gmdate('Y-m-d\TH:i:s\Z', $this->timestampValue) : $this->timestampValue;
return ($formatted && $this->timestampValue > 0) ? gmdate('Y-m-d\TH:i:s\Z', $this->timestampValue) : $this->timestampValue;
}

/**
Expand Down

0 comments on commit 6a450af

Please sign in to comment.