Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better error handling when XML file can't be parsed (shows broken XML file path). More PHP 7-ish. #1372

Closed
wants to merge 2 commits into from
Closed

Better error handling when XML file can't be parsed (shows broken XML file path). More PHP 7-ish. #1372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3f4c5c
Better error handling when XML file can't be parsed (shows broken XML…
woutersamaey Jan 5, 2021
f501079
Update Config.php
woutersamaey Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/Varien/Simplexml/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,12 @@ public function loadFile($filePath)

$fileData = file_get_contents($filePath);
$fileData = $this->processFileData($fileData);
return $this->loadString($fileData, $this->_elementClass);
$success = $this->loadString($fileData, $this->_elementClass);

if($success === false){
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have forgotten spaces :)

Mage::throwException('Cannot parse XML file at '.$filePath);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Mage::throwException('Cannot parse XML file at '.$filePath);
Mage::throwException('Cannot parse XML file at ' . $filePath);

}
return $success;
}

/**
Expand All @@ -507,14 +512,14 @@ public function loadFile($filePath)
public function loadString($string)
{
if (is_string($string)) {
$xml = simplexml_load_string($string, $this->_elementClass);
$xml = @simplexml_load_string($string, $this->_elementClass);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please explain why do we need @ here?


if ($xml instanceof Varien_Simplexml_Element) {
$this->_xml = $xml;
return true;
}
} else {
Mage::logException(new Exception('"$string" parameter for simplexml_load_string is not a string'));
Mage::logException(new InvalidArgumentException('"$string" parameter for simplexml_load_string is not a string'));
}
return false;
}
Expand Down