Skip to content

Commit 5b19c39

Browse files
authored
Merge pull request #5 from Maia-TI/fix_breaking_upgrades
Really add compatibility with laravel after 5.7 version
2 parents da835c5 + 8a742fd commit 5b19c39

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

composer.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=7.1",
14-
"illuminate/database": "^5.0|^6.0|^7.0",
15-
"illuminate/http": "^5.0|^6.0|^7.0",
16-
"illuminate/support": "^5.0|^6.0|^7.0"
13+
"php": ">=7.2.5",
14+
"illuminate/database": "^5.7|^6.0|^7.0",
15+
"illuminate/http": "^5.7|^6.0|^7.0",
16+
"illuminate/support": "^5.7|^6.0|^7.0"
1717
},
1818
"require-dev": {
19-
"phpunit/phpunit": "^7.1",
20-
"orchestra/testbench": "~3.5"
19+
"phpunit/phpunit": "^7.5",
20+
"orchestra/testbench": "^3.7",
21+
"mockery/mockery": "^1.2.0"
2122
},
2223
"autoload": {
2324
"psr-4": {

src/Builders/CollectionVuetableBuilder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ public function sort()
9696

9797
$this->collection = $this->collection
9898
->map(function ($data) {
99-
return array_dot($data);
99+
return Arr::dot($data);
100100
})
101101
->sort($comparer)
102102
->map(function ($data) {
103103
foreach ($data as $key => $value) {
104104
unset($data[$key]);
105-
array_set($data, $key, $value);
105+
Arr::set($data, $key, $value);
106106
}
107107

108108
return $data;
@@ -185,7 +185,7 @@ public function applyChangesTo($results)
185185
public function addItem($item)
186186
{
187187
foreach ($this->columnsToAdd as $column => $value) {
188-
if (array_has($item, $column)) {
188+
if (Arr::has($item, $column)) {
189189
throw new \Exception("Can not add the '{$column}' column, the results already have that column.");
190190
}
191191

@@ -199,7 +199,7 @@ public function addItem($item)
199199
public function editItem($item)
200200
{
201201
foreach ($this->columnsToEdit as $column => $value) {
202-
if (array_has($item, $column) === false) {
202+
if (Arr::has($item, $column) === false) {
203203
throw new \Exception("Column {$column} not exist in array");
204204
}
205205

0 commit comments

Comments
 (0)