Use Laravel 7 and remove omnipay for now

Blacklight/libraries/Forking.php

@@ -929,7 +929,7 @@ class Forking
      */
     protected function _executeCommand($command)
     {
-        $process = new Process($command);
+        $process = Process::fromShellCommandline('exec '.$command);
         $process->setTimeout(360);
         $process->run(function ($type, $buffer) {
             if (Process::ERR === $type) {

Changelog

@@ -1,3 +1,5 @@
+2020-04-11 DariusIII
+	* Chg: Use Laravel 7 and remove omnipay for now
 2020-03-29 DariusIII
 	* Chg: Start replacing constants with laravel equivalents
 2020-03-01 DariusIII

_install/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

app/Console/Commands/InstallNntmux.php

@@ -48,10 +48,10 @@ class InstallNntmux extends Command
         $error = false;
 
         if ($this->confirm('Are you sure you want to install NNTmux? This will wipe your database!!')) {
-            if (file_exists(base_path().'/_install/install.lock')) {
+            if (File::exists(base_path().'/_install/install.lock')) {
                 if ($this->confirm('Do you want to remove install.lock file so you can continue with install?')) {
                     $this->info('Removing install.lock file so we can continue with install process');
-                    $remove = new Process('rm _install/install.lock');
+                    $remove = Process::fromShellCommandline('exec rm _install/install.lock');
                     $remove->setTimeout(600);
                     $remove->run(function ($type, $buffer) {
                         if (Process::ERR === $type) {

app/Console/Commands/TmuxUIStop.php

@@ -32,7 +32,7 @@ class TmuxUIStop extends Command
         $tmux->stopIfRunning();
         if ($this->option('kill') === true) {
             $sessionName = Settings::settingValue('site.tmux.tmux_session');
-            $tmuxSession = new Process('tmux kill-session -t '.$sessionName);
+            $tmuxSession = Process::fromShellCommandline('exec tmux kill-session -t '.$sessionName);
             $this->info('Killing active tmux session: '.$sessionName);
             $tmuxSession->run();
             if ($tmuxSession->isSuccessful()) {

app/Console/Commands/UpdateNNTmuxComposer.php

@@ -64,7 +64,7 @@ class UpdateNNTmuxComposer extends Command
             $command .= ' --prefer-dist';
         }
         $this->output->writeln('<comment>Running composer install process...</comment>');
-        $process = new Process($command);
+        $process = Process::fromShellCommandline('exec '.$command);
         $process->setTimeout(360);
         $process->run(function ($type, $buffer) {
             if (Process::ERR === $type) {

app/Exceptions/Handler.php

@@ -33,20 +33,20 @@ class Handler extends ExceptionHandler
      * @param  \Exception $exception
      *
      * @return void
-     * @throws \Exception
+     * @throws \Throwable
      */
-    public function report(Exception $exception)
+    public function report(\Throwable $exception)
     {
         parent::report($exception);
     }
 
     /**
      * @param \Illuminate\Http\Request $request
-     * @param Exception $exception
+     * @param \Throwable $exception
      * @return \Illuminate\Http\RedirectResponse|\Symfony\Component\HttpFoundation\Response
-     * @throws Exception
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, \Throwable $exception)
     {
         if ($exception instanceof \Spatie\Permission\Exceptions\UnauthorizedException) {
             abort(401);

bootstrap/autoload.php

@@ -6,8 +6,21 @@ require_once 'constants.php';
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'app/Extensions/util/PhpYenc.php';
 
 use Dotenv\Dotenv;
+use Dotenv\Repository\Adapter\EnvConstAdapter;
+use Dotenv\Repository\Adapter\ServerConstAdapter;
+use Dotenv\Repository\RepositoryBuilder;
 
-$dotenv = Dotenv::create(dirname(__DIR__, 1));
+$adapters = [
-$dotenv->load();
+    new EnvConstAdapter(),
+    new ServerConstAdapter(),
+];
+
+$repository = RepositoryBuilder::create()
+    ->withReaders($adapters)
+    ->withWriters($adapters)
+    ->immutable()
+    ->make();
+
+$dotenv = Dotenv::create($repository, dirname(__DIR__, 1), null)->load();
 
 $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();

composer.json

@@ -98,14 +98,14 @@
     "dariusiii/laravel-database-trigger": "^2.0",
     "dariusiii/php-itunes-api": "^1.0",
     "dariusiii/rarinfo": "^2.5",
-    "dariusiii/tmdb-laravel": "^2.0",
+    "dariusiii/tmdb-laravel": "^3.0",
     "dariusiii/token": "^3.0",
     "dariusiii/zipper": "^2.0",
     "dborsatto/php-giantbomb": "^1.0",
     "doctrine/dbal": "^2.7",
     "fideloper/proxy": "^4.2",
     "foolz/sphinxql-query-builder": "^2.0",
-    "genealabs/laravel-caffeine": "^1.0",
+    "genealabs/laravel-caffeine": "^7.0",
     "geoip2/geoip2": "^2.9",
     "google/recaptcha": "^1.2",
     "guzzlehttp/guzzle": "^6.3",
@@ -113,57 +113,56 @@
     "intervention/image": "^2.4",
     "intervention/imagecache": "^2.3",
     "james-heinrich/getid3": "1.9.*",
-    "jamesmills/laravel-timezone": "^1.3",
+    "jamesmills/laravel-timezone": "^1.9",
     "joshpinkney/tv-maze-php-api": "^1.0",
-    "jrean/laravel-user-verification": "^8.0",
+    "jrean/laravel-user-verification": "dev-master",
     "junaidnasir/larainvite": "^3.0",
     "kevinlebrun/colors.php": "^1.0",
-    "laravel/framework": "^6.0",
+    "laravel/framework": "^7.0",
-    "laravel/horizon": "^3.7.2",
+    "laravel/horizon": "^4.2",
-    "laravel/scout": "^7.0",
+    "laravel/scout": "^8.0.0",
     "laravel/telescope": "^3.0",
     "laravel/tinker": "^2.0",
+    "laravel/ui": "^2.0",
     "laravelcollective/html": "^6.0",
     "league/climate": "^3.4",
-    "league/omnipay": "^3",
     "marcreichel/igdb-laravel": "^1.0",
-    "mhor/php-mediainfo": "^4.1",
+    "mhor/php-mediainfo": "^5.0",
     "monicahq/laravel-cloudflare": "^1.3",
     "monolog/monolog": "^2.0",
     "nesbot/carbon": "^2.14",
-    "omnipay/paypal": "^3.0",
     "pear/net_nntp": "^1.6.0",
     "php-ffmpeg/php-ffmpeg": "^0.14",
     "php-http/guzzle6-adapter": "^1.1",
     "php-http/message": "^1.6",
     "predis/predis": "^1.1",
     "propaganistas/laravel-disposable-email": "^2.0",
-    "ramsey/uuid": "^3.7",
+    "ramsey/uuid": "^4.0",
     "rtconner/laravel-tagging": "^4.0",
     "smarty/smarty": "^3.1",
     "spatie/async": "^1.0",
     "spatie/laravel-directory-cleanup": "^1.2",
     "spatie/laravel-fractal": "^5.3",
     "spatie/laravel-permission": "^3.0",
-    "vlucas/phpdotenv": "^3.0",
+    "vlucas/phpdotenv": "^4.0",
     "voku/simple_html_dom": "^4.3",
     "wildbit/swiftmailer-postmark": "^3.0",
-    "yab/laravel-scout-mysql-driver": "^2.1",
+    "yab/laravel-scout-mysql-driver": "^3.0",
     "ytake/laravel-smarty": "^4.0"
   },
 
   "require-dev": {
     "barryvdh/laravel-ide-helper": "^2.4",
-    "beyondcode/laravel-dump-server": "^1.0",
+    "beyondcode/laravel-dump-server": "^1.4",
     "captainhook/captainhook": "^5.1",
     "captainhook/plugin-composer": "^5.1",
-    "facade/ignition": "^1.6",
+    "facade/ignition": "^2.0",
     "friendsofphp/php-cs-fixer": "^2.14",
     "fzaninotto/faker": "~1.4",
     "laracasts/generators": "^1.1",
     "matt-allan/laravel-code-style": "^0.5.0",
     "mockery/mockery": "^1.0",
-    "nunomaduro/collision": "^3.0",
+    "nunomaduro/collision": "^4.2.0",
     "nunomaduro/larastan": "^0.5",
     "php-coveralls/php-coveralls": "^2.0",
     "phpunit/phpunit": "^8.0"