Skip to content

Commit a4c6364

Browse files
committed
fixed some methods for laravel version 8.*
1 parent b734d88 commit a4c6364

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to `laravel-sub-query` will be documented in this file
44

5+
## [v1.9.8 (2021-04-14)](https://github.com/Alexmg86/laravel-sub-query/compare/v1.9.7...v1.9.8)
6+
### Fixed
7+
- fixed some methods for laravel version 8.*
8+
59
## [v1.9.7 (2021-02-04)](https://github.com/Alexmg86/laravel-sub-query/compare/v1.9.6...v1.9.7)
610
### Added
711
- CHANGELOG

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"php": ">=5.6.4",
1616
"illuminate/support": ">=5.4",
17-
"laravel/framework": "<8.0"
17+
"laravel/framework": ">5.0"
1818
},
1919
"require-dev": {
2020
"orchestra/testbench": ">=3.1",

src/Collection/LaravelSubQueryCollection.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class LaravelSubQueryCollection extends Collection
1414
* @param array|string $relations
1515
* @return $this
1616
*/
17-
public function loadSum($relations)
17+
public function loadSum($relations, $column = null)
1818
{
1919
if ($this->isEmpty()) {
2020
return $this;
@@ -46,7 +46,7 @@ public function loadSum($relations)
4646
* @param array|string $relations
4747
* @return $this
4848
*/
49-
public function loadMin($relations)
49+
public function loadMin($relations, $column = null)
5050
{
5151
if ($this->isEmpty()) {
5252
return $this;
@@ -78,7 +78,7 @@ public function loadMin($relations)
7878
* @param array|string $relations
7979
* @return $this
8080
*/
81-
public function loadMax($relations)
81+
public function loadMax($relations, $column = null)
8282
{
8383
if ($this->isEmpty()) {
8484
return $this;
@@ -110,7 +110,7 @@ public function loadMax($relations)
110110
* @param array|string $relations
111111
* @return $this
112112
*/
113-
public function loadAvg($relations)
113+
public function loadAvg($relations, $column = null)
114114
{
115115
if ($this->isEmpty()) {
116116
return $this;

src/LaravelSubQuery.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ class LaravelSubQuery extends Builder
4545
*/
4646
protected $withAvg = [];
4747

48-
public function withSum($relations)
48+
public function withSum($relations, $column = null)
4949
{
5050
return $this->withSubQuery($relations, 'sum');
5151
}
5252

53-
public function withMin($relations)
53+
public function withMin($relations, $column = null)
5454
{
5555
return $this->withSubQuery($relations, 'min');
5656
}
5757

58-
public function withMax($relations)
58+
public function withMax($relations, $column = null)
5959
{
6060
return $this->withSubQuery($relations, 'max');
6161
}
6262

63-
public function withAvg($relations)
63+
public function withAvg($relations, $column = null)
6464
{
6565
return $this->withSubQuery($relations, 'avg');
6666
}

src/Traits/LaravelSubQueryTrait.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ trait LaravelSubQueryTrait
1414
* @param array|string $relations
1515
* @return $this
1616
*/
17-
public function loadSum($relations)
17+
public function loadSum($relations, $column = null)
1818
{
1919
$relations = is_string($relations) ? func_get_args() : $relations;
2020

@@ -29,7 +29,7 @@ public function loadSum($relations)
2929
* @param array|string $relations
3030
* @return $this
3131
*/
32-
public function loadMin($relations)
32+
public function loadMin($relations, $column = null)
3333
{
3434
$relations = is_string($relations) ? func_get_args() : $relations;
3535

@@ -44,7 +44,7 @@ public function loadMin($relations)
4444
* @param array|string $relations
4545
* @return $this
4646
*/
47-
public function loadMax($relations)
47+
public function loadMax($relations, $column = null)
4848
{
4949
$relations = is_string($relations) ? func_get_args() : $relations;
5050

@@ -59,7 +59,7 @@ public function loadMax($relations)
5959
* @param array|string $relations
6060
* @return $this
6161
*/
62-
public function loadAvg($relations)
62+
public function loadAvg($relations, $column = null)
6363
{
6464
$relations = is_string($relations) ? func_get_args() : $relations;
6565

0 commit comments

Comments
 (0)