Skip to content

Commit 83552de

Browse files
authored
Merge pull request #274 from thephpleague/feat-deprecated
Fix deprecated issues
2 parents 96f306e + f02c12a commit 83552de

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

src/Common/CreditCard.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public function getNumber()
377377
public function setNumber($value)
378378
{
379379
// strip non-numeric characters
380-
return $this->setParameter('number', preg_replace('/\D/', '', $value));
380+
return $this->setParameter('number', preg_replace('/\D/', '', (string) $value));
381381
}
382382

383383
/**
@@ -412,8 +412,10 @@ public function getNumberMasked($mask = 'X')
412412
*/
413413
public function getBrand()
414414
{
415+
$number = (string) $this->getNumber();
416+
415417
foreach ($this->getSupportedBrands() as $brand => $val) {
416-
if (preg_match($val, $this->getNumber())) {
418+
if (preg_match($val, $number)) {
417419
return $brand;
418420
}
419421
}

src/Common/Helper.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected static function convertToLowercase($str)
6363
public static function validateLuhn($number)
6464
{
6565
$str = '';
66-
foreach (array_reverse(str_split($number)) as $i => $c) {
66+
foreach (array_reverse(str_split((string) $number)) as $i => $c) {
6767
$str .= $i % 2 ? $c * 2 : $c;
6868
}
6969

src/Common/Message/AbstractResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public function getRedirectResponse()
215215
$hiddenFields .= sprintf(
216216
'<input type="hidden" name="%1$s" value="%2$s" />',
217217
htmlentities($key, ENT_QUOTES, 'UTF-8', false),
218-
htmlentities($value, ENT_QUOTES, 'UTF-8', false)
218+
htmlentities((string) $value, ENT_QUOTES, 'UTF-8', false)
219219
)."\n";
220220
}
221221

tests/Common/GatewayFactoryTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
class GatewayFactoryTest extends TestCase
99
{
10+
/** @var GatewayFactory */
11+
protected $factory;
12+
1013
public static function setUpBeforeClass() : void
1114
{
1215
m::mock('alias:Omnipay\\SpareChange\\TestGateway');

tests/Common/ItemBagTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
class ItemBagTest extends TestCase
88
{
9+
/** @var ItemBag */
10+
protected $bag;
11+
912
public function setUp() : void
1013
{
1114
$this->bag = new ItemBag;

tests/Common/ItemTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
class ItemTest extends TestCase
88
{
9+
/** @var Item */
10+
protected $item;
11+
912
public function setUp() : void
1013
{
1114
$this->item = new Item;

0 commit comments

Comments
 (0)