From eedd00704607a9cfd31e2fc051f163031b8f4581 Mon Sep 17 00:00:00 2001 From: Dustin Wilson Date: Wed, 3 Nov 2021 22:55:42 -0500 Subject: [PATCH] Improvements --- RoboFile.php | 10 +++++----- composer.json | 2 +- lib/InnerNode/NodeCache.php | 12 +++++------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/RoboFile.php b/RoboFile.php index 7fadb52..966c3d3 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -91,17 +91,17 @@ class RoboFile extends \Robo\Tasks { protected function findCoverageEngine(): string { $dir = rtrim(ini_get("extension_dir"), "/").\DIRECTORY_SEPARATOR; - $ext = IS_WIN ? "dll" : (IS_MAC ? "dylib" : "so"); + $ext = IS_WIN ? "dll" : "so"; $php = escapeshellarg(\PHP_BINARY); $code = escapeshellarg(BASE."lib"); if (extension_loaded("pcov")) { - return "$php -d pcov.enabled=1 -d pcov.directory=$code"; + return "$php -d opcache.enable_cli=0 -d pcov.enabled=1 -d pcov.directory=$code"; } elseif (extension_loaded("xdebug")) { - return "$php -d xdebug.mode=coverage"; + return "$php -d opcache.enable_cli=0 -d xdebug.mode=coverage"; } elseif (file_exists($dir."pcov.$ext")) { - return "$php -d extension=pcov.$ext -d pcov.enabled=1 -d pcov.directory=$code"; + return "$php -d opcache.enable_cli=0 -d extension=pcov.$ext -d pcov.enabled=1 -d pcov.directory=$code"; } elseif (file_exists($dir."xdebug.$ext")) { - return "$php -d zend_extension=xdebug.$ext -d xdebug.mode=coverage"; + return "$php -d opcache.enable_cli=0 -d zend_extension=xdebug.$ext -d xdebug.mode=coverage"; } else { if (IS_WIN) { $dbg = dirname(\PHP_BINARY)."\\phpdbg.exe"; diff --git a/composer.json b/composer.json index 82b4e22..0654519 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "ext-dom": "*", "mensbeam/html-parser": "dev-master", "mensbeam/framework": "dev-main", - "symfony/css-selector": "^5.3", + "symfony/css-selector": "^5.3" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.3", diff --git a/lib/InnerNode/NodeCache.php b/lib/InnerNode/NodeCache.php index 98f1c29..7c1f0c2 100644 --- a/lib/InnerNode/NodeCache.php +++ b/lib/InnerNode/NodeCache.php @@ -17,14 +17,12 @@ class NodeCache { public function delete(\DOMNode|WrapperNode $node): void { $key = $this->key($node); - if ($key === false) { - return; + if ($key !== false) { + unset($this->wrapperArray[$key]); + unset($this->innerArray[$key]); + $this->wrapperArray = array_values($this->wrapperArray); + $this->innerArray = array_values($this->innerArray); } - - unset($this->wrapperArray[$key]); - unset($this->innerArray[$key]); - $this->wrapperArray = array_values($this->wrapperArray); - $this->innerArray = array_values($this->innerArray); } public function get(\DOMNode|WrapperNode $node): \DOMNode|WrapperNode|null {