Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrate from abandoned `Zend\Escaper` to `Laminas Escaper`

This commit is contained in:
Libor M 2020-10-18 13:16:43 +02:00
parent 4e4282a76e
commit f2516b08b1
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -62,8 +62,7 @@ PHPWord requires the following:
- PHP 5.3.3+ - PHP 5.3.3+
- [XML Parser extension](http://www.php.net/manual/en/xml.installation.php) - [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
- [Zend\Escaper component](http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html) - [Laminas Escaper component](https://docs.laminas.dev/laminas-escaper/intro/)
- [Zend\Stdlib component](http://framework.zend.com/manual/current/en/modules/zend.stdlib.hydrator.html)
- [Zip extension](http://php.net/manual/en/book.zip.php) (optional, used to write OOXML and ODF) - [Zip extension](http://php.net/manual/en/book.zip.php) (optional, used to write OOXML and ODF)
- [GD extension](http://php.net/manual/en/book.image.php) (optional, used to add images) - [GD extension](http://php.net/manual/en/book.image.php) (optional, used to add images)
- [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php) (optional, used to write OOXML and ODF) - [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php) (optional, used to write OOXML and ODF)

5
composer.json
View File

@ -60,7 +60,7 @@
"require": { "require": {
"php": "^5.3.3 || ^7.0 || ^8.0", "php": "^5.3.3 || ^7.0 || ^8.0",
"ext-xml": "*", "ext-xml": "*",
"zendframework/zend-escaper": "^2.2", "laminas/laminas-escaper": "^2.2",
"phpoffice/common": "^0.2.9" "phpoffice/common": "^0.2.9"
}, },
"require-dev": { "require-dev": {
@ -76,6 +76,9 @@
"mpdf/mpdf": "5.7.4 || 6.* || 7.* || 8.*", "mpdf/mpdf": "5.7.4 || 6.* || 7.* || 8.*",
"php-coveralls/php-coveralls": "1.1.0 || ^2.0" "php-coveralls/php-coveralls": "1.1.0 || ^2.0"
}, },
"replace": {
"laminas/laminas-zendframework-bridge": "*"
},
"suggest": { "suggest": {
"ext-zip": "Allows writing OOXML and ODF", "ext-zip": "Allows writing OOXML and ODF",
"ext-gd2": "Allows adding images", "ext-gd2": "Allows adding images",

4
docs/installing.rst
View File

@ -10,9 +10,7 @@ Mandatory:
- PHP 5.3.3+ - PHP 5.3.3+
- `XML Parser <http://www.php.net/manual/en/xml.installation.php>`__ extension - `XML Parser <http://www.php.net/manual/en/xml.installation.php>`__ extension
- `Zend\\Escaper <http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html>`__ component - `Laminas Escaper <https://docs.laminas.dev/laminas-escaper/intro/>`__ component
- Zend\\Stdlib component
- `Zend\\Validator <http://framework.zend.com/manual/current/en/modules/zend.validator.html>`__ component
Optional: Optional:

4
src/PhpWord/Writer/HTML/Element/AbstractElement.php
View File

@ -17,9 +17,9 @@
namespace PhpOffice\PhpWord\Writer\HTML\Element; namespace PhpOffice\PhpWord\Writer\HTML\Element;
use Laminas\Escaper\Escaper;
use PhpOffice\PhpWord\Element\AbstractElement as Element; use PhpOffice\PhpWord\Element\AbstractElement as Element;
use PhpOffice\PhpWord\Writer\AbstractWriter; use PhpOffice\PhpWord\Writer\AbstractWriter;
use Zend\Escaper\Escaper;
/** /**
* Abstract HTML element writer * Abstract HTML element writer
@ -50,7 +50,7 @@ abstract class AbstractElement
protected $withoutP = false; protected $withoutP = false;
/** /**
* @var \Zend\Escaper\Escaper|\PhpOffice\PhpWord\Escaper\AbstractEscaper * @var \Laminas\Escaper\Escaper|\PhpOffice\PhpWord\Escaper\AbstractEscaper
*/ */
protected $escaper; protected $escaper;

4
src/PhpWord/Writer/HTML/Part/AbstractPart.php
View File

@ -17,9 +17,9 @@
namespace PhpOffice\PhpWord\Writer\HTML\Part; namespace PhpOffice\PhpWord\Writer\HTML\Part;
use Laminas\Escaper\Escaper;
use PhpOffice\PhpWord\Exception\Exception; use PhpOffice\PhpWord\Exception\Exception;
use PhpOffice\PhpWord\Writer\AbstractWriter; use PhpOffice\PhpWord\Writer\AbstractWriter;
use Zend\Escaper\Escaper;
/** /**
* @since 0.11.0 * @since 0.11.0
@ -32,7 +32,7 @@ abstract class AbstractPart
private $parentWriter; private $parentWriter;
/** /**
* @var \Zend\Escaper\Escaper * @var \Laminas\Escaper\Escaper
*/ */
protected $escaper; protected $escaper;