Skip to content

Commit 7b45d97

Browse files
kaur58vv12131415
kaur58
authored and
vv12131415
committed
laravel 5.8 update
1 parent aa338ba commit 7b45d97

23 files changed

+128
-111
lines changed

‎composer.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,25 @@
1818
"require": {
1919
"php": ">=7.0",
2020
"doctrine/orm": "2.5.*|2.6.*",
21-
"illuminate/auth": "5.5.*|5.6.*|5.7.*",
22-
"illuminate/console": "5.5.*|5.6.*|5.7.*",
23-
"illuminate/container": "5.5.*|5.6.*|5.7.*",
24-
"illuminate/contracts": "5.5.*|5.6.*|5.7.*",
25-
"illuminate/pagination": "5.5.*|5.6.*|5.7.*",
26-
"illuminate/routing": "5.5.*|5.6.*|5.7.*",
27-
"illuminate/support": "5.5.*|5.6.*|5.7.*",
28-
"illuminate/validation": "5.5.*|5.6.*|5.7.*",
29-
"illuminate/view": "5.5.*|5.6.*|5.7.*",
21+
"illuminate/auth": "5.5.*|5.6.*|5.7.*|5.8.*",
22+
"illuminate/console": "5.5.*|5.6.*|5.7.*|5.8.*",
23+
"illuminate/container": "5.5.*|5.6.*|5.7.*|5.8.*",
24+
"illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*",
25+
"illuminate/pagination": "5.5.*|5.6.*|5.7.*|5.8.*",
26+
"illuminate/routing": "5.5.*|5.6.*|5.7.*|5.8.*",
27+
"illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*",
28+
"illuminate/validation": "5.5.*|5.6.*|5.7.*|5.8.*",
29+
"illuminate/view": "5.5.*|5.6.*|5.7.*|5.8.*",
3030
"symfony/serializer": "^2.7|~3.0|~4.0"
3131
},
3232
"require-dev": {
3333
"phpunit/phpunit": "~5.0",
3434
"mockery/mockery": "^1.0",
35-
"barryvdh/laravel-debugbar": "~2.0",
35+
"barryvdh/laravel-debugbar": "~2.0|~3.0",
3636
"itsgoingd/clockwork": "~1.9",
37-
"illuminate/log": "5.5.*|5.6.*|5.7.*",
38-
"illuminate/notifications": "5.5.*|5.6.*|5.7.*",
39-
"illuminate/queue": "5.5.*|5.6.*|5.7.*"
37+
"illuminate/log": "5.5.*|5.6.*|5.7.*|5.8.*",
38+
"illuminate/notifications": "5.5.*|5.6.*|5.7.*|5.8.*",
39+
"illuminate/queue": "5.5.*|5.6.*|5.7.*|5.8.*"
4040
},
4141
"autoload": {
4242
"psr-4": {

‎src/Auth/DoctrineUserProvider.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Contracts\Auth\Authenticatable;
88
use Illuminate\Contracts\Auth\UserProvider;
99
use Illuminate\Contracts\Hashing\Hasher;
10+
use Illuminate\Support\Str;
1011
use ReflectionClass;
1112

1213
class DoctrineUserProvider implements UserProvider
@@ -92,7 +93,7 @@ public function retrieveByCredentials(array $credentials)
9293
{
9394
$criteria = [];
9495
foreach ($credentials as $key => $value) {
95-
if (!str_contains($key, 'password')) {
96+
if (!Str::contains($key, 'password')) {
9697
$criteria[$key] = $value;
9798
}
9899
}

‎src/Configuration/Cache/IlluminateCacheAdapter.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,16 @@ protected function doContains($id)
5353
* @param int $lifeTime The lifetime. If != 0, sets a specific lifetime for this
5454
* cache entry (0 => infinite lifeTime).
5555
*
56-
* @return bool TRUE always, because the cache repository have void return
56+
* @return bool
5757
*/
5858
protected function doSave($id, $data, $lifeTime = false)
5959
{
6060
if (!$lifeTime) {
6161
$this->cache->forever($id, $data);
62-
63-
return true;
62+
} else {
63+
$this->cache->put($id, $data, $lifeTime);
6464
}
6565

66-
// Laravel cache system accept expire times in minutes
67-
// while Doctrine accept it in seconds, so we need to convert $lifeTime from seconds to minutes
68-
// before passing it to Laravel cache repository
69-
$lifeTimeMinutes = $lifeTime / 60;
70-
71-
$this->cache->put($id, $data, $lifeTimeMinutes);
72-
7366
return true;
7467
}
7568

‎src/Configuration/Connections/MysqlConnection.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace LaravelDoctrine\ORM\Configuration\Connections;
44

5+
use Illuminate\Support\Arr;
6+
57
class MysqlConnection extends Connection
68
{
79
/**
@@ -13,17 +15,17 @@ public function resolve(array $settings = [])
1315
{
1416
return [
1517
'driver' => 'pdo_mysql',
16-
'host' => array_get($settings, 'host'),
17-
'dbname' => array_get($settings, 'database'),
18-
'user' => array_get($settings, 'username'),
19-
'password' => array_get($settings, 'password'),
20-
'charset' => array_get($settings, 'charset'),
21-
'port' => array_get($settings, 'port'),
22-
'unix_socket' => array_get($settings, 'unix_socket'),
23-
'prefix' => array_get($settings, 'prefix'),
24-
'defaultTableOptions' => array_get($settings, 'defaultTableOptions', []),
25-
'driverOptions' => array_get($settings, 'driverOptions', []),
26-
'serverVersion' => array_get($settings, 'serverVersion'),
18+
'host' => Arr::get($settings, 'host'),
19+
'dbname' => Arr::get($settings, 'database'),
20+
'user' => Arr::get($settings, 'username'),
21+
'password' => Arr::get($settings, 'password'),
22+
'charset' => Arr::get($settings, 'charset'),
23+
'port' => Arr::get($settings, 'port'),
24+
'unix_socket' => Arr::get($settings, 'unix_socket'),
25+
'prefix' => Arr::get($settings, 'prefix'),
26+
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
27+
'driverOptions' => Arr::get($settings, 'driverOptions', []),
28+
'serverVersion' => Arr::get($settings, 'serverVersion'),
2729
];
2830
}
2931
}

‎src/Configuration/Connections/OracleConnection.php‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace LaravelDoctrine\ORM\Configuration\Connections;
44

5+
use Illuminate\Support\Arr;
6+
57
class OracleConnection extends Connection
68
{
79
/**
@@ -13,17 +15,17 @@ public function resolve(array $settings = [])
1315
{
1416
return [
1517
'driver' => 'oci8',
16-
'host' => array_get($settings, 'host'),
17-
'dbname' => array_get($settings, 'database'),
18-
'servicename' => array_get($settings, 'service_name'),
19-
'service' => array_get($settings, 'service'),
20-
'user' => array_get($settings, 'username'),
21-
'password' => array_get($settings, 'password'),
22-
'charset' => array_get($settings, 'charset'),
23-
'port' => array_get($settings, 'port'),
24-
'prefix' => array_get($settings, 'prefix'),
25-
'defaultTableOptions' => array_get($settings, 'defaultTableOptions', []),
26-
'persistent' => array_get($settings, 'persistent'),
18+
'host' => Arr::get($settings, 'host'),
19+
'dbname' => Arr::get($settings, 'database'),
20+
'servicename' => Arr::get($settings, 'service_name'),
21+
'service' => Arr::get($settings, 'service'),
22+
'user' => Arr::get($settings, 'username'),
23+
'password' => Arr::get($settings, 'password'),
24+
'charset' => Arr::get($settings, 'charset'),
25+
'port' => Arr::get($settings, 'port'),
26+
'prefix' => Arr::get($settings, 'prefix'),
27+
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
28+
'persistent' => Arr::get($settings, 'persistent'),
2729
];
2830
}
2931
}

‎src/Configuration/Connections/PgsqlConnection.php‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace LaravelDoctrine\ORM\Configuration\Connections;
44

5+
use Illuminate\Support\Arr;
6+
57
class PgsqlConnection extends Connection
68
{
79
/**
@@ -13,16 +15,16 @@ public function resolve(array $settings = [])
1315
{
1416
return [
1517
'driver' => 'pdo_pgsql',
16-
'host' => array_get($settings, 'host'),
17-
'dbname' => array_get($settings, 'database'),
18-
'user' => array_get($settings, 'username'),
19-
'password' => array_get($settings, 'password'),
20-
'charset' => array_get($settings, 'charset'),
21-
'port' => array_get($settings, 'port'),
22-
'sslmode' => array_get($settings, 'sslmode'),
23-
'prefix' => array_get($settings, 'prefix'),
24-
'defaultTableOptions' => array_get($settings, 'defaultTableOptions', []),
25-
'serverVersion' => array_get($settings, 'serverVersion'),
18+
'host' => Arr::get($settings, 'host'),
19+
'dbname' => Arr::get($settings, 'database'),
20+
'user' => Arr::get($settings, 'username'),
21+
'password' => Arr::get($settings, 'password'),
22+
'charset' => Arr::get($settings, 'charset'),
23+
'port' => Arr::get($settings, 'port'),
24+
'sslmode' => Arr::get($settings, 'sslmode'),
25+
'prefix' => Arr::get($settings, 'prefix'),
26+
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
27+
'serverVersion' => Arr::get($settings, 'serverVersion'),
2628
];
2729
}
2830
}

‎src/Configuration/Connections/SqliteConnection.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace LaravelDoctrine\ORM\Configuration\Connections;
44

5+
use Illuminate\Support\Arr;
56
use Illuminate\Support\Str;
67

78
class SqliteConnection extends Connection
@@ -15,12 +16,12 @@ public function resolve(array $settings = [])
1516
{
1617
return [
1718
'driver' => 'pdo_sqlite',
18-
'user' => array_get($settings, 'username'),
19-
'password' => array_get($settings, 'password'),
20-
'prefix' => array_get($settings, 'prefix'),
19+
'user' => Arr::get($settings, 'username'),
20+
'password' => Arr::get($settings, 'password'),
21+
'prefix' => Arr::get($settings, 'prefix'),
2122
'memory' => $this->isMemory($settings),
22-
'path' => array_get($settings, 'database'),
23-
'defaultTableOptions' => array_get($settings, 'defaultTableOptions', []),
23+
'path' => Arr::get($settings, 'database'),
24+
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
2425
];
2526
}
2627

@@ -31,6 +32,6 @@ public function resolve(array $settings = [])
3132
*/
3233
protected function isMemory(array $settings = [])
3334
{
34-
return Str::startsWith(array_get($settings, 'database'), ':memory');
35+
return Str::startsWith(Arr::get($settings, 'database'), ':memory');
3536
}
3637
}

‎src/Configuration/Connections/SqlsrvConnection.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace LaravelDoctrine\ORM\Configuration\Connections;
44

5+
use Illuminate\Support\Arr;
6+
57
class SqlsrvConnection extends Connection
68
{
79
/**
@@ -13,15 +15,15 @@ public function resolve(array $settings = [])
1315
{
1416
return [
1517
'driver' => 'pdo_sqlsrv',
16-
'host' => array_get($settings, 'host'),
17-
'dbname' => array_get($settings, 'database'),
18-
'user' => array_get($settings, 'username'),
19-
'password' => array_get($settings, 'password'),
20-
'port' => array_get($settings, 'port'),
21-
'prefix' => array_get($settings, 'prefix'),
22-
'charset' => array_get($settings, 'charset'),
23-
'defaultTableOptions' => array_get($settings, 'defaultTableOptions', []),
24-
'serverVersion' => array_get($settings, 'serverVersion'),
18+
'host' => Arr::get($settings, 'host'),
19+
'dbname' => Arr::get($settings, 'database'),
20+
'user' => Arr::get($settings, 'username'),
21+
'password' => Arr::get($settings, 'password'),
22+
'port' => Arr::get($settings, 'port'),
23+
'prefix' => Arr::get($settings, 'prefix'),
24+
'charset' => Arr::get($settings, 'charset'),
25+
'defaultTableOptions' => Arr::get($settings, 'defaultTableOptions', []),
26+
'serverVersion' => Arr::get($settings, 'serverVersion'),
2527
];
2628
}
2729
}

‎src/Configuration/MetaData/Annotations.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace LaravelDoctrine\ORM\Configuration\MetaData;
44

55
use Doctrine\ORM\Configuration;
6+
use Illuminate\Support\Arr;
67

78
class Annotations extends MetaData
89
{
@@ -14,8 +15,8 @@ class Annotations extends MetaData
1415
public function resolve(array $settings = [])
1516
{
1617
return (new Configuration())->newDefaultAnnotationDriver(
17-
array_get($settings, 'paths', []),
18-
array_get($settings, 'simple', false)
18+
Arr::get($settings, 'paths', []),
19+
Arr::get($settings, 'simple', false)
1920
);
2021
}
2122
}

‎src/Configuration/MetaData/Config.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace LaravelDoctrine\ORM\Configuration\MetaData;
44

55
use Illuminate\Contracts\Config\Repository;
6+
use Illuminate\Support\Arr;
67
use LaravelDoctrine\ORM\Configuration\MetaData\Config\ConfigDriver;
78

89
class Config extends MetaData
@@ -28,7 +29,7 @@ public function __construct(Repository $config)
2829
public function resolve(array $settings = [])
2930
{
3031
return new ConfigDriver(
31-
$this->config->get(array_get($settings, 'mapping_file'), [])
32+
$this->config->get(Arr::get($settings, 'mapping_file'), [])
3233
);
3334
}
3435
}

0 commit comments

Comments
 (0)