Skip to content

Commit 0228bc1

Browse files
MCLOUD-13493: Normalized the version comparison logic
1 parent 7c679e8 commit 0228bc1

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/App/Logger/HandlerFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public function create(string $handler): AbstractProcessingHandler
8181
$levelOverride = $this->globalConfig->get(GlobalSection::VAR_MIN_LOGGING_LEVEL);
8282
$minLevel = !empty($levelOverride) ? $this->normalizeLevel($levelOverride) : self::UNDEFINED_LEVEL;
8383
$configuration = $this->logConfig->get($handler);
84+
$defaultLevelStream = !empty($levelOverride) ?
85+
$this->normalizeLevel($levelOverride)
86+
: Logger::INFO;
8487
} catch (ConfigException $exception) {
8588
throw new LoggerException($exception->getMessage(), $exception->getCode(), $exception);
8689
}
@@ -104,9 +107,6 @@ public function create(string $handler): AbstractProcessingHandler
104107
);
105108
break;
106109
case static::HANDLER_STREAM:
107-
$defaultLevelStream = !empty($levelOverride) ?
108-
$this->normalizeLevel($levelOverride)
109-
: Logger::INFO;
110110
$handlerInstance = new StreamHandler(
111111
$configuration->get('stream'),
112112
$minLevel ?: Logger::INFO

src/Service/OpenSearch.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ public function __construct(
5151
*/
5252
public function getFullEngineName(): string
5353
{
54-
return static::ENGINE_NAME; // Temporary adjustment for test
55-
5654
if ($this->magentoVersion->isGreaterOrEqual('2.4.4')) {
5755
return static::ENGINE_NAME;
5856
}

src/Service/Search/AbstractService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function getVersion(): string
117117
}
118118
}
119119

120-
return $this->version;
120+
return preg_replace('/-.*/', '', $this->version); // Removes any suffix after '-'
121121
}
122122

123123
/**

0 commit comments

Comments
 (0)