Skip to content

Commit 94bc5ee

Browse files
roberthuntroberthunt
authored
Merge pull request #142 from NottingHack/upgrade-fixes
Upgrade fixes
2 parents dda49a3 + 1579f25 commit 94bc5ee

File tree

16 files changed

+116
-72
lines changed

16 files changed

+116
-72
lines changed

‎app/HMS/Entities/Banking/Account.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace HMS\Entities\Banking;
44

5+
use Doctrine\Common\Collections\ArrayCollection;
6+
57
class Account
68
{
79
/**
@@ -15,7 +17,7 @@ class Account
1517
protected $paymentRef;
1618

1719
/**
18-
* @var string
20+
* @var ?string
1921
*/
2022
protected $natwestRef;
2123

@@ -38,7 +40,7 @@ public function __construct($paymentRef)
3840
*
3941
* @return mixed
4042
*/
41-
public function getId()
43+
public function getId(): int
4244
{
4345
return $this->id;
4446
}
@@ -48,7 +50,7 @@ public function getId()
4850
*
4951
* @return mixed
5052
*/
51-
public function getPaymentRef()
53+
public function getPaymentRef(): string
5254
{
5355
return $this->paymentRef;
5456
}
@@ -60,7 +62,7 @@ public function getPaymentRef()
6062
*
6163
* @return self
6264
*/
63-
protected function setPaymentRef($paymentRef)
65+
protected function setPaymentRef(string $paymentRef): Account
6466
{
6567
$this->paymentRef = $paymentRef;
6668

@@ -72,7 +74,7 @@ protected function setPaymentRef($paymentRef)
7274
*
7375
* @return mixed
7476
*/
75-
public function getNatwestRef()
77+
public function getNatwestRef(): ?string
7678
{
7779
return $this->natwestRef;
7880
}

‎app/HMS/Entities/Invite.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Invite
2222
protected $email;
2323

2424
/**
25-
* @var string invite token
25+
* @var ?string invite token
2626
*/
2727
protected $inviteToken;
2828

@@ -57,16 +57,16 @@ public function getId()
5757
/**
5858
* @return string
5959
*/
60-
public function getEmail()
60+
public function getEmail(): string
6161
{
6262
return $this->email;
6363
}
6464

6565
/**
6666
* Get the token value.
67-
* @return string
67+
* @return ?string
6868
*/
69-
public function getInviteToken()
69+
public function getInviteToken(): ?string
7070
{
7171
return $this->inviteToken;
7272
}

‎app/HMS/Entities/Link.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Link implements ArrayableContract
2828
protected $link;
2929

3030
/**
31-
* @var string
31+
* @var ?string
3232
*/
3333
protected $description;
3434

‎app/HMS/Entities/Meta.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function create($key)
3838
*
3939
* @return string
4040
*/
41-
public function getKey()
41+
public function getKey(): string
4242
{
4343
return $this->key;
4444
}
@@ -48,7 +48,7 @@ public function getKey()
4848
*
4949
* @return string
5050
*/
51-
public function getValue()
51+
public function getValue(): string
5252
{
5353
return $this->value;
5454
}
@@ -60,7 +60,7 @@ public function getValue()
6060
*
6161
* @return self
6262
*/
63-
public function setValue($value)
63+
public function setValue($value): Meta
6464
{
6565
$this->value = $value;
6666

‎app/HMS/Entities/PasswordReset.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PasswordReset
2626
*
2727
* @return string
2828
*/
29-
public function getEmail()
29+
public function getEmail(): string
3030
{
3131
return $this->email;
3232
}
@@ -38,7 +38,7 @@ public function getEmail()
3838
*
3939
* @return self
4040
*/
41-
public function setEmail($email)
41+
public function setEmail($email): PasswordReset
4242
{
4343
$this->email = $email;
4444

@@ -50,7 +50,7 @@ public function setEmail($email)
5050
*
5151
* @return string
5252
*/
53-
public function getToken()
53+
public function getToken(): string
5454
{
5555
return $this->token;
5656
}
@@ -62,7 +62,7 @@ public function getToken()
6262
*
6363
* @return self
6464
*/
65-
public function setToken($token)
65+
public function setToken($token): PasswordReset
6666
{
6767
$this->token = $token;
6868

@@ -74,7 +74,7 @@ public function setToken($token)
7474
*
7575
* @return Carbon
7676
*/
77-
public function getCreated()
77+
public function getCreated(): Carbon
7878
{
7979
return $this->created;
8080
}
@@ -86,7 +86,7 @@ public function getCreated()
8686
*
8787
* @return self
8888
*/
89-
public function setCreated(Carbon $created)
89+
public function setCreated(Carbon $created): PasswordReset
9090
{
9191
$this->created = $created;
9292

‎app/HMS/Entities/Profile.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,11 @@ public function setContactNumber(?string $contactNumber): Profile
271271
*/
272272
public function getDateOfBirth(): ?Carbon
273273
{
274-
return Carbon::instance($this->dateOfBirth);
274+
if ($this->dateOfBirth) {
275+
return Carbon::instance($this->dateOfBirth);
276+
}
277+
278+
return null;
275279
}
276280

277281
/**

‎app/HMS/Entities/Role.php‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ class Role implements RoleContract
5353
protected $users;
5454

5555
/**
56-
* @var string Team email address
56+
* @var ?string Team email address
5757
*/
5858
protected $email;
5959

6060
/**
61-
* @var string Team slack channel
61+
* @var ?string Team slack channel
6262
*/
6363
protected $slackChannel;
6464

@@ -93,15 +93,15 @@ public function getId()
9393
/**
9494
* @return string
9595
*/
96-
public function getName()
96+
public function getName(): string
9797
{
9898
return $this->name;
9999
}
100100

101101
/**
102102
* @return string
103103
*/
104-
public function getDisplayName()
104+
public function getDisplayName(): string
105105
{
106106
return $this->displayName;
107107
}
@@ -110,7 +110,7 @@ public function getDisplayName()
110110
* @param string $displayName
111111
* @return self
112112
*/
113-
public function setDisplayName($displayName)
113+
public function setDisplayName($displayName): Role
114114
{
115115
$this->displayName = $displayName;
116116

@@ -120,7 +120,7 @@ public function setDisplayName($displayName)
120120
/**
121121
* @return string
122122
*/
123-
public function getDescription()
123+
public function getDescription(): string
124124
{
125125
return $this->description;
126126
}
@@ -129,7 +129,7 @@ public function getDescription()
129129
* @param string $description
130130
* @return self
131131
*/
132-
public function setDescription($description)
132+
public function setDescription($description): Role
133133
{
134134
$this->description = $description;
135135

@@ -144,21 +144,43 @@ public function getPermissions()
144144
return $this->permissions;
145145
}
146146

147-
public function addPermission(Permission $permission)
147+
/**
148+
* Add a Permission to the Role.
149+
*
150+
* @param Permission $permission
151+
* @return self
152+
*/
153+
public function addPermission(Permission $permission): Role
148154
{
149155
if ( ! $this->permissions->contains($permission)) {
150156
$this->permissions->add($permission);
151157
}
158+
159+
return $this;
152160
}
153161

154-
public function removePermission(Permission $permission)
162+
/**
163+
* Remove a single permission from the Role.
164+
* @param Permission $permission
165+
* @return self
166+
*/
167+
public function removePermission(Permission $permission): Role
155168
{
156169
$this->permissions->removeElement($permission);
170+
171+
return $this;
157172
}
158173

159-
public function stripPermissions()
174+
/**
175+
* Remove all permissions from the Role.
176+
*
177+
* @return self
178+
*/
179+
public function stripPermissions(): Role
160180
{
161181
$this->permissions->clear();
182+
183+
return $this;
162184
}
163185

164186
/**
@@ -174,7 +196,7 @@ public function getUsers()
174196
*
175197
* @return string Team email address
176198
*/
177-
public function getEmail()
199+
public function getEmail(): ?string
178200
{
179201
return $this->email;
180202
}
@@ -186,7 +208,7 @@ public function getEmail()
186208
*
187209
* @return self
188210
*/
189-
public function setEmail($email)
211+
public function setEmail($email): Role
190212
{
191213
$this->email = $email;
192214

@@ -198,7 +220,7 @@ public function setEmail($email)
198220
*
199221
* @return string team slack channel
200222
*/
201-
public function getSlackChannel()
223+
public function getSlackChannel(): ?string
202224
{
203225
return $this->slackChannel;
204226
}
@@ -210,7 +232,7 @@ public function getSlackChannel()
210232
*
211233
* @return self
212234
*/
213-
public function setSlackChannel($slackChannel)
235+
public function setSlackChannel($slackChannel): Role
214236
{
215237
$this->slackChannel = $slackChannel;
216238

@@ -222,7 +244,7 @@ public function setSlackChannel($slackChannel)
222244
*
223245
* @return bool Should this role be retained by ex members
224246
*/
225-
public function getRetained()
247+
public function getRetained(): bool
226248
{
227249
return $this->retained;
228250
}
@@ -234,7 +256,7 @@ public function getRetained()
234256
*
235257
* @return self
236258
*/
237-
public function setRetained($retained)
259+
public function setRetained($retained): Role
238260
{
239261
$this->retained = $retained;
240262

@@ -246,7 +268,7 @@ public function setRetained($retained)
246268
*
247269
* @return string
248270
*/
249-
public function routeNotificationForSlack()
271+
public function routeNotificationForSlack(): string
250272
{
251273
if ($this->name = 'team.Trustees') {
252274
return Meta::get('trustee_slack_webhook');

0 commit comments

Comments
 (0)