From 87ed4f687b041a337cee3d5f1799085d625a68e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 2 Dec 2020 07:19:47 +0100 Subject: [PATCH] Continued: - old array() replaced by "new" [] - updated core framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../package/assembler/class_PackageAssembler.php | 1 + .../urls/class_CrawlerUploadedListUrlSource.php | 12 ++++-------- core | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/application/hub/classes/package/assembler/class_PackageAssembler.php b/application/hub/classes/package/assembler/class_PackageAssembler.php index eb7f3bf62..a6e776c6f 100644 --- a/application/hub/classes/package/assembler/class_PackageAssembler.php +++ b/application/hub/classes/package/assembler/class_PackageAssembler.php @@ -130,6 +130,7 @@ class PackageAssembler extends BaseHubSystem implements Assembler, Registerable, $assemblerInstance->setStackInstance($stackInstance); // Return the prepared instance + //* DEBUG-DIE: */ die(sprintf('[%s:%d]: assemblerInstance=%s', __METHOD__, __LINE__, print_r($assemblerInstance, TRUE))); return $assemblerInstance; } diff --git a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php index ba2d141bf..e1aab13fa 100644 --- a/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php +++ b/application/hub/classes/source/urls/class_CrawlerUploadedListUrlSource.php @@ -231,11 +231,11 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R * forget to expand this array as well when you want to add another * column to the CSV file. */ - $csvArray = array( + $csvArray = [ self::CRAWL_JOB_ARRAY_START_URL => $csvData[0], self::CRAWL_JOB_ARRAY_DEPTH => $csvData[1], self::CRAWL_JOB_ARRAY_EXTERNAL_DEPTH => $csvData[2] - ); + ]; // Then add more data to it /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: csvArray()=' . count($csvArray) . ' - BEFORE!'); @@ -285,10 +285,8 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R * @throws NullPointerException If lastCsvFileInstance is not set */ private function addCsvFile () { - // Trace message - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: CALLED!'); - // Is the instance set? + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: CALLED!'); if (is_null($this->lastCsvFileInstance)) { // This should not happen throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); @@ -297,10 +295,8 @@ class CrawlerUploadedListUrlSource extends BaseUrlSource implements UrlSource, R return; } - // Debug message - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: this->lastCsvFileInstance=' . $this->lastCsvFileInstance); - // Stack this file + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CRAWLER-UPLOADED-LIST-URL-SOURCE: this->lastCsvFileInstance=' . $this->lastCsvFileInstance); $this->getStackSourceInstance()->pushNamed(self::STACK_NAME_CSV_FILE, $this->lastCsvFileInstance); // ... and mark it as "imported" diff --git a/core b/core index a535464e9..90f442d88 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a535464e99d3baa2b50830bdf57074db2f14340a +Subproject commit 90f442d88f7876a27ff75452e0ed1708b7dbc198 -- 2.39.5