Merge branch 'master' into feature/improvements

.github/workflows/pr_tests.yml

@@ -3,7 +3,7 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  phpunit:
+  phpunit-7-1:
     strategy:
       fail-fast: false
       matrix:
@@ -20,5 +20,25 @@ jobs:
         with:
           php-version: ${{ matrix.php_version }}
           coverage: xdebug
-      - name: Unit Tests
-        run: vendor/bin/phpunit --stderr
+      - name: Unit Tests with PHPUnit 7.1
+        run: vendor/bin/phpunit --stderr --version 7.1
+
+  phpunit-9-6:
+    strategy:
+      fail-fast: false
+      matrix:
+        php_version: ["8.1"]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: php-actions/composer@v6
+        with:
+          php_version: "7.4"
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          coverage: xdebug
+      - name: Unit Tests with PHPUnit 9.6
+        run: vendor/bin/phpunit --stderr --version 9.6

docs/gpl-3.0.txt

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.

docs/license.md

@@ -9,6 +9,6 @@ Some portions of this work are licensed under the GNU Lesser General Public Lice
 
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License, and the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
+You should have received a copy of the GNU General Public License, and the GNU Lesser General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 You may contact the copyright holder through XOOPS Project: <https://xoops.org>

index.php

@@ -1,2 +1,2 @@
 <?php
-    header("HTTP/1.0 404 Not Found");
+    header('HTTP/1.0 404 Not Found');

src/Assert.php

@@ -20,7 +20,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2017 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Assert extends BaseAssertion

src/Database/TableLoad.php

@@ -22,7 +22,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2013-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class TableLoad
@@ -130,7 +130,7 @@ public static function countRows($table, $criteria = null)
         $prefixedTable = $db->prefix($table);
         $sql = 'SELECT COUNT(*) as `count` FROM ' . $prefixedTable . ' ';
         if (isset($criteria) && is_subclass_of($criteria, '\CriteriaElement')) {
-            /* @var  \CriteriaCompo $criteria */
+            /** @var  \CriteriaCompo $criteria */
             $sql .= $criteria->renderWhere();
         }
         $result = $db->query($sql);
