Skip to content

Commit eda08a1

Browse files
authored
Merge pull request #136 from viest/dev
version 1.2.5
2 parents fd79d72 + 02cb966 commit eda08a1

File tree

2 files changed

+37
-11
lines changed

2 files changed

+37
-11
lines changed

package.xml

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,23 @@
1515
<email>[email protected]</email>
1616
<active>yes</active>
1717
</lead>
18-
<date>2019-05-03</date>
19-
<time>05:44:12</time>
18+
<date>2019-07-01</date>
19+
<time>11:50:00</time>
2020
<version>
21-
<release>1.2.4</release>
22-
<api>1.2.4</api>
21+
<release>1.2.5</release>
22+
<api>1.2.5</api>
2323
</version>
2424
<stability>
2525
<release>stable</release>
2626
<api>stable</api>
2727
</stability>
2828
<license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
2929
<notes>
30-
- FEAT format multiple style overlays.
31-
- FEAT format text color.
32-
- FEAT image scale.
33-
- FEAT chart.
30+
- FEAT cells background color.
31+
- FEAT checkout sheet.
32+
- FEAT format new font size.
33+
- FEAT format new strikeout.
34+
- FEAT insertText support resource format.
3435
</notes>
3536
<contents>
3637
<dir name="/">
@@ -122,7 +123,6 @@
122123
<file md5sum="ced86dfe5dba665d57d5075e03de4963" name="tests/014.phpt" role="src" />
123124
<file md5sum="723ed81ef341086cf06a1f2dade63f1a" name="tests/015.phpt" role="src" />
124125
<file md5sum="74d4d945e51fb79ffc7954e863a20712" name="tests/016.phpt" role="src" />
125-
<file md5sum="12ff3ae17d729bbfd48c87a087544924" name="tests/017.phpt" role="src" />
126126
<file md5sum="1f0d501c89c47d7140376ce386eb1cd3" name="tests/018.phpt" role="src" />
127127
<file md5sum="e6c41873fb59cf65b9e0359ccc2cbd05" name="tests/chart_axis_name_x.phpt" role="src" />
128128
<file md5sum="d07e7f60e961a1cc30f901cb98e3530b" name="tests/chart_axis_name_y.phpt" role="src" />
@@ -133,12 +133,19 @@
133133
<file md5sum="39f7c511d9019c6815bcf7fd0f7e8224" name="tests/chart_style.phpt" role="src" />
134134
<file md5sum="bfdf9e054f8efd971a65d00eca465f2f" name="tests/chart_title.phpt" role="src" />
135135
<file md5sum="df2a6af4ced4ea7660a1691d18e75e8c" name="tests/format_align.phpt" role="src" />
136-
<file md5sum="93b6ad08a50fa6a324862b8e385907de" name="tests/format_color.phpt" role="src" />
136+
<file md5sum="df2a6af4ced4ea7660a1691d18e75e8c" name="tests/format_background.phpt" role="src" />
137+
<file md5sum="93b6ad08a50fa6a324862b8e385907de" name="tests/format_font_color.phpt" role="src" />
138+
<file md5sum="93b6ad08a50fa6a324862b8e385907de" name="tests/format_font_size.phpt" role="src" />
139+
<file md5sum="93b6ad08a50fa6a324862b8e385907de" name="tests/format_font_strikeout.phpt" role="src" />
137140
<file md5sum="c32a045fc8d621cbbaf8f00008ddb8b5" name="tests/format_number.phpt" role="src" />
141+
<file md5sum="c32a045fc8d621cbbaf8f00008ddb8b5" name="tests/format_wrap.phpt" role="src" />
138142
<file md5sum="b4c6f2949c46ab89099e5f971f152a1f" name="tests/image_no_styles.phpt" role="src" />
139143
<file md5sum="fb81df82009c851b96a6124972ccc3d1" name="tests/image_width_height_styles.phpt" role="src" />
144+
<file md5sum="fb81df82009c851b96a6124972ccc3d1" name="tests/insert_text_resource_format.phpt" role="src" />
140145
<file md5sum="47de23f6eee379673bfae11d32f3e983" name="tests/insert_url_format.phpt" role="src" />
141146
<file md5sum="22589301dcf45ef72a98afcd9310c638" name="tests/insert_url_no_format.phpt" role="src" />
147+
<file md5sum="22589301dcf45ef72a98afcd9310c638" name="tests/sheet_add.phpt" role="src" />
148+
<file md5sum="22589301dcf45ef72a98afcd9310c638" name="tests/sheet_checkout.phpt" role="src" />
142149
<file md5sum="bb4256831dfd81f951bd6f4afbe1719f" name="CREDITS" role="doc" />
143150
<file md5sum="5e8941dbd2f503d7c845fb07579830ab" name="README.md" role="doc" />
144151
<file md5sum="2f88d9bdcceca419cbbf16276f12d306" name="README_zh.md" role="doc" />
@@ -163,6 +170,25 @@
163170
<providesextension>xlswriter</providesextension>
164171
<extsrcrelease />
165172
<changelog>
173+
<release>
174+
<date>2019-05-03</date>
175+
<time>05:44:12</time>
176+
<version>
177+
<release>1.2.4</release>
178+
<api>1.2.4</api>
179+
</version>
180+
<stability>
181+
<release>stable</release>
182+
<api>stable</api>
183+
</stability>
184+
<license uri="https://github.com/viest/php-ext-excel-export/blob/master/LICENSE">BSD license</license>
185+
<notes>
186+
- FEAT format multiple style overlays.
187+
- FEAT format text color.
188+
- FEAT image scale.
189+
- FEAT chart.
190+
</notes>
191+
</release>
166192
<release>
167193
<date>2018-11-25</date>
168194
<time>00:30:00</time>

php_xlswriter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
extern zend_module_entry xlswriter_module_entry;
1919
#define phpext_xlswriter_ptr &xlswriter_module_entry
2020

21-
#define PHP_XLSWRITER_VERSION "1.2.4"
21+
#define PHP_XLSWRITER_VERSION "1.2.5"
2222

2323
#ifdef PHP_WIN32
2424
# define PHP_VTIFUL_API __declspec(dllexport)

0 commit comments

Comments
 (0)