From 1aaadac51b1ffae5249e3d3dc1128892bab492ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 2 Aug 2022 08:03:28 +0000 Subject: [PATCH 1/3] Go explicit in PharRegistry --- src/shared/PharRegistry.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/PharRegistry.php b/src/shared/PharRegistry.php index 29584642..f885b740 100644 --- a/src/shared/PharRegistry.php +++ b/src/shared/PharRegistry.php @@ -86,8 +86,7 @@ public function addUsage(Phar $phar, Filename $destination): void { $oldUsage = $this->dbFile->query(sprintf('//phive:usage[@destination="%s"]', $absolutePath))->item(0); - if ($oldUsage !== null) { - assert($oldUsage->parentNode instanceof DOMNode); + if ($oldUsage->parentNode instanceof DOMNode) { $oldUsage->parentNode->removeChild($oldUsage); } From ddf4738ec2fbc27ac9c7a99a44d90a69116e7f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 2 Aug 2022 08:09:16 +0000 Subject: [PATCH 2/3] Update PharRegistry.php --- src/shared/PharRegistry.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/PharRegistry.php b/src/shared/PharRegistry.php index f885b740..a905c7c7 100644 --- a/src/shared/PharRegistry.php +++ b/src/shared/PharRegistry.php @@ -17,6 +17,7 @@ use function sprintf; use DOMElement; use DOMNode; +use DOMNodeList; use PharIo\FileSystem\Directory; use PharIo\FileSystem\DirectoryException; use PharIo\FileSystem\File; @@ -86,7 +87,7 @@ public function addUsage(Phar $phar, Filename $destination): void { $oldUsage = $this->dbFile->query(sprintf('//phive:usage[@destination="%s"]', $absolutePath))->item(0); - if ($oldUsage->parentNode instanceof DOMNode) { + if ($oldUsage instanceof DOMNodeList && $oldUsage->parentNode instanceof DOMNode) { $oldUsage->parentNode->removeChild($oldUsage); } From 0e561f57dfd7a9cfff5af7059f66b3c01c6d2314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 2 Aug 2022 08:12:28 +0000 Subject: [PATCH 3/3] Update PharRegistry.php --- src/shared/PharRegistry.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/PharRegistry.php b/src/shared/PharRegistry.php index a905c7c7..425706a6 100644 --- a/src/shared/PharRegistry.php +++ b/src/shared/PharRegistry.php @@ -87,7 +87,7 @@ public function addUsage(Phar $phar, Filename $destination): void { $oldUsage = $this->dbFile->query(sprintf('//phive:usage[@destination="%s"]', $absolutePath))->item(0); - if ($oldUsage instanceof DOMNodeList && $oldUsage->parentNode instanceof DOMNode) { + if ($oldUsage instanceof DOMNodeList) { $oldUsage->parentNode->removeChild($oldUsage); }