Merge pull request #1048 from jonasraoni/feature/main/housekeeping-up…

…dates

Feature/main/housekeeping updates

.travis.yml

@@ -146,6 +146,9 @@ script:
   - ./lib/pkp/tools/travis/run-tests.sh
 
 after_failure:
-  - cat error.log
+  - tail -n 200 error.log
   - sudo apt-get install sharutils
   - tar cz cypress/screenshots | uuencode /dev/stdout
+
+after_success:
+  - tail -n 200 error.log

classes/author/DAO.inc.php

@@ -13,9 +13,6 @@
 
 namespace APP\author;
 
-use APP\core\Application;
-use PKP\db\DAORegistry;
-use stdClass;
 use Illuminate\Support\Facades\DB;
 use APP\monograph\Chapter;
 

classes/author/Repository.inc.php

@@ -15,7 +15,6 @@
 
 use APP\core\Request;
 use PKP\Services\PKPSchemaService;
-use Illuminate\Support\Facades\App;
 use APP\monograph\Chapter;
 
 class Repository extends \PKP\author\Repository
@@ -28,7 +27,7 @@ public function __construct(DAO $dao, Request $request, PKPSchemaService $schema
     /** @copydoc DAO::getCollector() */
     public function getCollector(): Collector
     {
-        return App::make(Collector::class);
+        return app(Collector::class);
     }
 
     /**

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
@@ -24,26 +24,26 @@ class Repo extends \PKP\facades\Repo
 {
     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 author(): AuthorRepository
     {
-        return app()->make(AuthorRepository::class);
+        return app(AuthorRepository::class);
     }
 
     public static function submissionFile(): SubmissionFileRepository
     {
-        return app()->make(SubmissionFileRepository::class);
+        return app(SubmissionFileRepository::class);
     }
 }

classes/install/Install.inc.php

@@ -21,10 +21,6 @@
 
 namespace APP\install;
 
-// Default installation data
-define('INSTALLER_DEFAULT_CONTACT', 'common.omp');
-define('INSTALLER_DEFAULT_MIN_PASSWORD_LENGTH', 6);
-
 use PKP\install\PKPInstall;
 
 class Install extends PKPInstall

classes/migration/upgrade/OMPv3_3_0UpgradeMigration.inc.php

@@ -16,7 +16,6 @@
 use APP\core\Application;
 use APP\core\Services;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use PKP\core\EntityDAO;
@@ -101,7 +100,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");
                 }

classes/publication/DAO.inc.php

@@ -15,7 +15,6 @@
 
 use APP\core\Application;
 use PKP\db\DAORegistry;
-use stdClass;
 
 class DAO extends \PKP\publication\DAO
 {
@@ -39,7 +38,7 @@ class DAO extends \PKP\publication\DAO
     /**
      * @copydoc SchemaDAO::_fromRow()
      */
-    public function fromRow(stdClass $primaryRow): Publication
+    public function fromRow(object $primaryRow): Publication
     {
         $publication = parent::fromRow($primaryRow);
         $publication->setData('publicationFormats', Application::getRepresentationDao()->getByPublicationId($publication->getId())->toArray());

classes/statistics/StatisticsHelper.inc.php

@@ -59,5 +59,5 @@ protected function getReportObjectTypesArray()
 
 if (!PKP_STRICT_MODE) {
     class_alias('\APP\statistics\StatisticsHelper', '\StatisticsHelper');
-    define('STATISTICS_DIMENSION_SERIES_ID', \StatisticsHelper::STATISTICS_DIMENSION_SERIES_ID);
+    define('STATISTICS_DIMENSION_SERIES_ID', StatisticsHelper::STATISTICS_DIMENSION_SERIES_ID);
 }

classes/template/TemplateManager.inc.php

@@ -142,12 +142,12 @@ public function setupBackendPage()
             ];
 
             $index = array_search('submissions', array_keys($menu));
-            if ($index === false || count($menu) <= ($index + 1)) {
+            if ($index === false || count($menu) <= $index + 1) {
                 $menu['catalog'] = $catalogLink;
             } else {
-                $menu = array_slice($menu, 0, $index + 1, true) +
-                        ['catalog' => $catalogLink] +
-                        array_slice($menu, $index + 1, null, true);
+                $menu = array_slice($menu, 0, $index + 1, true)
+                    + ['catalog' => $catalogLink]
+                    + array_slice($menu, $index + 1, null, true);
             }
         }
 

config.TEMPLATE.inc.php

@@ -1,4 +1,4 @@
-; <?php exit(); // DO NOT DELETE?>
+; <?php exit; // DO NOT DELETE?>
 ; DO NOT DELETE THE ABOVE LINE!!!
 ; Doing so will expose this configuration file through your web site!
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

pages/catalog/CatalogBookHandler.inc.php

@@ -383,7 +383,7 @@ public function download($args, $request, $view = false)
             if ($view) {
                 if (HookRegistry::call('CatalogBookHandler::view', [&$this, &$submission, &$publicationFormat, &$submissionFile])) {
                     // If the plugin handled the hook, prevent further default activity.
-                    exit();
+                    exit;
                 }
             }
 
@@ -392,7 +392,7 @@ public function download($args, $request, $view = false)
             $inline = $request->getUserVar('inline') ? true : false;
             if (HookRegistry::call('CatalogBookHandler::download', [&$this, &$submission, &$publicationFormat, &$submissionFile, &$inline])) {
                 // If the plugin handled the hook, prevent further default activity.
-                exit();
+                exit;
             }
             $returner = true;
             HookRegistry::call('FileManager::downloadFileFinished', [&$returner]);

plugins/importexport/csv/CSVImportExportPlugin.inc.php

@@ -101,12 +101,12 @@ public function executeCLI($scriptName, &$args)
 
         if (!$filename || !$username) {
             $this->usage($scriptName);
-            exit();
+            exit;
         }
 
         if (!file_exists($filename)) {
             echo __('plugins.importexport.csv.fileDoesNotExist', ['filename' => $filename]) . "\n";
-            exit();
+            exit;
         }
 
         $data = file($filename);
@@ -115,7 +115,7 @@ public function executeCLI($scriptName, &$args)
             $user = Repo::user()->getByUsername($username);
             if (!$user) {
                 echo __('plugins.importexport.csv.unknownUser', ['username' => $username]) . "\n";
-                exit();
+                exit;
             }
 
             $pressDao = Application::getContextDAO();
@@ -145,7 +145,7 @@ public function executeCLI($scriptName, &$args)
 
                     if (!$genre) {
                         echo __('plugins.importexport.csv.noGenre') . "\n";
-                        exit();
+                        exit;
                     }
                     if (!$authorGroup) {
                         echo __('plugins.importexport.csv.noAuthorGroup', ['press' => $pressPath]) . "\n";

plugins/paymethod/manual/ManualPaymentPlugin.inc.php

@@ -187,7 +187,7 @@ public function handle($args, $request)
                     'backLinkLabel' => 'common.continue'
                 ]);
                 $templateMgr->display('frontend/pages/message.tpl');
-                exit();
+                exit;
         }
         parent::handle($args, $request); // Don't know what to do with it
     }

tools/bootstrap.inc.php

@@ -13,5 +13,5 @@
  *  to index.php for web requests).
  */
 
-define('INDEX_FILE_LOCATION', dirname(dirname(__FILE__)) . '/index.php');
-require(dirname(dirname(__FILE__)) . '/lib/pkp/classes/cliTool/CommandLineTool.inc.php');
+define('INDEX_FILE_LOCATION', dirname(__FILE__, 2) . '/index.php');
+require dirname(__FILE__, 2) . '/lib/pkp/classes/cliTool/CommandLineTool.inc.php';

tools/fixFilenames.php

@@ -38,7 +38,7 @@ public function __construct($argv = [])
             $this->dryrun = false;
         } else {
             $this->usage();
-            exit();
+            exit;
         }
     }