diff --git a/docs/gpl-3.0.txt b/docs/gpl-3.0.txt index 94a9ed0..2a00065 100644 --- a/docs/gpl-3.0.txt +++ b/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 . + along with this program. If not, see . 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 -. +. 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 -. +. diff --git a/docs/license.md b/docs/license.md index 9136add..f48f382 100644 --- a/docs/license.md +++ b/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 . +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 . You may contact the copyright holder through XOOPS Project: diff --git a/index.php b/index.php index ea14d56..db4baed 100644 --- a/index.php +++ b/index.php @@ -1,2 +1,2 @@ * @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 diff --git a/src/Database/TableLoad.php b/src/Database/TableLoad.php index 7c244c4..4ba474f 100644 --- a/src/Database/TableLoad.php +++ b/src/Database/TableLoad.php @@ -22,7 +22,7 @@ * @package Xmf * @author Richard Griffith * @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(); diff --git a/src/Database/Tables.php b/src/Database/Tables.php index 2aabaea..1f71a41 100644 --- a/src/Database/Tables.php +++ b/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 = ''; diff --git a/src/Database/index.php b/src/Database/index.php index ea14d56..db4baed 100644 --- a/src/Database/index.php +++ b/src/Database/index.php @@ -1,2 +1,2 @@ * @author Richard Griffith * @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 diff --git a/src/Highlighter.php b/src/Highlighter.php index 7b5fd35..8390751 100644 --- a/src/Highlighter.php +++ b/src/Highlighter.php @@ -18,7 +18,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/IPAddress.php b/src/IPAddress.php index 5939f42..b5baf37 100644 --- a/src/IPAddress.php +++ b/src/IPAddress.php @@ -18,7 +18,7 @@ * @package Xmf * @author trabis * @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 diff --git a/src/Jwt/JsonWebToken.php b/src/Jwt/JsonWebToken.php index f062a7b..f52ee7f 100644 --- a/src/Jwt/JsonWebToken.php +++ b/src/Jwt/JsonWebToken.php @@ -22,7 +22,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Jwt/KeyFactory.php b/src/Jwt/KeyFactory.php index 1f4c9ef..de6387c 100644 --- a/src/Jwt/KeyFactory.php +++ b/src/Jwt/KeyFactory.php @@ -22,7 +22,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Jwt/TokenFactory.php b/src/Jwt/TokenFactory.php index 1936f4a..238a97a 100644 --- a/src/Jwt/TokenFactory.php +++ b/src/Jwt/TokenFactory.php @@ -21,7 +21,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Jwt/TokenReader.php b/src/Jwt/TokenReader.php index fc71b49..8bdb199 100644 --- a/src/Jwt/TokenReader.php +++ b/src/Jwt/TokenReader.php @@ -22,7 +22,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Jwt/index.php b/src/Jwt/index.php index ea14d56..db4baed 100644 --- a/src/Jwt/index.php +++ b/src/Jwt/index.php @@ -1,2 +1,2 @@ * @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 diff --git a/src/Key/Basic.php b/src/Key/Basic.php index d7118db..d2296d5 100644 --- a/src/Key/Basic.php +++ b/src/Key/Basic.php @@ -22,7 +22,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Key/FileStorage.php b/src/Key/FileStorage.php index 32dacbb..26ac6ca 100644 --- a/src/Key/FileStorage.php +++ b/src/Key/FileStorage.php @@ -20,7 +20,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Key/KeyAbstract.php b/src/Key/KeyAbstract.php index e7e12fb..90bff2d 100644 --- a/src/Key/KeyAbstract.php +++ b/src/Key/KeyAbstract.php @@ -20,7 +20,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Key/StorageInterface.php b/src/Key/StorageInterface.php index d7bf87a..e714170 100644 --- a/src/Key/StorageInterface.php +++ b/src/Key/StorageInterface.php @@ -20,7 +20,7 @@ * @package Xmf * @author Richard Griffith * @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 diff --git a/src/Key/index.php b/src/Key/index.php index ea14d56..db4baed 100644 --- a/src/Key/index.php +++ b/src/Key/index.php @@ -1,2 +1,2 @@ * @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 diff --git a/src/Metagen.php b/src/Metagen.php index 4de5c88..e52f374 100644 --- a/src/Metagen.php +++ b/src/Metagen.php @@ -19,7 +19,7 @@ * @author Richard Griffith * @author trabis * @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); } diff --git a/src/Module/Helper.php b/src/Module/Helper.php index 340c31c..e5e886d 100644 --- a/src/Module/Helper.php +++ b/src/Module/Helper.php @@ -24,7 +24,7 @@ * @author trabis * @author Richard Griffith * @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 diff --git a/src/Module/Helper/AbstractHelper.php b/src/Module/Helper/AbstractHelper.php index 92ae51b..01d7c1b 100644 --- a/src/Module/Helper/AbstractHelper.php +++ b/src/Module/Helper/AbstractHelper.php @@ -20,7 +20,7 @@ * @author trabis * @author Richard Griffith * @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); diff --git a/src/Module/Helper/Cache.php b/src/Module/Helper/Cache.php index a72ac04..f23f564 100644 --- a/src/Module/Helper/Cache.php +++ b/src/Module/Helper/Cache.php @@ -22,7 +22,7 @@ * @author trabis * @author Richard Griffith * @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 diff --git a/src/Module/Helper/GenericHelper.php b/src/Module/Helper/GenericHelper.php index c24dd5a..6cbba60 100644 --- a/src/Module/Helper/GenericHelper.php +++ b/src/Module/Helper/GenericHelper.php @@ -25,7 +25,7 @@ * @author trabis * @author Richard Griffith * @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')); } diff --git a/src/Module/Helper/Permission.php b/src/Module/Helper/Permission.php index 822b39c..32bd3f9 100644 --- a/src/Module/Helper/Permission.php +++ b/src/Module/Helper/Permission.php @@ -21,7 +21,7 @@ * @author trabis * @author Richard Griffith * @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'); } diff --git a/src/Module/Helper/Session.php b/src/Module/Helper/Session.php index c3d992a..879cdd2 100644 --- a/src/Module/Helper/Session.php +++ b/src/Module/Helper/Session.php @@ -22,7 +22,7 @@ * @author trabis * @author Richard Griffith * @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 diff --git a/src/Module/Helper/index.php b/src/Module/Helper/index.php index ea14d56..db4baed 100644 --- a/src/Module/Helper/index.php +++ b/src/Module/Helper/index.php @@ -1,2 +1,2 @@ $value) { - if (substr($name, 0, 5) === 'HTTP_') { + if ('HTTP_' === substr($name, 0, 5)) { $translatedName = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($name, 5)))); $headers[$translatedName] = $value; } @@ -377,7 +376,7 @@ public static function getHeader($headerName, $default = '') public static function hasVar($name, $hash = 'default') { $hash = strtoupper($hash); - if ($hash === 'METHOD') { + if ('METHOD' === $hash) { $hash = strtoupper($_SERVER['REQUEST_METHOD']); } @@ -402,7 +401,7 @@ public static function hasVar($name, $hash = 'default') public static function setVar($name, $value = null, $hash = 'method', $overwrite = true) { $hash = strtoupper($hash); - if ($hash === 'METHOD') { + if ('METHOD' === $hash) { $hash = strtoupper($_SERVER['REQUEST_METHOD']); } @@ -476,7 +475,7 @@ public static function get($hash = 'default', $mask = 0) { $hash = strtoupper($hash); - if ($hash === 'METHOD') { + if ('METHOD' === $hash) { $hash = strtoupper($_SERVER['REQUEST_METHOD']); } @@ -505,7 +504,7 @@ public static function get($hash = 'default', $mask = 0) } // Handle magic quotes compatibility - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() && ($hash !== 'FILES')) { + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() && ('FILES' !== $hash)) { $input = static::stripSlashesRecursive($input); } @@ -553,7 +552,7 @@ protected static function cleanVar($var, $mask = 0, $type = null) static $safeHtmlFilter = null; // convert $var in array if $type is ARRAY - if (strtolower((string)$type) === 'array' && !is_array($var)) { + if ('array' === strtolower((string)$type) && !is_array($var)) { $var = array($var); } diff --git a/src/StopWords.php b/src/StopWords.php index 48723fe..211a869 100644 --- a/src/StopWords.php +++ b/src/StopWords.php @@ -19,7 +19,7 @@ * @author Richard Griffith * @author trabis * @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 * @see https://en.wikipedia.org/wiki/Stop_words */ diff --git a/src/Uuid.php b/src/Uuid.php index fd8fec6..c90f444 100644 --- a/src/Uuid.php +++ b/src/Uuid.php @@ -18,7 +18,7 @@ * @package Xmf * @author Richard Griffith * @copyright 2017-2021 XOOPS Project (https://xoops.org) - * @license GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html) + * @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html) */ class Uuid { @@ -28,7 +28,7 @@ class Uuid /** * generate - generate a version 4 (random) UUID * - * Based on comment by pavel.volyntsev(at)gmail at http://php.net/manual/en/function.com-create-guid.php + * Based on comment by pavel.volyntsev(at)gmail at https://php.net/manual/en/function.com-create-guid.php * * @return string UUID * diff --git a/src/Yaml.php b/src/Yaml.php index f9c214c..f253d5a 100644 --- a/src/Yaml.php +++ b/src/Yaml.php @@ -30,7 +30,7 @@ * @package Xmf * @author Richard Griffith * @copyright 2013-2020 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 * @see http://www.yaml.org/ */ diff --git a/src/index.php b/src/index.php index ea14d56..db4baed 100644 --- a/src/index.php +++ b/src/index.php @@ -1,2 +1,2 @@