Replaced App::make() by app()

nibou230 · Jan 8, 2022 · 5073663 · 5073663
1 parent 2228df6
commit 5073663
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/classes/facades/Repo.inc.php b/classes/facades/Repo.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @file classes/facade/Repo.inc.php
+ * @file classes/facades/Repo.inc.php
  *
  * Copyright (c) 2014-2021 Simon Fraser University
  * Copyright (c) 2000-2021 John Willinsky
@@ -26,26 +26,26 @@ class Repo extends BaseRepo
 {
     public static function issue(): IssueRepository
     {
-        return app()->make(IssueRepository::class);
+        return app(IssueRepository::class);
     }
 
     public static function publication(): PublicationRepository
     {
-        return app()->make(PublicationRepository::class);
+        return app(PublicationRepository::class);
     }
 
     public static function submission(): SubmissionRepository
     {
-        return app()->make(SubmissionRepository::class);
+        return app(SubmissionRepository::class);
     }
 
     public static function user(): UserRepository
     {
-        return app()->make(UserRepository::class);
+        return app(UserRepository::class);
     }
 
     public static function submissionFile(): SubmissionFileRepository
     {
-        return app()->make(SubmissionFileRepository::class);
+        return app(SubmissionFileRepository::class);
     }
 }
diff --git a/classes/issue/DAO.inc.php b/classes/issue/DAO.inc.php
@@ -17,7 +17,6 @@
 
 use APP\facades\Repo;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\LazyCollection;
 use PKP\cache\CacheManager;
@@ -106,7 +105,7 @@ public function _getCache(string $cacheId)
      */
     public function newDataObject(): Issue
     {
-        return App::make(Issue::class);
+        return app(Issue::class);
     }
 
     /**

diff --git a/classes/issue/Repository.inc.php b/classes/issue/Repository.inc.php
@@ -10,7 +10,6 @@
 use APP\journal\SectionDAO;
 use APP\publication\Publication;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\LazyCollection;
 use PKP\db\DAORegistry;
 use PKP\plugins\HookRegistry;
@@ -95,7 +94,7 @@ public function getMany(Collector $query): LazyCollection
     /** @copydoc DAO::getCollector() */
     public function getCollector(): Collector
     {
-        return App::make(Collector::class);
+        return app(Collector::class);
     }
 
     /**

diff --git a/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php b/classes/migration/upgrade/OJSv3_3_0UpgradeMigration.inc.php
@@ -17,10 +17,7 @@
 use APP\core\Services;
 use Exception;
 use Illuminate\Database\Schema\Blueprint;
-
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
-
 use Illuminate\Support\Facades\Schema;
 use PKP\core\EntityDAO;
 use PKP\db\DAORegistry;
@@ -99,7 +96,7 @@ private function _settingsAsJSON()
 
             // Account for new EntityDAOs
             if (!$dao) {
-                $dao = App::make($daoName);
+                $dao = app($daoName);
                 if (!$dao) {
                     throw new Exception("${daoName} could not be created when migrating serialized settings");
                 }