From 95836fe83e3cfe40b1a05728e2986adc736d2d7d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 13 Dec 2021 18:50:10 +0100 Subject: [PATCH] Continued: - renamed methods to make them more clear - updated 'core' framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../classes/iterator/network/class_NetworkListenIterator.php | 2 +- .../classes/iterator/pool/handler/class_HandlerPoolIterator.php | 2 +- .../classes/iterator/pool/monitor/class_MonitorPoolIterator.php | 2 +- .../iterator/pool/shutdown/class_ShutdownPoolIterator.php | 2 +- .../hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php | 2 +- core | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/hub/classes/iterator/network/class_NetworkListenIterator.php b/application/hub/classes/iterator/network/class_NetworkListenIterator.php index 9a13d3433..00125fbef 100644 --- a/application/hub/classes/iterator/network/class_NetworkListenIterator.php +++ b/application/hub/classes/iterator/network/class_NetworkListenIterator.php @@ -83,7 +83,7 @@ class NetworkListenIterator extends BaseIterator implements Iterator { } // Now get the entry - $current = $this->getListInstance()->getEntry($this->key()); + $current = $this->getListInstance()->getEntryByIndex($this->key()); // Return it return $current; diff --git a/application/hub/classes/iterator/pool/handler/class_HandlerPoolIterator.php b/application/hub/classes/iterator/pool/handler/class_HandlerPoolIterator.php index 7220db2a9..2a68fc7b0 100644 --- a/application/hub/classes/iterator/pool/handler/class_HandlerPoolIterator.php +++ b/application/hub/classes/iterator/pool/handler/class_HandlerPoolIterator.php @@ -83,7 +83,7 @@ class HandlerPoolIterator extends BaseIterator implements Iterator { } // Now get the entry - $current = $this->getListInstance()->getEntry($this->key()); + $current = $this->getListInstance()->getEntryByIndex($this->key()); // Return it return $current; diff --git a/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php b/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php index dd1c722d5..f3446541a 100644 --- a/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php +++ b/application/hub/classes/iterator/pool/monitor/class_MonitorPoolIterator.php @@ -84,7 +84,7 @@ class MonitorPoolIterator extends BaseIterator implements Iterator, Registerable } // Now get the entry - $current = $this->getListInstance()->getEntry($this->key()); + $current = $this->getListInstance()->getEntryByIndex($this->key()); // Return it return $current; diff --git a/application/hub/classes/iterator/pool/shutdown/class_ShutdownPoolIterator.php b/application/hub/classes/iterator/pool/shutdown/class_ShutdownPoolIterator.php index 283c78a63..7204a5405 100644 --- a/application/hub/classes/iterator/pool/shutdown/class_ShutdownPoolIterator.php +++ b/application/hub/classes/iterator/pool/shutdown/class_ShutdownPoolIterator.php @@ -81,7 +81,7 @@ class ShutdownPoolIterator extends BaseIterator implements Iterator { } // Now get the entry - $current = $this->getListInstance()->getEntry($this->key()); + $current = $this->getListInstance()->getEntryByIndex($this->key()); // Return it return $current; diff --git a/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php b/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php index cc63bc4cd..d1182ca25 100644 --- a/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php +++ b/application/hub/classes/iterator/pool/tasks/class_TaskPoolIterator.php @@ -84,7 +84,7 @@ class TaskPoolIterator extends BaseIterator implements Iterator, Registerable { } // Now get the entry - $current = $this->getListInstance()->getEntry($this->key()); + $current = $this->getListInstance()->getEntryByIndex($this->key()); // Return it return $current; diff --git a/core b/core index 8d68f4eec..08578b5e2 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 8d68f4eec6508b1c1d49ef98a8bbbf0b27edd6b2 +Subproject commit 08578b5e2e37e31e45d24c17c01a6b8bc0abd53b -- 2.39.5