@@ -157,7 +157,7 @@ public static function extractRows($table, $criteria = null, $skipColumns = arra
         $prefixedTable = $db->prefix($table);
         $sql = 'SELECT * FROM ' . $prefixedTable . ' ';
         if (isset($criteria) && is_subclass_of($criteria, '\CriteriaElement')) {
-            /* @var  \CriteriaCompo $criteria */
+            /** @var  \CriteriaCompo $criteria */
             $sql .= $criteria->renderWhere();
         }
         $rows = array();

src/Database/Tables.php

@@ -624,7 +624,7 @@ public function delete($table, $criteria)
             if (is_scalar($criteria)) {
                 $where = $criteria;
             } elseif (is_object($criteria)) {
-                /* @var  \CriteriaCompo $criteria */
+                /** @var  \CriteriaCompo $criteria */
                 $where = $criteria->renderWhere();
             }
             $this->queue[] = "DELETE FROM `{$tableDef['name']}` {$where}";
@@ -685,7 +685,7 @@ public function update($table, $columns, $criteria, $quoteValue = true)
             if (is_scalar($criteria)) {
                 $where = $criteria;
             } elseif (is_object($criteria)) {
-                /* @var  \CriteriaCompo $criteria */
+                /** @var  \CriteriaCompo $criteria */
                 $where = $criteria->renderWhere();
             }
             $colSql = '';

src/Database/index.php

@@ -1,2 +1,2 @@
 <?php
-    header("HTTP/1.0 404 Not Found");
+    header('HTTP/1.0 404 Not Found');

src/Debug.php

@@ -19,7 +19,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2011-2021 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Debug extends \Kint

src/Highlighter.php

@@ -18,7 +18,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2011-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Highlighter

src/IPAddress.php

@@ -18,7 +18,7 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @copyright 2018-2021 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class IPAddress

src/Jwt/JsonWebToken.php

@@ -22,7 +22,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2018-2023 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class JsonWebToken

src/Jwt/KeyFactory.php

@@ -22,7 +22,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2016-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class KeyFactory

src/Jwt/TokenFactory.php

@@ -21,7 +21,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2016-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class TokenFactory

src/Jwt/TokenReader.php

@@ -22,7 +22,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2016-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class TokenReader

src/Jwt/index.php

@@ -1,2 +1,2 @@
 <?php
-    header("HTTP/1.0 404 Not Found");
+    header('HTTP/1.0 404 Not Found');

src/Key/ArrayStorage.php

@@ -20,7 +20,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class ArrayStorage extends \ArrayObject implements StorageInterface

src/Key/Basic.php

@@ -22,7 +22,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2018-2023 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Basic extends KeyAbstract

src/Key/FileStorage.php

@@ -20,7 +20,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2016-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class FileStorage implements StorageInterface

src/Key/KeyAbstract.php

@@ -20,7 +20,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2018-2023 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 abstract class KeyAbstract

src/Key/StorageInterface.php

@@ -20,7 +20,7 @@
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
  * @copyright 2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 interface StorageInterface

src/Key/index.php

@@ -1,2 +1,2 @@
 <?php
-    header("HTTP/1.0 404 Not Found");
+    header('HTTP/1.0 404 Not Found');

src/Language.php

@@ -18,7 +18,7 @@
  * @package   Xmf
  * @author    trabis <[email protected]>
  * @copyright 2011-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Language

src/Metagen.php

@@ -19,7 +19,7 @@
  * @author    Richard Griffith <[email protected]>
  * @author    trabis <[email protected]>
  * @copyright 2011-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Metagen
@@ -59,7 +59,7 @@ public static function assignTitle($title)
      */
     public static function assignKeywords($keywords)
     {
-        if (!empty($keywords) && is_array($keywords)) {
+        if (!empty($keywords) && \is_array($keywords)) {
             $keyword_tag = implode(', ', $keywords);
             static::assignThemeMeta('keywords', $keyword_tag);
         }

src/Module/Helper.php

@@ -24,7 +24,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2011-2023 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Helper extends GenericHelper

src/Module/Helper/AbstractHelper.php

@@ -20,7 +20,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2016-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 abstract class AbstractHelper
@@ -67,7 +67,7 @@ public function __construct($dirname = null)
             if (isset($xoops)) {
                 $moduleHandler = $xoops->getHandlerModule();
             } else {
-                /* @var \XoopsModuleHandler $moduleHandler */
+                /** @var \XoopsModuleHandler $moduleHandler */
                 $moduleHandler = xoops_getHandler('module');
             }
             $this->module = $moduleHandler->getByDirname($dirname);

src/Module/Helper/Cache.php

@@ -22,7 +22,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2011-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Cache extends AbstractHelper

src/Module/Helper/GenericHelper.php

@@ -25,7 +25,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2016-2023 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 abstract class GenericHelper extends AbstractHelper
@@ -141,7 +141,7 @@ protected function initObject()
         ) {
             $this->module = $xoopsModule;
         } else {
-            /* @var \XoopsModuleHandler $module_handler */
+            /** @var \XoopsModuleHandler $module_handler */
             $module_handler = xoops_getHandler('module');
             $this->module = $module_handler->getByDirname($this->dirname);
         }
@@ -163,7 +163,7 @@ protected function initConfig()
             global $xoopsModuleConfig;
             $this->configs = $xoopsModuleConfig;
         } else {
-            /* @var \XoopsConfigHandler $config_handler */
+            /** @var \XoopsConfigHandler $config_handler */
             $config_handler = xoops_getHandler('config');
             $this->configs = $config_handler->getConfigsByCat(0, $this->getModule()->getVar('mid'));
         }

src/Module/Helper/Permission.php

@@ -21,7 +21,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2011-2023 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Permission extends AbstractHelper
@@ -50,7 +50,7 @@ public function init()
     {
         $this->mid = $this->module->getVar('mid');
         $this->dirname = $this->module->getVar('dirname');
-        /* @var $this->permissionHandler XoopsGroupPermHandler */
+        /** @var $this->permissionHandler XoopsGroupPermHandler */
         $this->permissionHandler = xoops_getHandler('groupperm');
     }
 

src/Module/Helper/Session.php

@@ -22,7 +22,7 @@
  * @author    trabis <[email protected]>
  * @author    Richard Griffith <[email protected]>
  * @copyright 2011-2018 XOOPS Project (https://xoops.org)
- * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
+ * @license   GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
 class Session extends AbstractHelper

src/Module/Helper/index.php

@@ -1,2 +1,2 @@
 <?php
-    header("HTTP/1.0 404 Not Found");
+    header('HTTP/1.0 404 Not Found');

src/Module/index.php

@@ -1,2 +1,2 @@
 <?php
-    header("HTTP/1.0 404 Not Found");
+    header('HTTP/1.0 404 Not Found');