Merge pull request #4 from pkp/main

upstream

.gitignore

@@ -17,3 +17,4 @@ styles/build.css
 cypress.env.json
 cypress/logs/
 cypress/screenshots/
+.php_cs.cache

.php_cs

@@ -0,0 +1,50 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__);
+
+// Apply formatting to all plugins that are not git submodules
+$pluginsDir = __DIR__ . DIRECTORY_SEPARATOR . 'plugins';
+$files = scandir($pluginsDir);
+foreach ($files as $file) {
+    $categoryDir = $pluginsDir . DIRECTORY_SEPARATOR . $file;
+    if (!in_array($file, ['.', '..']) && is_dir($categoryDir)) {
+        $pluginDirs = scandir($categoryDir);
+        foreach ($pluginDirs as $pluginDir) {
+            $fullPluginPath = join(DIRECTORY_SEPARATOR, [$categoryDir, $pluginDir]);
+            $gitPath = join(DIRECTORY_SEPARATOR, [$fullPluginPath, '.git']);
+            if (!in_array($pluginDir, ['.', '..']) && is_dir($fullPluginPath) && !file_exists($gitPath)) {
+                $finder->in($fullPluginPath);
+            }
+        }
+    }
+}
+
+$finder->exclude([
+    'cache',
+    'cypress',
+    'dbscripts',
+    'docs',
+    'js',
+    'lib/pkp',
+    'lib/ui-library',
+    'locale',
+    'node_modules',
+    'public',
+    'plugins',
+    'registry',
+    'schemas',
+    'styles',
+    'templates',
+])
+    ->name('*.php')
+    ->name('_ide_helper')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+$rules = include './lib/pkp/.php_cs_rules';
+
+$config = new PhpCsFixer\Config();
+return $config->setRules($rules)
+    ->setFinder($finder);

.travis.yml

@@ -9,11 +9,15 @@ matrix:
     php: 7.3
   - env: TEST=pgsql
     php: 7.4
+  - env: TEST=pgsql
+    php: 8.0
   # MySQL / various PHP
   - env: TEST=mysql
     php: 7.3
   - env: TEST=mysql
     php: 7.4
+  - env: TEST=mysql
+    php: 8.0
   # Path info disabled (DISABLED pending a fix of pkp/pkp-lib#4414)
   # - env: TEST=mysql DISABLE_PATH_INFO=1
   #   php: 7.2

api/v1/_email/index.php

@@ -7,8 +7,8 @@
 /**
  * @file api/v1/_email/index.php
  *
- * Copyright (c) 2014-2020 Simon Fraser University
- * Copyright (c) 2003-2020 John Willinsky
+ * Copyright (c) 2014-2021 Simon Fraser University
+ * Copyright (c) 2003-2021 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @ingroup api_v1__email

api/v1/_payments/BackendPaymentsSettingsHandler.inc.php

@@ -2,13 +2,15 @@
 /**
  * @file api/v1/_payments/BackendPaymentsSettingsHandler.inc.php
  *
- * Copyright (c) 2014-2020 Simon Fraser University
- * Copyright (c) 2003-2020 John Willinsky
+ * Copyright (c) 2014-2021 Simon Fraser University
+ * Copyright (c) 2003-2021 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @class BackendPaymentsSettingsHandler
  * @ingroup api_v1_backend
  */
 import('lib.pkp.api.v1._payments.PKPBackendPaymentsSettingsHandler');
 
-class BackendPaymentsSettingsHandler extends PKPBackendPaymentsSettingsHandler {}
+class BackendPaymentsSettingsHandler extends PKPBackendPaymentsSettingsHandler
+{
+}

api/v1/_payments/index.php

@@ -7,8 +7,8 @@
 /**
  * @file api/v1/_payments/index.php
  *
- * Copyright (c) 2014-2020 Simon Fraser University
- * Copyright (c) 2003-2020 John Willinsky
+ * Copyright (c) 2014-2021 Simon Fraser University
+ * Copyright (c) 2003-2021 John Willinsky
  * Distributed under the GNU GPL v3. For full terms see the file docs/COPYING.
  *
  * @ingroup api_v1_backend