fix git repo URL

13 files changed, 23 insertions, 18 deletions

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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <remi@fedoraproject.org>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <unknown@unknwown.com>
  * @author   Johan Cwiklinski <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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 <johan@x-tnd.be>
  * @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