From: Roland Häder <roland@mxchange.org>
Date: Tue, 14 Nov 2017 22:21:03 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d3194bf4fa92124e55cfc596e50abca8e6303944;p=core.git

Continued:
- also port this to SplFileInfo

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
index 9f8a8c0b..dd8c3356 100644
--- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
+++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
@@ -382,19 +382,19 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$idx = 1;
 
 			// Read the directory with some exceptions
-			while (($dataFile = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
+			while (($fileInfoInstance = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
 				// Debug message
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',this->getFileExtension()=' . $this->getFileExtension());
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInstance.extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
 
 				// Does the extension match?
-				if (substr($dataFile, -(strlen($this->getFileExtension()))) !== $this->getFileExtension()) {
+				if ($fileInfoInstance->getExtension() !== $this->getFileExtension()) {
 					// Skip this file!
 					continue;
 				} // END - if
 
 				// Read the file
-				$dataArray = $this->getDataArrayFromFile($pathName . $dataFile);
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',dataArray='.print_r($dataArray, true));
+				$dataArray = $this->getDataArrayFromFile($fileInfoInstance);
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.pathname=' . $fileInfoInstance->getPathname() . ',dataArray='.print_r($dataArray, true));
 
 				// Is this an array?
 				if (is_array($dataArray)) {
@@ -436,7 +436,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 					} // END - if
 				} else {
 					// Throw an exception here
-					throw new SqlException(array($this, sprintf('File &#39;%s&#39; contains invalid data.', $dataFile), self::DB_CODE_DATA_FILE_CORRUPT), self::EXCEPTION_SQL_QUERY);
+					throw new SqlException(array($this, sprintf('File &#39;%s&#39; contains invalid data.', $fileInfoInstance->getPathname()), self::DB_CODE_DATA_FILE_CORRUPT), self::EXCEPTION_SQL_QUERY);
 				}
 
 				// Count entry up
@@ -521,18 +521,21 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$searchInstance = $dataSetInstance->getSearchInstance();
 
 			// Read the directory with some exceptions
-			while (($dataFile = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
+			while (($fileInfoInstance = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
+				// Debug message
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInstance.extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
+
 				// Does the extension match?
-				if (substr($dataFile, -(strlen($this->getFileExtension()))) !== $this->getFileExtension()) {
+				if ($fileInfoInstance->getExtension() !== $this->getFileExtension()) {
 					// Debug message
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.extension=' . $fileInfoInstance->getExtension() . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
 					// Skip this file!
 					continue;
 				} // END - if
 
 				// Open this file for reading
-				$dataArray = $this->getDataArrayFromFile($pathName . $dataFile);
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',dataArray='.print_r($dataArray, true));
+				$dataArray = $this->getDataArrayFromFile($fileInfoInstance);
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.pathname=' . $fileInfoInstance->getPathname() . ',dataArray='.print_r($dataArray, true));
 
 				// Is this an array?
 				if (is_array($dataArray)) {
@@ -574,8 +577,8 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 						} // END - foreach
 
 						// Write the data to a local file
-						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Writing dataArray()=' . count($dataArray) . ' to ' . $dataFile . ' ...');
-						$this->writeDataArrayToFqfn($pathName . $dataFile, $dataArray);
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Writing dataArray()=' . count($dataArray) . ' to ' . $fileInfoInstance->getPathname() . ' ...');
+						$this->writeDataArrayToFqfn($fileInfoInstance, $dataArray);
 
 						// Count found entries up
 						$limitFound++;
@@ -658,17 +661,20 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$count = 0;
 
 			// Read the directory with some exceptions
-			while ($dataFile = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) {
+			while ($fileInfoInstance = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) {
+				// Debug message
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInstance.extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
+
 				// Does the extension match?
-				if (substr($dataFile, -(strlen($this->getFileExtension()))) !== $this->getFileExtension()) {
+				if ($fileInfoInstance->getExtension() !== $this->getFileExtension()) {
 					// Debug message
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.extension=' . $fileInfoInstance->getExtension() . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
 					// Skip this file!
 					continue;
 				} // END - if
 
 				// Count this row up
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataFile=' . $dataFile . ',getFileExtension()=' . $this->getFileExtension() . ' - COUNTED!');
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.pathname=' . $fileInfoInstance->getPathname() . ',getFileExtension()=' . $this->getFileExtension() . ' - COUNTED!');
 				$count++;
 			} // END - while
 		} catch (FrameworkException $e) {