Skip to content

Commit 7324070

Browse files
authored
Merge pull request #1284 from Trainmaster/feature-remove-zend-stdlib-dependency
Remove zend-stdlib dependency
2 parents 99d8b52 + d061c6d commit 7324070

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
"php": "^5.3.3 || ^7.0",
6262
"ext-xml": "*",
6363
"zendframework/zend-escaper": "^2.2",
64-
"zendframework/zend-stdlib": "^2.2 || ^3.0",
6564
"phpoffice/common": "^0.2"
6665
},
6766
"require-dev": {

src/PhpWord/TemplateProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
namespace PhpOffice\PhpWord;
1919

20+
use PhpOffice\Common\Text;
2021
use PhpOffice\PhpWord\Escaper\RegExp;
2122
use PhpOffice\PhpWord\Escaper\Xml;
2223
use PhpOffice\PhpWord\Exception\CopyFileException;
2324
use PhpOffice\PhpWord\Exception\CreateTemporaryFileException;
2425
use PhpOffice\PhpWord\Exception\Exception;
2526
use PhpOffice\PhpWord\Shared\ZipArchive;
26-
use Zend\Stdlib\StringUtils;
2727

2828
class TemplateProcessor
2929
{
@@ -192,7 +192,7 @@ protected static function ensureMacroCompleted($macro)
192192
*/
193193
protected static function ensureUtf8Encoded($subject)
194194
{
195-
if (!StringUtils::isValidUtf8($subject)) {
195+
if (!Text::isUTF8($subject)) {
196196
$subject = utf8_encode($subject);
197197
}
198198

0 commit comments

Comments
 (0)