Merge pull request #227 from mlocati/empty-emails

Support package.xml files with empty author emails
FriendsOfPHP · Feb 22, 2021 · 7db8ffe · 7db8ffe
2 parents 70fb1b9 + c28fb8b
commit 7db8ffe
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/features/pecl/install-extensions.feature b/features/pecl/install-extensions.feature
@@ -20,6 +20,7 @@ Feature: download and install PECL extensions
       | apc       | APC       |
       | apcu      | apcu      |
       | mongo     | mongo     |
+      | tensor    | tensor    |
       | zstd      | zstd      |
 
   Scenario Outline: Does NOT install extensions from PECL repository having wrong version in source code

diff --git a/src/Package/PHP/Util/XML/Loader.php b/src/Package/PHP/Util/XML/Loader.php
@@ -100,10 +100,19 @@ public function load($path, $versionOverride = null)
             $package['authors'] = [];
 
             foreach ($authors as $author) {
-                $package['authors'][] = [
-                    'name' => (string) $author->name,
-                    'email' => (string) $author->email,
+                $tmp = [
+                    'name' => trim((string) $author->name),
+                    'email' => trim((string) $author->email),
                 ];
+                if ($tmp['name'] === '') {
+                    unset($tmp['name']);
+                }
+                if ($tmp['email'] === '') {
+                    unset($tmp['email']);
+                }
+                if ($tmp !== []) {
+                    $package['authors'][] = $tmp;
+                }
             }
         }
 

diff --git a/tests/pecl-website/assets/tensor-2.1.4.tgz b/tests/pecl-website/assets/tensor-2.1.4.tgz
diff --git a/tests/pecl-website/web/index.php b/tests/pecl-website/web/index.php
@@ -67,6 +67,7 @@ static function ($errno, $errstr, $errfile, $errline): void {
     '/get/oci8/2.0.8' => "{$assetsDir}/oci8-2.0.8.tgz",
     '/get/sqlsrv' => "{$assetsDir}/sqlsrv-5.9.0beta2.tgz",
     '/get/swoole' => "{$assetsDir}/swoole-4.6.2.tgz",
+    '/get/tensor' => "{$assetsDir}/tensor-2.1.4.tgz",
     '/get/yaml' => "{$assetsDir}/yaml-2.2.1.tgz",
     '/get/zstd' => "{$assetsDir}/zstd-0.10.0.tgz",
 ];