Don't invoke instance methods statically (#166)

php · Oct 24, 2024 · 8485990 · 8485990
1 parent ec49154
commit 8485990
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/phpdotnet/phd/Package/PEAR/XHTML.php b/phpdotnet/phd/Package/PEAR/XHTML.php
@@ -407,9 +407,9 @@ abstract class Package_PEAR_XHTML extends Package_Generic_XHTML {
      */
     public function __construct(Config $config) {
         parent::__construct($config);
-        $this->myelementmap = array_merge(parent::getDefaultElementMap(), static::getDefaultElementMap());
-        $this->mytextmap = array_merge(parent::getDefaultTextMap(), static::getDefaultTextMap());
-        $this->dchunk = array_merge(parent::getDefaultChunkInfo(), static::getDefaultChunkInfo());
+        $this->myelementmap = array_merge(parent::getDefaultElementMap(), $this->getDefaultElementMap());
+        $this->mytextmap = array_merge(parent::getDefaultTextMap(), $this->getDefaultTextMap());
+        $this->dchunk = array_merge(parent::getDefaultChunkInfo(), $this->getDefaultChunkInfo());
     }
 
    /**

diff --git a/phpdotnet/phd/Package/PHP/Manpage.php b/phpdotnet/phd/Package/PHP/Manpage.php
@@ -42,7 +42,7 @@ public function __construct(Config $config) {
 
         $this->registerFormatName("PHP-Functions");
         $this->setTitle("PHP Manual");
-        $this->dchunk = array_merge(parent::getDefaultChunkInfo(), static::getDefaultChunkInfo());
+        $this->dchunk = array_merge(parent::getDefaultChunkInfo(), $this->getDefaultChunkInfo());
     }
 
     public function __destruct() {
@@ -56,8 +56,8 @@ public function update($event, $value = null) {
                 $this->registerElementMap(array_merge(parent::getDefaultElementMap(), $this->elementmap));
                 $this->registerTextMap(array_merge(parent::getDefaultTextMap(), $this->textmap));
             } else {
-                $this->registerElementMap(static::getDefaultElementMap());
-                $this->registerTextMap(static::getDefaultTextMap());
+                $this->registerElementMap($this->getDefaultElementMap());
+                $this->registerTextMap($this->getDefaultTextMap());
             }
             break;
         default:

diff --git a/phpdotnet/phd/Package/PHP/XHTML.php b/phpdotnet/phd/Package/PHP/XHTML.php
@@ -210,9 +210,9 @@ abstract class Package_PHP_XHTML extends Package_Generic_XHTML {
 
     public function __construct(Config $config) {
         parent::__construct($config);
-        $this->myelementmap = array_merge(parent::getDefaultElementMap(), static::getDefaultElementMap());
-        $this->mytextmap = array_merge(parent::getDefaultTextMap(), static::getDefaultTextMap());
-        $this->dchunk = array_merge(parent::getDefaultChunkInfo(), static::getDefaultChunkInfo());
+        $this->myelementmap = array_merge(parent::getDefaultElementMap(), $this->getDefaultElementMap());
+        $this->mytextmap = array_merge(parent::getDefaultTextMap(), $this->getDefaultTextMap());
+        $this->dchunk = array_merge(parent::getDefaultChunkInfo(), $this->getDefaultChunkInfo());
         $this->registerPIHandlers($this->pihandlers);
 
         if ($this->config->css() === []) {