Fixes for phpoffice and PHP7.4

app/Console/Commands/ForceMigration.php

@@ -97,20 +97,20 @@ class ForceMigration extends Command
 
         }
 
-        $company = Company::on($this->db)
-                          ->whereNull('plan')
-                          ->orWhereIn('plan', ['','free'])
-                          ->whereHas('accounts', function ($query){
-                            $query->where('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
-                            $query->orWhere('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx702');
-                            $query->orWhere('account_key', '!=', 'AsFmBAeLXF0IKf7tmi0eiyZfmWW9hxMT');
-                           })
-                          ->with('accounts')
-                          ->withCount('accounts')
-                          ->having('accounts_count', '>=', 1)
-                          ->first();
+        // $company = Company::on($this->db)
+        //                   ->whereNull('plan')
+        //                   ->orWhereIn('plan', ['','free'])
+        //                   ->whereHas('accounts', function ($query){
+        //                     $query->where('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
+        //                     $query->orWhere('account_key', '!=', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx702');
+        //                     $query->orWhere('account_key', '!=', 'AsFmBAeLXF0IKf7tmi0eiyZfmWW9hxMT');
+        //                    })
+        //                   ->with('accounts')
+        //                   ->withCount('accounts')
+        //                   ->having('accounts_count', '>=', 1)
+        //                   ->first();
 
-        return $company;
+        // return $company;
 
     }
 

composer.json

@@ -67,7 +67,7 @@
         "league/flysystem-rackspace": "~1.0",
         "league/fractal": "0.13.*",
         "lokielse/omnipay-alipay": "~1.4",
-        "maatwebsite/excel": "dev-carbon#8b17952",
+        "maatwebsite/excel": "dev-php-fix",
         "meebio/omnipay-creditcall": "dev-master",
         "meebio/omnipay-secure-trading": "dev-master",
         "mfauveau/omnipay-pacnet": "~2.0",
@@ -207,7 +207,7 @@
         },
         {
             "type": "vcs",
-            "url": "https://github.com/tainmar/Laravel-Excel"
+            "url": "https://github.com/turbo124/Laravel-Excel"
         }
     ]
 }