From ae652a63795ef0b273f9b6c1717bd3bb66971db2 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Fri, 11 Apr 2014 19:04:53 +0700 Subject: [PATCH] Update upcoming version number to 0.10.0 as per #178 --- CHANGELOG.md | 4 ++-- src/PhpWord/Element/AbstractElement.php | 6 +++--- src/PhpWord/Element/Endnote.php | 2 +- src/PhpWord/Element/Footer.php | 4 ++-- src/PhpWord/Element/Footnote.php | 4 ++-- src/PhpWord/Element/Header.php | 2 +- src/PhpWord/Element/ListItem.php | 2 +- src/PhpWord/Element/Object.php | 4 ++-- src/PhpWord/Element/Section.php | 12 ++++++------ src/PhpWord/Endnotes.php | 2 +- src/PhpWord/Footnotes.php | 22 ++++++++++----------- src/PhpWord/Media.php | 26 ++++++++++++------------- src/PhpWord/PhpWord.php | 2 +- src/PhpWord/Reader/Word2007.php | 2 +- src/PhpWord/Shared/XMLReader.php | 2 +- src/PhpWord/Shared/ZipArchive.php | 2 +- src/PhpWord/Style.php | 6 +++--- src/PhpWord/Style/AbstractStyle.php | 4 ++-- src/PhpWord/Style/ListItem.php | 12 ++++++------ src/PhpWord/Style/Numbering.php | 2 +- src/PhpWord/Style/NumberingLevel.php | 2 +- src/PhpWord/Writer/AbstractWriter.php | 2 +- src/PhpWord/Writer/ODText/Base.php | 2 +- src/PhpWord/Writer/Word2007/Rels.php | 2 +- src/PhpWord/Writer/Word2007/Styles.php | 2 +- 25 files changed, 66 insertions(+), 66 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f96b4a63..d00f16c7 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This is the changelog between releases of PHPWord. Releases are listed in reverse chronological order with the latest version listed on top, while additions/changes in each release are listed in chronological order. Changes in each release are divided into three parts: added or change features, bugfixes, and miscellaneous improvements. Each line contains short information about the change made, the person who made it, and the related issue number(s) in GitHub. -## 0.9.2 - Not yet released +## 0.10.0 - Not yet released This release marked heavy refactorings on internal code structure with the creation of some abstract classes to reduce code duplication. `Element` subnamespace is introduced in this release to replace `Section`. Word2007 reader capability is greatly enhanced. Endnote is introduced. List numbering is now customizable. @@ -29,7 +29,7 @@ This release marked heavy refactorings on internal code structure with the creat - General: Add `Style::resetStyles()`, `Footnote::resetElements()`, and `TOC::resetTitles()` - @ivanlanin GH-187 - Reader: Ability to read header, footer, footnotes, link, preservetext, textbreak, pagebreak, table, and list - @ivanlanin - Endnote: Ability to add endnotes - @ivanlanin -- ListItem: Ability to create custom list and reset list number - @ivanlanin GH-10 +- ListItem: Ability to create custom list and reset list number - @ivanlanin GH-10 GH-198 ### Bugfixes diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php index 6562cb5b..b7a03934 100644 --- a/src/PhpWord/Element/AbstractElement.php +++ b/src/PhpWord/Element/AbstractElement.php @@ -34,7 +34,7 @@ use PhpOffice\PhpWord\Element\CheckBox; /** * Container abstract class * - * @since 0.9.2 + * @since 0.10.0 */ abstract class AbstractElement { @@ -563,7 +563,7 @@ abstract class AbstractElement * Create textrun element * * @param mixed $paragraphStyle - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function createTextRun($paragraphStyle = null) @@ -575,7 +575,7 @@ abstract class AbstractElement * Create footnote element * * @param mixed $paragraphStyle - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function createFootnote($paragraphStyle = null) diff --git a/src/PhpWord/Element/Endnote.php b/src/PhpWord/Element/Endnote.php index 084119c2..bdcf8e76 100644 --- a/src/PhpWord/Element/Endnote.php +++ b/src/PhpWord/Element/Endnote.php @@ -14,7 +14,7 @@ use PhpOffice\PhpWord\Style\Paragraph; /** * Endnote element * - * @since 0.9.2 + * @since 0.10.0 */ class Endnote extends Footnote { diff --git a/src/PhpWord/Element/Footer.php b/src/PhpWord/Element/Footer.php index 6d441126..8db9c6eb 100755 --- a/src/PhpWord/Element/Footer.php +++ b/src/PhpWord/Element/Footer.php @@ -44,7 +44,7 @@ class Footer extends AbstractElement * Set type * * @param string $value - * @since 0.9.2 + * @since 0.10.0 */ public function setType($value = self::AUTO) { @@ -55,7 +55,7 @@ class Footer extends AbstractElement * Get type * * @return string - * @since 0.9.2 + * @since 0.10.0 */ public function getType() { diff --git a/src/PhpWord/Element/Footnote.php b/src/PhpWord/Element/Footnote.php index 4dcc1fd4..8f1cf7bc 100644 --- a/src/PhpWord/Element/Footnote.php +++ b/src/PhpWord/Element/Footnote.php @@ -48,7 +48,7 @@ class Footnote extends AbstractElement * Get Footnote Reference ID * * @return int - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function getReferenceId() @@ -60,7 +60,7 @@ class Footnote extends AbstractElement * Set Footnote Reference ID * * @param int $rId - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function setReferenceId($rId) diff --git a/src/PhpWord/Element/Header.php b/src/PhpWord/Element/Header.php index c14ed0e7..e4211d29 100755 --- a/src/PhpWord/Element/Header.php +++ b/src/PhpWord/Element/Header.php @@ -64,7 +64,7 @@ class Header extends AbstractElement * Set header type * * @param string $value - * @since 0.9.2 + * @since 0.10.0 */ public function setType($value = self::AUTO) { diff --git a/src/PhpWord/Element/ListItem.php b/src/PhpWord/Element/ListItem.php index 39bd6b1b..bebf8b38 100644 --- a/src/PhpWord/Element/ListItem.php +++ b/src/PhpWord/Element/ListItem.php @@ -53,7 +53,7 @@ class ListItem extends AbstractElement $this->textObject = new Text($text, $fontStyle, $paragraphStyle); $this->depth = $depth; - // Version >= 0.9.2 will pass numbering style name. Older version will use old method + // Version >= 0.10.0 will pass numbering style name. Older version will use old method if (!is_null($listStyle) && is_string($listStyle)) { $this->style = new ListItemStyle($listStyle); } else { diff --git a/src/PhpWord/Element/Object.php b/src/PhpWord/Element/Object.php index fc373fbc..81004872 100644 --- a/src/PhpWord/Element/Object.php +++ b/src/PhpWord/Element/Object.php @@ -101,7 +101,7 @@ class Object extends AbstractElement * Get Object ID * * @return int - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function getObjectId() @@ -113,7 +113,7 @@ class Object extends AbstractElement * Set Object ID * * @param int $objId - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function setObjectId($objId) diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php index 6abbbf98..82060e85 100644 --- a/src/PhpWord/Element/Section.php +++ b/src/PhpWord/Element/Section.php @@ -113,7 +113,7 @@ class Section extends AbstractElement * * @param string $type * @return Header - * @since 0.9.2 + * @since 0.10.0 */ public function addHeader($type = Header::AUTO) { @@ -125,7 +125,7 @@ class Section extends AbstractElement * * @param string $type * @return Footer - * @since 0.9.2 + * @since 0.10.0 */ public function addFooter($type = Header::AUTO) { @@ -177,7 +177,7 @@ class Section extends AbstractElement * @param boolean $header * @return Header|Footer * @throws Exception - * @since 0.9.2 + * @since 0.10.0 */ private function addHeaderFooter($type = Header::AUTO, $header = true) { @@ -201,7 +201,7 @@ class Section extends AbstractElement * Create header * * @return Header - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function createHeader() @@ -213,7 +213,7 @@ class Section extends AbstractElement * Create footer * * @return Footer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function createFooter() @@ -225,7 +225,7 @@ class Section extends AbstractElement * Get footer * * @return Footer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function getFooter() diff --git a/src/PhpWord/Endnotes.php b/src/PhpWord/Endnotes.php index 4a065b96..206814e8 100644 --- a/src/PhpWord/Endnotes.php +++ b/src/PhpWord/Endnotes.php @@ -14,7 +14,7 @@ use PhpOffice\PhpWord\Element\Endnote; /** * Endnote collection * - * @since 0.9.2 + * @since 0.10.0 */ class Endnotes { diff --git a/src/PhpWord/Footnotes.php b/src/PhpWord/Footnotes.php index 57cfdab8..5ff9e8d1 100644 --- a/src/PhpWord/Footnotes.php +++ b/src/PhpWord/Footnotes.php @@ -29,7 +29,7 @@ class Footnotes * * @param Footnote $element * @return integer Reference ID - * @since 0.9.2 + * @since 0.10.0 */ public static function addElement($element) { @@ -44,7 +44,7 @@ class Footnotes * * @param integer $index * @param Footnote $element - * @since 0.9.2 + * @since 0.10.0 */ public static function setElement($index, $element) { @@ -58,7 +58,7 @@ class Footnotes * * @param integer $index * @return Footnote - * @since 0.9.2 + * @since 0.10.0 */ public static function getElement($index) { @@ -73,7 +73,7 @@ class Footnotes * Get elements * * @return array - * @since 0.9.2 + * @since 0.10.0 */ public static function getElements() { @@ -84,7 +84,7 @@ class Footnotes * Get element count * * @return integer - * @since 0.9.2 + * @since 0.10.0 */ public static function countElements() { @@ -94,7 +94,7 @@ class Footnotes /** * Reset elements * - * @since 0.9.2 + * @since 0.10.0 */ public static function resetElements() { @@ -106,7 +106,7 @@ class Footnotes * * @param Footnote $element * @return integer Reference ID - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function addFootnoteElement($element) @@ -118,7 +118,7 @@ class Footnotes * Get Footnote Elements * * @return array - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function getFootnoteElements() @@ -130,7 +130,7 @@ class Footnotes * Get Footnote Elements Count * * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function countFootnoteElements() @@ -143,7 +143,7 @@ class Footnotes * * @param string $linkSrc * @return integer Reference ID - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function addFootnoteLinkElement($linkSrc) @@ -155,7 +155,7 @@ class Footnotes * Get Footnote Link Elements * * @return array - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function getFootnoteLinkElements() diff --git a/src/PhpWord/Media.php b/src/PhpWord/Media.php index 74f046bf..66079fd7 100755 --- a/src/PhpWord/Media.php +++ b/src/PhpWord/Media.php @@ -32,7 +32,7 @@ class Media * @param string $source * @param Image $image * @return integer - * @since 0.9.2 + * @since 0.10.0 */ public static function addElement($container, $mediaType, $source, Image $image = null) { @@ -97,7 +97,7 @@ class Media * @param string $container section|headerx|footerx|footnote|endnote * @param string $mediaType image|object|link * @return integer - * @since 0.9.2 + * @since 0.10.0 */ public static function countElements($container, $mediaType = null) { @@ -124,7 +124,7 @@ class Media * @param string $container section|headerx|footerx|footnote|endnote * @param string $mediaType image|object|link * @return array - * @since 0.9.2 + * @since 0.10.0 */ public static function getElements($container, $mediaType = null) { @@ -170,7 +170,7 @@ class Media * @param string $type * @param Image $image * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function addSectionMediaElement($src, $type, Image $image = null) @@ -183,7 +183,7 @@ class Media * * @param string $linkSrc * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function addSectionLinkElement($linkSrc) @@ -196,7 +196,7 @@ class Media * * @param string $key * @return array - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function getSectionMediaElements($key = null) @@ -209,7 +209,7 @@ class Media * * @param string $key * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function countSectionMediaElements($key = null) @@ -224,7 +224,7 @@ class Media * @param string $src * @param Image $image * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function addHeaderMediaElement($headerCount, $src, Image $image = null) @@ -237,7 +237,7 @@ class Media * * @param string $key * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function countHeaderMediaElements($key) @@ -249,7 +249,7 @@ class Media * Get Header Media Elements * * @return array - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function getHeaderMediaElements() @@ -264,7 +264,7 @@ class Media * @param string $src * @param Image $image * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function addFooterMediaElement($footerCount, $src, Image $image = null) @@ -277,7 +277,7 @@ class Media * * @param string $key * @return integer - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function countFooterMediaElements($key) @@ -289,7 +289,7 @@ class Media * Get Footer Media Elements * * @return array - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public static function getFooterMediaElements() diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php index 2764a3a1..73ba1cc3 100644 --- a/src/PhpWord/PhpWord.php +++ b/src/PhpWord/PhpWord.php @@ -256,7 +256,7 @@ class PhpWord * * @param array $settings * @return Section - * @deprecated 0.9.2 + * @deprecated 0.10.0 * @codeCoverageIgnore */ public function createSection($settings = null) diff --git a/src/PhpWord/Reader/Word2007.php b/src/PhpWord/Reader/Word2007.php index 8df6c4ec..5901046c 100644 --- a/src/PhpWord/Reader/Word2007.php +++ b/src/PhpWord/Reader/Word2007.php @@ -18,7 +18,7 @@ use PhpOffice\PhpWord\Element\Section; /** * Reader for Word2007 * - * @since 0.9.2 + * @since 0.10.0 * @todo title, list, watermark, checkbox, toc * @todo Partly done: image, object */ diff --git a/src/PhpWord/Shared/XMLReader.php b/src/PhpWord/Shared/XMLReader.php index 17e8454d..b7f5549e 100644 --- a/src/PhpWord/Shared/XMLReader.php +++ b/src/PhpWord/Shared/XMLReader.php @@ -15,7 +15,7 @@ use PhpOffice\PhpWord\Settings; /** * XML Reader wrapper * - * @since 0.9.2 + * @since 0.10.0 */ class XMLReader { diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php index 60b7198c..d8519aca 100644 --- a/src/PhpWord/Shared/ZipArchive.php +++ b/src/PhpWord/Shared/ZipArchive.php @@ -22,7 +22,7 @@ require_once 'PCLZip/pclzip.lib.php'; /** * PCLZip wrapper * - * @since 0.9.2 + * @since 0.10.0 */ class ZipArchive { diff --git a/src/PhpWord/Style.php b/src/PhpWord/Style.php index 084d7131..e0b5d439 100755 --- a/src/PhpWord/Style.php +++ b/src/PhpWord/Style.php @@ -90,7 +90,7 @@ class Style * @param string $styleName * @param array $styleValues * @return Numbering - * @since 0.9.2 + * @since 0.10.0 */ public static function addNumberingStyle($styleName, $styleValues) { @@ -101,7 +101,7 @@ class Style * Count styles * * @return integer - * @since 0.9.2 + * @since 0.10.0 */ public static function countStyles() { @@ -110,7 +110,7 @@ class Style /** * Reset styles - * @since 0.9.2 + * @since 0.10.0 */ public static function resetStyles() { diff --git a/src/PhpWord/Style/AbstractStyle.php b/src/PhpWord/Style/AbstractStyle.php index 11bfd8a4..2c88bdb2 100644 --- a/src/PhpWord/Style/AbstractStyle.php +++ b/src/PhpWord/Style/AbstractStyle.php @@ -12,7 +12,7 @@ namespace PhpOffice\PhpWord\Style; /** * Abstract style class * - * @since 0.9.2 + * @since 0.10.0 */ abstract class AbstractStyle { @@ -58,7 +58,7 @@ abstract class AbstractStyle */ public function setStyleValue($key, $value) { - // Backward compability check for versions < 0.9.2 which use underscore + // Backward compability check for versions < 0.10.0 which use underscore // prefix for their private properties if (substr($key, 0, 1) == '_') { $key = substr($key, 1); diff --git a/src/PhpWord/Style/ListItem.php b/src/PhpWord/Style/ListItem.php index bb04d0e6..3c762920 100644 --- a/src/PhpWord/Style/ListItem.php +++ b/src/PhpWord/Style/ListItem.php @@ -14,8 +14,8 @@ use PhpOffice\PhpWord\Style; /** * List item style * - * Before version 0.9.2, numbering style is defined statically with $listType. - * After version 0.9.2, numbering style is defined by using Numbering and + * Before version 0.10.0, numbering style is defined statically with $listType. + * After version 0.10.0, numbering style is defined by using Numbering and * recorded by $numStyle. $listStyle is maintained for backward compatility */ class ListItem extends AbstractStyle @@ -38,7 +38,7 @@ class ListItem extends AbstractStyle * Numbering style name * * @var string - * @since 0.9.2 + * @since 0.10.0 */ private $numStyle; @@ -46,7 +46,7 @@ class ListItem extends AbstractStyle * Numbering definition instance ID * * @var integer - * @since 0.9.2 + * @since 0.10.0 */ private $numId; @@ -75,7 +75,7 @@ class ListItem extends AbstractStyle } /** - * Set legacy list type for version < 0.9.2 + * Set legacy list type for version < 0.10.0 * * @param integer $value */ @@ -125,7 +125,7 @@ class ListItem extends AbstractStyle * Get legacy numbering definition * * @return array - * @since 0.9.2 + * @since 0.10.0 */ private function getListTypeStyle() { diff --git a/src/PhpWord/Style/Numbering.php b/src/PhpWord/Style/Numbering.php index ce935b98..8c2e4a69 100644 --- a/src/PhpWord/Style/Numbering.php +++ b/src/PhpWord/Style/Numbering.php @@ -17,7 +17,7 @@ use PhpOffice\PhpWord\Style\NumberingLevel; * @link http://www.schemacentral.com/sc/ooxml/e-w_numbering.html * @link http://www.schemacentral.com/sc/ooxml/e-w_abstractNum-1.html * @link http://www.schemacentral.com/sc/ooxml/e-w_num-1.html - * @since 0.9.2 + * @since 0.10.0 */ class Numbering extends AbstractStyle { diff --git a/src/PhpWord/Style/NumberingLevel.php b/src/PhpWord/Style/NumberingLevel.php index 2979f0c2..dff7de22 100644 --- a/src/PhpWord/Style/NumberingLevel.php +++ b/src/PhpWord/Style/NumberingLevel.php @@ -13,7 +13,7 @@ namespace PhpOffice\PhpWord\Style; * Numbering level definition * * @link http://www.schemacentral.com/sc/ooxml/e-w_lvl-1.html - * @since 0.9.2 + * @since 0.10.0 */ class NumberingLevel extends AbstractStyle { diff --git a/src/PhpWord/Writer/AbstractWriter.php b/src/PhpWord/Writer/AbstractWriter.php index faa13ea6..684a5d32 100644 --- a/src/PhpWord/Writer/AbstractWriter.php +++ b/src/PhpWord/Writer/AbstractWriter.php @@ -16,7 +16,7 @@ use PhpOffice\PhpWord\Settings; /** * Abstract writer class * - * @since 0.9.2 + * @since 0.10.0 */ abstract class AbstractWriter implements WriterInterface { diff --git a/src/PhpWord/Writer/ODText/Base.php b/src/PhpWord/Writer/ODText/Base.php index a1f0d315..24eab60c 100644 --- a/src/PhpWord/Writer/ODText/Base.php +++ b/src/PhpWord/Writer/ODText/Base.php @@ -17,7 +17,7 @@ use PhpOffice\PhpWord\Shared\XMLWriter; /** * ODT base part writer * - * @since 0.9.2 + * @since 0.10.0 */ class Base extends AbstractWriterPart { diff --git a/src/PhpWord/Writer/Word2007/Rels.php b/src/PhpWord/Writer/Word2007/Rels.php index c708eeaf..ab3198dd 100755 --- a/src/PhpWord/Writer/Word2007/Rels.php +++ b/src/PhpWord/Writer/Word2007/Rels.php @@ -15,7 +15,7 @@ use PhpOffice\PhpWord\Shared\XMLWriter; /** * Word2007 relationship writer * - * @since 0.9.2 + * @since 0.10.0 */ class Rels extends AbstractWriterPart { diff --git a/src/PhpWord/Writer/Word2007/Styles.php b/src/PhpWord/Writer/Word2007/Styles.php index ae784982..38217847 100644 --- a/src/PhpWord/Writer/Word2007/Styles.php +++ b/src/PhpWord/Writer/Word2007/Styles.php @@ -19,7 +19,7 @@ use PhpOffice\PhpWord\Style\Table; /** * Word2007 styles part writer * - * @todo Do something with the numbering style introduced in 0.9.2 + * @todo Do something with the numbering style introduced in 0.10.0 */ class Styles extends Base {