Skip to content

Commit 28151dc

Browse files
authored
Merge pull request #2329 from XWB/alpha4
Prepare beta 1 release
2 parents b6aff31 + 22027d9 commit 28151dc

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Changelog
22
=========
33

4-
### 2.0.0-alpha4 (2016-xx-xx)
4+
### 2.0.0-beta1 (2016-11-29)
55

66
* Dropped Symfony < 2.7 support.
77
* Dropped PHP < 5.5 support.

Model/User.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function unserialize($serialized)
155155
unset($data[4], $data[5], $data[6], $data[9], $data[10]);
156156
$data = array_values($data);
157157
} elseif (11 === count($data)) {
158-
// Unserializing a User from a dev version somewhere between 2.0-alpha3 and 2.0-alpha4
158+
// Unserializing a User from a dev version somewhere between 2.0-alpha3 and 2.0-beta1
159159
unset($data[4], $data[7], $data[8]);
160160
$data = array_values($data);
161161
}

Upgrade.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Upgrade instruction
44
This document describes the changes needed when upgrading because of a BC
55
break. For the full list of changes, please look at the Changelog file.
66

7-
## 2.0.0-alpha3 to 2.0.0-alpha4
7+
## 2.0.0-alpha3 to 2.0.0-beta1
88

99
Methods and properties removed from `FOS\UserBundle\Model\User`
1010

0 commit comments

Comments
 (0)