Skip to content

Commit 6d3a863

Browse files
authored
Merge pull request #297 from baopham/7.x
Drop support for Laralel < 5.8 ant PHP < 7.1.3
2 parents a6b4e7f + 5df42a5 commit 6d3a863

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
"aws"
88
],
99
"require": {
10+
"php": "^7.1.3 || ^8.0",
1011
"aws/aws-sdk-php": "^3.0.0",
11-
"illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
12-
"illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
12+
"illuminate/support": "5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0",
13+
"illuminate/database": "5.8.* || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0 || ^12.0"
1314
},
1415
"license": "MIT",
1516
"authors": [
@@ -24,7 +25,8 @@
2425
}
2526
},
2627
"require-dev": {
27-
"orchestra/testbench": "~3.0 || ~5.0|^8.0"
28+
"orchestra/testbench": "^3.8 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0",
29+
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.0 || ^10.0 || ^11.0"
2830
},
2931
"scripts": {
3032
"test": "phpunit",

src/DynamoDb/QueryBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function setExpressionAttributeValue($placeholder, $value)
9797
* @param DynamoDbClient|null $client
9898
* @return ExecutableQuery
9999
*/
100-
public function prepare(DynamoDbClient $client = null)
100+
public function prepare(?DynamoDbClient $client = null)
101101
{
102102
$raw = new RawDynamoDbQuery(null, $this->query);
103103
return new ExecutableQuery($client ?: $this->service->getClient(), $raw->finalize()->query);

src/DynamoDbCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class DynamoDbCollection extends Collection
1212
*/
1313
private $conditionIndex = null;
1414

15-
public function __construct(array $items = [], Index $conditionIndex = null)
15+
public function __construct(array $items = [], ?Index $conditionIndex = null)
1616
{
1717
parent::__construct($items);
1818

src/DynamoDbQueryBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function offset($value)
147147
*
148148
* @return $this
149149
*/
150-
public function after(DynamoDbModel $after = null)
150+
public function after(?DynamoDbModel $after = null)
151151
{
152152
if (empty($after)) {
153153
$this->lastEvaluatedKey = null;
@@ -884,7 +884,7 @@ public function withoutGlobalScope($scope)
884884
* @param array|null $scopes
885885
* @return $this
886886
*/
887-
public function withoutGlobalScopes(array $scopes = null)
887+
public function withoutGlobalScopes(?array $scopes = null)
888888
{
889889
if (is_array($scopes)) {
890890
foreach ($scopes as $scope) {

src/H.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
1414
class H
1515
{
16-
public static function array_first($array, callable $callback = null, $default = null)
16+
public static function array_first($array, ?callable $callback = null, $default = null)
1717
{
1818
if (is_null($callback)) {
1919
if (empty($array)) {

0 commit comments

Comments
 (0)