From ca0b23ef728b9de512b79abfbf25b2b848b2c583 Mon Sep 17 00:00:00 2001 From: Christian Sciberras Date: Fri, 1 Nov 2024 12:25:31 +0100 Subject: [PATCH 1/4] Use innerText instead of selenium call --- src/WebdriverClassicDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php index 00ac956..11a9f56 100644 --- a/src/WebdriverClassicDriver.php +++ b/src/WebdriverClassicDriver.php @@ -301,7 +301,7 @@ public function getHtml( #[Language('XPath')] string $xpath ): string { - return $this->getElementDomProperty($this->findElement($xpath), 'innerHTML'); + return $this->getElementDomProperty($this->findElement($xpath), 'innerText'); } public function getOuterHtml( From da4b11f93227a5981f9d19dfe60ba3afba1539f7 Mon Sep 17 00:00:00 2001 From: Christian Sciberras Date: Fri, 1 Nov 2024 12:28:36 +0100 Subject: [PATCH 2/4] Fix the right method -_- --- src/WebdriverClassicDriver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php index 11a9f56..d70bebe 100644 --- a/src/WebdriverClassicDriver.php +++ b/src/WebdriverClassicDriver.php @@ -294,14 +294,14 @@ public function getText( #[Language('XPath')] string $xpath ): string { - return str_replace(["\r", "\n"], ' ', $this->findElement($xpath)->getText()); + return $this->getElementDomProperty($this->findElement($xpath), 'innerText'); } public function getHtml( #[Language('XPath')] string $xpath ): string { - return $this->getElementDomProperty($this->findElement($xpath), 'innerText'); + return $this->getElementDomProperty($this->findElement($xpath), 'innerHTML'); } public function getOuterHtml( From cdf302569b5dc6f3baa3aea7e2bf24a68e3b711c Mon Sep 17 00:00:00 2001 From: Christian Sciberras Date: Fri, 1 Nov 2024 12:33:02 +0100 Subject: [PATCH 3/4] BC fix --- src/WebdriverClassicDriver.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php index d70bebe..3cb5037 100644 --- a/src/WebdriverClassicDriver.php +++ b/src/WebdriverClassicDriver.php @@ -294,7 +294,11 @@ public function getText( #[Language('XPath')] string $xpath ): string { - return $this->getElementDomProperty($this->findElement($xpath), 'innerText'); + return str_replace( + ["\r", "\n"], + ' ', + $this->getElementDomProperty($this->findElement($xpath), 'innerText') + ); } public function getHtml( From 70ff5002b32c2272859e8332811fb1cdfd4e175e Mon Sep 17 00:00:00 2001 From: Christian Sciberras Date: Fri, 1 Nov 2024 14:09:08 +0100 Subject: [PATCH 4/4] Apply fix from SE2 driver --- src/WebdriverClassicDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebdriverClassicDriver.php b/src/WebdriverClassicDriver.php index 3cb5037..b251678 100644 --- a/src/WebdriverClassicDriver.php +++ b/src/WebdriverClassicDriver.php @@ -295,7 +295,7 @@ public function getText( string $xpath ): string { return str_replace( - ["\r", "\n"], + ["\r\n", "\r", "\n"], ' ', $this->getElementDomProperty($this->findElement($xpath), 'innerText') );