Skip to content

Commit

Permalink
Laravel 5.8 and updated dependencies (librenms#10489)
Browse files Browse the repository at this point in the history
* Laravel 5.8
and dependencies

* Fix cache time

* upstream base file changes

* Accidentally ran composer with PHP 7.3

* fix test error

* one more

* one more

* one more

* fix dotenv loading
  • Loading branch information
murrant authored Aug 5, 2019
1 parent e99f421 commit 42fd5af
Show file tree
Hide file tree
Showing 27 changed files with 427 additions and 886 deletions.
2 changes: 1 addition & 1 deletion LibreNMS/DB/Eloquent.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static function boot()
if (!Laravel::isBooted() && is_null(self::$capsule)) {
$install_dir = realpath(__DIR__ . '/../../');

(new Dotenv($install_dir))->load();
Dotenv::create($install_dir)->load();

$db_config = include($install_dir . '/config/database.php');
$settings = $db_config['connections'][$db_config['default']];
Expand Down
2 changes: 1 addition & 1 deletion LibreNMS/Util/ObjectCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

class ObjectCache
{
private static $cache_time = 5;
private static $cache_time = 300;

public static function applications()
{
Expand Down
2 changes: 1 addition & 1 deletion app/Checks.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static function postAuth()
return;
}

Cache::put('checks_popup_timeout', true, Config::get('checks_popup_timer', 5));
Cache::put('checks_popup_timeout', true, Config::get('checks_popup_timer', 5) * 60);

$user = Auth::user();

Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@
"easybook/geshi": "^1.0.8",
"ezyang/htmlpurifier": "^4.8",
"fico7489/laravel-pivot": "^3.0",
"fideloper/proxy": "^4.0",
"influxdb/influxdb-php": "^1.14",
"laravel/laravel": "5.7.*",
"laravel/laravel": "5.8.*",
"oriceon/toastr-5-laravel": "dev-master",
"pear/console_color2": "^0.1",
"pear/console_table": "^1.3",
Expand All @@ -47,12 +46,12 @@
"spatie/laravel-cors": "1.3.*",
"symfony/yaml": "^4.0",
"tecnickcom/tcpdf": "~6.2.0",
"wpb/string-blade-compiler": "3.7.x-dev",
"wpb/string-blade-compiler": "3.8.x-dev",
"xjtuwangke/passwordhash": "dev-master"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.2",
"barryvdh/laravel-ide-helper": "^2.5",
"barryvdh/laravel-ide-helper": "^2.6",
"beyondcode/laravel-dump-server": "^1.0",
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
Expand All @@ -61,8 +60,8 @@
"justinrainbow/json-schema": "^5.2",
"laravel/dusk": "^5.0",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0",
"nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^7.5",
"squizlabs/php_codesniffer": "^2.9.1",
"staudenmeir/dusk-updater": "^1.0"
},
Expand Down
Loading

0 comments on commit 42fd5af

Please sign in to comment.