Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 2bcb038

Browse files
committed
Merge branch 'hotfix/136'
Closes #136
2 parents 839966e + 019b656 commit 2bcb038

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5+
## 2.9.0 - TBD
6+
7+
### Added
8+
9+
- Nothing.
10+
11+
### Deprecated
12+
13+
- Nothing.
14+
15+
### Removed
16+
17+
- Nothing.
18+
19+
### Fixed
20+
21+
- Nothing.
22+
523
## 2.8.2 - TBD
624

725
### Added

src/File/Size.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ protected function fromByteString($size)
331331

332332
$value = substr($size, 0, -1);
333333
if (!is_numeric($value)) {
334-
$value = substr($value, 0, -1);
334+
$value = trim(substr($value, 0, -1));
335335
}
336336

337337
switch (strtoupper($type)) {

test/TimezoneTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function locationProvider()
7373
['Europe/Copenhagen', true],
7474
['Indian/Maldives', true],
7575

76-
['anast', false], // abbreviation of Anadyr Summer Time
76+
['cest', false], // abbreviation of Anadyr Summer Time
7777

7878
['Asia/London', false], // wrong location
7979
['', false], // empty string
@@ -115,14 +115,11 @@ public function testAbbreviationsByTypeAsString($value, $valid)
115115
public function abbreviationProvider()
116116
{
117117
return [
118-
['anast', true], // Anadyr Summer Time
119118
['bnt', true], // Brunei Darussalam Time
120119
['cest', true], // Central European Summer Time
121120
['easst', true], // Easter Island Summer Time
122121
['egst', true], // Eastern Greenland Summer Time
123122
['hkt', true], // Hong Kong Time
124-
['irkst', true], // Irkutsk Summer Time
125-
['krast', true], // Krasnoyarsk Summer Time
126123
['nzdt', true], // New Zealand Daylight Time
127124
['sast', true], // South Africa Standard Time
128125

@@ -188,8 +185,6 @@ public function locationAndAbbreviationProvider()
188185
['Australia/Broken_Hill', true],
189186

190187
['hkt', true], // Hong Kong Time
191-
['irkst', true], // Irkutsk Summer Time
192-
['krast', true], // Krasnoyarsk Summer Time
193188
['nzdt', true], // New Zealand Daylight Time
194189
['sast', true], // South Africa Standard Time
195190

0 commit comments

Comments
 (0)