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

Template processor setValue() improvements #614 #617

Merged
3 commits merged into from Dec 12, 2015
Merged

Template processor setValue() improvements #614 #617

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a123ce4
Template processor setValue() improvements #614
kazitanvirahsan Sep 10, 2015
873d41a
Update Template processor setValue() improvements #614
kazitanvirahsan Sep 10, 2015
b446a23
Update 2 Template processor setValue() improvements #614
kazitanvirahsan Sep 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/PhpWord/TemplateProcessor.php
View file
Open in desktop
Expand Up @@ -144,6 +144,14 @@ public function applyXslStyleSheet($xslDOMDocument, $xslOptions = array(), $xslO
*/
public function setValue($macro, $replace, $limit = self::MAXIMUM_REPLACEMENTS_DEFAULT)
{
if (substr($macro, 0, 2) !== '${' && substr($macro, -1) !== '}') {
$macro = '${' . $macro . '}';
}

if (!String::isUTF8($replace)) {
$replace = utf8_encode($replace);
}

foreach ($this->tempDocumentHeaders as $index => $headerXML) {
$this->tempDocumentHeaders[$index] = $this->setValueForPart($this->tempDocumentHeaders[$index], $macro, $replace, $limit);
}
Expand Down Expand Up @@ -399,14 +407,6 @@ function ($match) {
*/
protected function setValueForPart($documentPartXML, $search, $replace, $limit)
{
if (substr($search, 0, 2) !== '${' && substr($search, -1) !== '}') {
$search = '${' . $search . '}';
}

if (!String::isUTF8($replace)) {
$replace = utf8_encode($replace);
}

// Note: we can't use the same function for both cases here, because of performance considerations.
if (self::MAXIMUM_REPLACEMENTS_DEFAULT === $limit) {
return str_replace($search, $replace, $documentPartXML);
Expand Down