diff --git a/src/PhpWord/Reader/AbstractReader.php b/src/PhpWord/Reader/AbstractReader.php index a243c5d2..3cc2d490 100644 --- a/src/PhpWord/Reader/AbstractReader.php +++ b/src/PhpWord/Reader/AbstractReader.php @@ -22,6 +22,7 @@ use PhpOffice\PhpWord\Exception\Exception; /** * Reader abstract class * + * @since 0.8.0 * @codeCoverageIgnore Abstract class */ abstract class AbstractReader implements ReaderInterface diff --git a/src/PhpWord/Reader/ODText/AbstractPart.php b/src/PhpWord/Reader/ODText/AbstractPart.php index 815e60fd..392c3126 100644 --- a/src/PhpWord/Reader/ODText/AbstractPart.php +++ b/src/PhpWord/Reader/ODText/AbstractPart.php @@ -22,6 +22,9 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Abstract part reader + * + * @since 0.10.0 + * @codeCoverageIgnore Nothing in here yet */ abstract class AbstractPart extends Word2007AbstractPart { diff --git a/src/PhpWord/Reader/ReaderInterface.php b/src/PhpWord/Reader/ReaderInterface.php index df663197..361c4137 100644 --- a/src/PhpWord/Reader/ReaderInterface.php +++ b/src/PhpWord/Reader/ReaderInterface.php @@ -19,6 +19,8 @@ namespace PhpOffice\PhpWord\Reader; /** * Reader interface + * + * @since 0.8.0 */ interface ReaderInterface { diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php index 9a0e0c63..2289a5e8 100644 --- a/src/PhpWord/Reader/Word2007/AbstractPart.php +++ b/src/PhpWord/Reader/Word2007/AbstractPart.php @@ -24,6 +24,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; * Abstract part reader * * This class is inherited by ODText reader + * + * @since 0.10.0 */ abstract class AbstractPart { @@ -466,6 +468,7 @@ abstract class AbstractPart } } + /** @var array $styles Type hint */ return $styles; } diff --git a/src/PhpWord/Reader/Word2007/DocPropsApp.php b/src/PhpWord/Reader/Word2007/DocPropsApp.php index 06b58bcb..ddbe474f 100644 --- a/src/PhpWord/Reader/Word2007/DocPropsApp.php +++ b/src/PhpWord/Reader/Word2007/DocPropsApp.php @@ -19,6 +19,8 @@ namespace PhpOffice\PhpWord\Reader\Word2007; /** * Extended properties reader + * + * @since 0.10.0 */ class DocPropsApp extends DocPropsCore { diff --git a/src/PhpWord/Reader/Word2007/DocPropsCore.php b/src/PhpWord/Reader/Word2007/DocPropsCore.php index ae59ad51..0b92b64d 100644 --- a/src/PhpWord/Reader/Word2007/DocPropsCore.php +++ b/src/PhpWord/Reader/Word2007/DocPropsCore.php @@ -22,6 +22,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Core properties reader + * + * @since 0.10.0 */ class DocPropsCore extends AbstractPart { diff --git a/src/PhpWord/Reader/Word2007/DocPropsCustom.php b/src/PhpWord/Reader/Word2007/DocPropsCustom.php index 969118b1..efbbfaa5 100644 --- a/src/PhpWord/Reader/Word2007/DocPropsCustom.php +++ b/src/PhpWord/Reader/Word2007/DocPropsCustom.php @@ -23,6 +23,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Custom properties reader + * + * @since 0.11.0 */ class DocPropsCustom extends AbstractPart { diff --git a/src/PhpWord/Reader/Word2007/Document.php b/src/PhpWord/Reader/Word2007/Document.php index 3ac4e0eb..34460b52 100644 --- a/src/PhpWord/Reader/Word2007/Document.php +++ b/src/PhpWord/Reader/Word2007/Document.php @@ -22,6 +22,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Document reader + * + * @since 0.10.0 */ class Document extends AbstractPart { diff --git a/src/PhpWord/Reader/Word2007/Endnotes.php b/src/PhpWord/Reader/Word2007/Endnotes.php index 02bf9e9e..c493c347 100644 --- a/src/PhpWord/Reader/Word2007/Endnotes.php +++ b/src/PhpWord/Reader/Word2007/Endnotes.php @@ -19,6 +19,8 @@ namespace PhpOffice\PhpWord\Reader\Word2007; /** * Endnotes reader + * + * @since 0.10.0 */ class Endnotes extends Footnotes { diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php index 7aadf6c0..47713cfb 100644 --- a/src/PhpWord/Reader/Word2007/Footnotes.php +++ b/src/PhpWord/Reader/Word2007/Footnotes.php @@ -22,6 +22,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Footnotes reader + * + * @since 0.10.0 */ class Footnotes extends AbstractPart { diff --git a/src/PhpWord/Reader/Word2007/Numbering.php b/src/PhpWord/Reader/Word2007/Numbering.php index 81939ae8..2dd3f521 100644 --- a/src/PhpWord/Reader/Word2007/Numbering.php +++ b/src/PhpWord/Reader/Word2007/Numbering.php @@ -22,6 +22,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Numbering reader + * + * @since 0.10.0 */ class Numbering extends AbstractPart { diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php index dd73f410..7dc4b6ea 100644 --- a/src/PhpWord/Reader/Word2007/Styles.php +++ b/src/PhpWord/Reader/Word2007/Styles.php @@ -22,6 +22,8 @@ use PhpOffice\PhpWord\Shared\XMLReader; /** * Styles reader + * + * @since 0.10.0 */ class Styles extends AbstractPart { diff --git a/tests/PhpWord/Tests/Element/ListItemRunTest.php b/tests/PhpWord/Tests/Element/ListItemRunTest.php index c034a8f8..37d679f9 100644 --- a/tests/PhpWord/Tests/Element/ListItemRunTest.php +++ b/tests/PhpWord/Tests/Element/ListItemRunTest.php @@ -51,6 +51,17 @@ class ListItemRunTest extends \PHPUnit_Framework_TestCase $this->assertEquals($oListItemRun->getParagraphStyle(), 'pStyle'); } + /** + * New instance with string + */ + public function testConstructListString() + { + $oListItemRun = new ListItemRun(0, 'numberingStyle'); + + $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\ListItemRun', $oListItemRun); + $this->assertCount(0, $oListItemRun->getElements()); + } + /** * New instance with array */ diff --git a/tests/PhpWord/Tests/SettingsTest.php b/tests/PhpWord/Tests/SettingsTest.php index d188595e..36565eb1 100644 --- a/tests/PhpWord/Tests/SettingsTest.php +++ b/tests/PhpWord/Tests/SettingsTest.php @@ -103,6 +103,14 @@ class SettingsTest extends \PHPUnit_Framework_TestCase 'defaultFontName' => 'Arial', 'defaultFontSize' => 10, ); + + // Test default value + $this->assertEquals($expected, Settings::loadConfig()); + + // Test with valid file $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.ini.dist')); + + // Test with invalid file + $this->assertEmpty(Settings::loadConfig(__DIR__ . '/files/xsl/passthrough.xsl')); } } diff --git a/tests/PhpWord/Tests/Shared/StringTest.php b/tests/PhpWord/Tests/Shared/StringTest.php index 086823a2..bf5862fb 100644 --- a/tests/PhpWord/Tests/Shared/StringTest.php +++ b/tests/PhpWord/Tests/Shared/StringTest.php @@ -54,4 +54,14 @@ class StringTest extends \PHPUnit_Framework_TestCase $this->assertEquals('', String::controlCharacterPHP2OOXML('')); $this->assertEquals('_x0008_', String::controlCharacterPHP2OOXML(chr(0x08))); } + + /** + * Test unicode conversion + */ + public function testToUnicode() + { + $this->assertEquals('a', String::toUnicode('a')); + $this->assertEquals('\uc0{\u8364}', String::toUnicode('€')); + $this->assertEquals('\uc0{\u233}', String::toUnicode('é')); + } } diff --git a/tests/PhpWord/Tests/_files/documents/reader.odt b/tests/PhpWord/Tests/_files/documents/reader.odt index 9e18e619..d37c4e66 100644 Binary files a/tests/PhpWord/Tests/_files/documents/reader.odt and b/tests/PhpWord/Tests/_files/documents/reader.odt differ