Skip to content

Commit b75d9d0

Browse files
authored
Merge pull request spinen#26 from spinen/feature/updateToLaravel6
Upgrade to Laravel6
2 parents fe83a1c + 3021561 commit b75d9d0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
],
2222
"require": {
2323
"php": ">=7.2",
24-
"illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*",
25-
"illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
24+
"illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*|6.0.*",
25+
"illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|6.0.*",
2626
"phayes/geophp": "~1.2"
2727
},
2828
"require-dev": {
2929
"mockery/mockery": "^1",
3030
"phpunit/phpunit": "~7.0.1|~8.0",
31-
"psy/psysh": "^0.5.1",
32-
"symfony/thanks": "^1.0",
31+
"psy/psysh": "^0.9.0",
32+
"symfony/thanks": "^1.1",
3333
"symfony/var-dumper": "~3.0|^4.2"
3434
},
3535
"autoload": {

src/Support/GeometryProxy.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Spinen\Geometry\Support;
44

55
use Geometry;
6+
use Illuminate\Support\Str;
67
use InvalidArgumentException;
78
use RuntimeException;
89

@@ -113,8 +114,8 @@ public function __get($name)
113114
}
114115

115116
// Shortcut to the getters
116-
if (method_exists($this, 'get' . studly_case($name))) {
117-
return $this->{'get' . studly_case($name)}();
117+
if (method_exists($this, 'get' . Str::studly($name))) {
118+
return $this->{'get' . Str::studly($name)}();
118119
}
119120

120121
throw new RuntimeException(sprintf("Undefined property: %s", $name));

0 commit comments

Comments
 (0)