From c7274ba28ed9e5a163227f4575bcb6a0e218ddd1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 3 Mar 2020 16:23:23 +0100 Subject: fix git repo URL --- all.php | 2 +- autocompleter.php | 2 +- class/CommonTable.php | 2 +- class/FedoraClient.php | 4 ++-- class/FedoraPkgdb.php | 4 ++-- class/PackagistClient.php | 4 ++-- class/Parser.php | 9 +++++++-- class/TableAcls.php | 2 +- class/TableIterator.php | 4 ++-- class/TablePackagist.php | 2 +- class/TablePearRepo.php | 2 +- class/TableRRepo.php | 2 +- class/TableRpm.php | 2 +- class/TableRpmRepo.php | 2 +- class/TableUpstream.php | 2 +- fedcli.php | 2 +- get.php | 2 +- include/config.php.dist | 2 +- include/main.php | 2 +- index.php | 2 +- pkgdb-ajax.php | 2 +- refresh.php | 2 +- rpm.php | 2 +- smarty/templates/rpmphp/index.tpl | 2 +- zoom.php | 2 +- 25 files changed, 35 insertions(+), 30 deletions(-) diff --git a/all.php b/all.php index ac0fa16..018f55e 100644 --- a/all.php +++ b/all.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ require 'include/main.php'; diff --git a/autocompleter.php b/autocompleter.php index d27601d..97972c3 100644 --- a/autocompleter.php +++ b/autocompleter.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ require 'include/main.php'; diff --git a/class/CommonTable.php b/class/CommonTable.php index fcf9e23..afd1b4a 100644 --- a/class/CommonTable.php +++ b/class/CommonTable.php @@ -28,7 +28,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ diff --git a/class/FedoraClient.php b/class/FedoraClient.php index a356a9b..0724666 100644 --- a/class/FedoraClient.php +++ b/class/FedoraClient.php @@ -8,7 +8,7 @@ * PHP version 5 * * Copyright (C) 2010-2014 Remi Collet - * http://github.com/remicollet/rpmphp. + * https://git.remirepo.net/cgit/web/rpmphp.git. * * Inspired from python-fedora * @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/lgpl-2.1.txt LGPL License 2.1 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ diff --git a/class/FedoraPkgdb.php b/class/FedoraPkgdb.php index 9bbdfd5..3030a61 100644 --- a/class/FedoraPkgdb.php +++ b/class/FedoraPkgdb.php @@ -8,7 +8,7 @@ * PHP version 5 * * Copyright (C) 2010-2014 Remi Collet - * http://github.com/remicollet/rpmphp. + * https://git.remirepo.net/cgit/web/rpmphp.git. * * Inspired from python-fedora * @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/lgpl-2.1.txt LGPL License 2.1 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ diff --git a/class/PackagistClient.php b/class/PackagistClient.php index 2cb1260..2fbb522 100644 --- a/class/PackagistClient.php +++ b/class/PackagistClient.php @@ -8,7 +8,7 @@ * PHP version 5 * * Copyright (C) 2014 Remi Collet - * http://github.com/remicollet/rpmphp. + * https://git.remirepo.net/cgit/web/rpmphp.git. * * Inspired from python-fedora * @@ -30,7 +30,7 @@ * @author Remi Collet * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/lgpl-2.1.txt LGPL License 2.1 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ diff --git a/class/Parser.php b/class/Parser.php index fc5059d..124b36e 100644 --- a/class/Parser.php +++ b/class/Parser.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ class Parser @@ -319,7 +319,12 @@ class Parser foreach ($fmt as $fmt2) { $prov = $fmt2->attributes()['name']; if (preg_match('/^php-composer\((.*)\)$/', $prov, $reg)) { - if (substr($reg[1], 0, 4) != 'ext-' + list($vend, $proj) = explode('/', $reg[1], 2); + if ($vend == 'zendframework') { + if (!$composer) { // only if empty to keep laminas + $composer = $reg[1]; + } + } else if (substr($reg[1], 0, 4) != 'ext-' && substr($reg[1], -15) != '-implementation' && !in_array($reg[1], $excl)) { $composer = $reg[1]; diff --git a/class/TableAcls.php b/class/TableAcls.php index 570385d..574340c 100644 --- a/class/TableAcls.php +++ b/class/TableAcls.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ class TableAcls extends CommonTable diff --git a/class/TableIterator.php b/class/TableIterator.php index ee92ee9..1a83219 100644 --- a/class/TableIterator.php +++ b/class/TableIterator.php @@ -28,7 +28,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ @@ -45,7 +45,7 @@ * @author Remi Collet * @author Johan Cwiklinski * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ */ class TableIterator implements Iterator { diff --git a/class/TablePackagist.php b/class/TablePackagist.php index 4dd25bf..c684eb1 100644 --- a/class/TablePackagist.php +++ b/class/TablePackagist.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ class TablePackagist extends CommonTable diff --git a/class/TablePearRepo.php b/class/TablePearRepo.php index 65ffeea..9c563c6 100644 --- a/class/TablePearRepo.php +++ b/class/TablePearRepo.php @@ -28,7 +28,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ diff --git a/class/TableRRepo.php b/class/TableRRepo.php index 226a796..ad683e7 100644 --- a/class/TableRRepo.php +++ b/class/TableRRepo.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ diff --git a/class/TableRpm.php b/class/TableRpm.php index 12ac623..6207ef1 100644 --- a/class/TableRpm.php +++ b/class/TableRpm.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ class TableRpm extends CommonTable diff --git a/class/TableRpmRepo.php b/class/TableRpmRepo.php index 1a30242..1b2617c 100644 --- a/class/TableRpmRepo.php +++ b/class/TableRpmRepo.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ class TableRpmRepo extends CommonTable diff --git a/class/TableUpstream.php b/class/TableUpstream.php index e94d266..e0c99c6 100644 --- a/class/TableUpstream.php +++ b/class/TableUpstream.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ class TableUpstream extends CommonTable diff --git a/fedcli.php b/fedcli.php index 88c65ca..4978db6 100755 --- a/fedcli.php +++ b/fedcli.php @@ -6,7 +6,7 @@ * fedcli.php is a command line tools to test FedoraClient clmsses * * Copyright (C) 2010-2014 Remi Collet - * http://github.com/remicollet/rpmphp. + * https://git.remirepo.net/cgit/web/rpmphp.git. * * Inspired from python-fedora * diff --git a/get.php b/get.php index e14845a..304cd41 100644 --- a/get.php +++ b/get.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ chdir(dirname($_SERVER["SCRIPT_FILENAME"])); diff --git a/include/config.php.dist b/include/config.php.dist index 9420631..0445cbd 100644 --- a/include/config.php.dist +++ b/include/config.php.dist @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ define("MYHOST", "xxx"); diff --git a/include/main.php b/include/main.php index 512aeb7..21479fa 100644 --- a/include/main.php +++ b/include/main.php @@ -30,7 +30,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ define('RPMPHP_VERSION', '1.0.0-dev'); diff --git a/index.php b/index.php index b8edab2..0e3e589 100644 --- a/index.php +++ b/index.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ require 'include/main.php'; diff --git a/pkgdb-ajax.php b/pkgdb-ajax.php index da0ae1a..82eb5b7 100644 --- a/pkgdb-ajax.php +++ b/pkgdb-ajax.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ header('Content-Type: application/json;charset=utf-8'); diff --git a/refresh.php b/refresh.php index 53d34c2..7fb4810 100644 --- a/refresh.php +++ b/refresh.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ chdir(dirname($_SERVER["SCRIPT_FILENAME"])); diff --git a/rpm.php b/rpm.php index 88de40d..003fc84 100644 --- a/rpm.php +++ b/rpm.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ require 'include/main.php'; diff --git a/smarty/templates/rpmphp/index.tpl b/smarty/templates/rpmphp/index.tpl index 7bf709a..aa07a77 100644 --- a/smarty/templates/rpmphp/index.tpl +++ b/smarty/templates/rpmphp/index.tpl @@ -58,6 +58,6 @@

Script sources

License : RPMPHP version {$rpmphp_version} is AGPL, FedoraClient version {$fedcli_version} is LGPLv2+, -

You can retrieve the current application sources from my GIT repository on github.com.

+

You can retrieve the current application sources from my GIT repository on github.com.

Feedbacks, RFE and patches are welcome.

diff --git a/zoom.php b/zoom.php index 31da51c..e9ec55c 100644 --- a/zoom.php +++ b/zoom.php @@ -31,7 +31,7 @@ * @author Johan Cwiklinski * @copyright 2010-2014 Remi Collet * @license http://www.gnu.org/licenses/agpl-3.0-standalone.html AGPL License 3.0 or (at your option) any later version - * @link http://github.com/remicollet/rpmphp/ + * @link https://git.remirepo.net/cgit/web/rpmphp.git/ * @since The begining of times. */ require 'include/main.php'; -- cgit