Skip to content

Commit 0525632

Browse files
Progi1984Progi1984
committed
Merge pull request #10 from PHPOffice/develop
Version 0.2.5
2 parents 1e93359 + fc5243e commit 0525632

File tree

13 files changed

+344
-196
lines changed

13 files changed

+344
-196
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,13 @@
2828

2929
### Features
3030
- Added missing features for supporting PHPWord
31+
32+
## 0.2.4
33+
34+
### Changes
35+
- XMLWriter : Refactoring for improving performances
36+
37+
## 0.2.5
38+
39+
### Features
40+
- Added Zip Adapters (PclZip & ZipArchive)

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.3
1+
0.2.4

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
}
1616
],
1717
"require": {
18-
"php": ">=5.3.0"
18+
"php": ">=5.3.0",
19+
"pclzip/pclzip": "^2.8"
1920
},
2021
"require-dev": {
2122
"phpunit/phpunit": "3.7.*",

‎src/Common/Adapter/Zip/PclZipAdapter.php‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?php
2+
namespace PhpOffice\Common\Adapter\Zip;
3+
4+
use PclZip;
5+
6+
class PclZipAdapter implements ZipInterface
7+
{
8+
/**
9+
* @var PclZip
10+
*/
11+
protected $oPclZip;
12+
13+
/**
14+
* @var string
15+
*/
16+
protected $tmpDir;
17+
18+
/**
19+
* @param $filename
20+
* @return $this
21+
*/
22+
public function open($filename)
23+
{
24+
$this->oPclZip = new PclZip($filename);
25+
$this->tmpDir = sys_get_temp_dir();
26+
return $this;
27+
}
28+
29+
/**
30+
* @return $this
31+
*/
32+
public function close()
33+
{
34+
return $this;
35+
}
36+
37+
/**
38+
* @param $localname
39+
* @param $contents
40+
* @return $this
41+
* @throws \Exception
42+
*/
43+
public function addFromString($localname, $contents)
44+
{
45+
$pathData = pathinfo($localname);
46+
47+
$hFile = fopen($this->tmpDir.'/'.$pathData['basename'], "wb");
48+
fwrite($hFile, $contents);
49+
fclose($hFile);
50+
51+
$res = $this->oPclZip->add($this->tmpDir.'/'.$pathData['basename'], PCLZIP_OPT_REMOVE_PATH, $this->tmpDir, PCLZIP_OPT_ADD_PATH, $pathData['dirname']);
52+
if ($res == 0) {
53+
throw new \Exception("Error zipping files : " . $this->oPclZip->errorInfo(true));
54+
}
55+
unlink($this->tmpDir.'/'.$pathData['basename']);
56+
return $this;
57+
}
58+
}

‎src/Common/Adapter/Zip/ZipArchiveAdapter.php‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?php
2+
3+
namespace PhpOffice\Common\Adapter\Zip;
4+
5+
use ZipArchive;
6+
7+
class ZipArchiveAdapter implements ZipInterface
8+
{
9+
/**
10+
* @var ZipArchive
11+
*/
12+
protected $oZipArchive;
13+
14+
/**
15+
* @var string
16+
*/
17+
protected $filename;
18+
19+
/**
20+
* @param string $filename
21+
* @throws \Exception Could not open $this->filename for writing.
22+
* @return mixed
23+
*/
24+
public function open($filename)
25+
{
26+
$this->filename = $filename;
27+
$this->oZipArchive = new ZipArchive();
28+
29+
if ($this->oZipArchive->open($this->filename, ZipArchive::OVERWRITE) === true) {
30+
return $this;
31+
}
32+
if ($this->oZipArchive->open($this->filename, ZipArchive::CREATE) === true) {
33+
return $this;
34+
}
35+
throw new \Exception("Could not open $this->filename for writing.");
36+
}
37+
38+
/**
39+
* @return $this
40+
* @throws \Exception Could not close zip file $this->filename.
41+
*/
42+
public function close()
43+
{
44+
if ($this->oZipArchive->close() === false) {
45+
throw new \Exception("Could not close zip file $this->filename.");
46+
}
47+
return $this;
48+
}
49+
50+
/**
51+
* @param $localname
52+
* @param $contents
53+
* @return bool
54+
*/
55+
public function addFromString($localname, $contents)
56+
{
57+
return $this->oZipArchive->addFromString($localname, $contents);
58+
}
59+
}

‎src/Common/Adapter/Zip/ZipInterface.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace PhpOffice\Common\Adapter\Zip;
4+
5+
interface ZipInterface
6+
{
7+
public function open($filename);
8+
public function close();
9+
public function addFromString($localname, $contents);
10+
}

‎src/Common/Drawing.php‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Drawing
2727
* Convert pixels to EMU
2828
*
2929
* @param int $pValue Value in pixels
30-
* @return int Value in EMU
30+
* @return int
3131
*/
3232
public static function pixelsToEmu($pValue = 0)
3333
{
@@ -38,22 +38,21 @@ public static function pixelsToEmu($pValue = 0)
3838
* Convert EMU to pixels
3939
*
4040
* @param int $pValue Value in EMU
41-
* @return int Value in pixels
41+
* @return int
4242
*/
4343
public static function emuToPixels($pValue = 0)
4444
{
45-
if ($pValue != 0) {
46-
return round($pValue / 9525);
47-
} else {
45+
if ($pValue == 0) {
4846
return 0;
4947
}
48+
return round($pValue / 9525);
5049
}
5150

5251
/**
5352
* Convert pixels to points
5453
*
5554
* @param int $pValue Value in pixels
56-
* @return int Value in points
55+
* @return float
5756
*/
5857
public static function pixelsToPoints($pValue = 0)
5958
{
@@ -64,37 +63,35 @@ public static function pixelsToPoints($pValue = 0)
6463
* Convert points width to centimeters
6564
*
6665
* @param int $pValue Value in points
67-
* @return int Value in centimeters
66+
* @return float
6867
*/
6968
public static function pointsToCentimeters($pValue = 0)
7069
{
71-
if ($pValue != 0) {
72-
return ((($pValue * 1.333333333) / self::DPI_96) * 2.54);
73-
} else {
70+
if ($pValue == 0) {
7471
return 0;
7572
}
73+
return ((($pValue * 1.333333333) / self::DPI_96) * 2.54);
7674
}
7775

7876
/**
7977
* Convert points width to pixels
8078
*
8179
* @param int $pValue Value in points
82-
* @return int Value in pixels
80+
* @return float
8381
*/
8482
public static function pointsToPixels($pValue = 0)
8583
{
86-
if ($pValue != 0) {
87-
return $pValue * 1.333333333;
88-
} else {
84+
if ($pValue == 0) {
8985
return 0;
9086
}
87+
return $pValue * 1.333333333;
9188
}
9289

9390
/**
9491
* Convert pixels to centimeters
9592
*
9693
* @param int $pValue Value in pixels
97-
* @return int Value in centimeters
94+
* @return float
9895
*/
9996
public static function pixelsToCentimeters($pValue = 0)
10097
{
@@ -106,22 +103,21 @@ public static function pixelsToCentimeters($pValue = 0)
106103
* Convert centimeters width to pixels
107104
*
108105
* @param int $pValue Value in centimeters
109-
* @return int Value in pixels
106+
* @return float
110107
*/
111108
public static function centimetersToPixels($pValue = 0)
112109
{
113-
if ($pValue != 0) {
114-
return ($pValue / 2.54) * self::DPI_96;
115-
} else {
110+
if ($pValue == 0) {
116111
return 0;
117112
}
113+
return ($pValue / 2.54) * self::DPI_96;
118114
}
119115

120116
/**
121117
* Convert degrees to angle
122118
*
123119
* @param int $pValue Degrees
124-
* @return int Angle
120+
* @return int
125121
*/
126122
public static function degreesToAngle($pValue = 0)
127123
{
@@ -132,85 +128,84 @@ public static function degreesToAngle($pValue = 0)
132128
* Convert angle to degrees
133129
*
134130
* @param int $pValue Angle
135-
* @return int Degrees
131+
* @return int
136132
*/
137133
public static function angleToDegrees($pValue = 0)
138134
{
139-
if ($pValue != 0) {
140-
return round($pValue / 60000);
141-
} else {
135+
if ($pValue == 0) {
142136
return 0;
143137
}
138+
return round($pValue / 60000);
144139
}
145140

146141
/**
147142
* Convert centimeters width to twips
148143
*
149144
* @param integer $pValue
145+
* @return float
150146
*/
151147
public static function centimetersToTwips($pValue = 0)
152148
{
153-
if ($pValue != 0) {
154-
return $pValue * 566.928;
155-
} else {
149+
if ($pValue == 0) {
156150
return 0;
157151
}
152+
return $pValue * 566.928;
158153
}
159154

160155
/**
161156
* Convert twips width to centimeters
162157
*
163158
* @param integer $pValue
159+
* @return float
164160
*/
165161
public static function twipsToCentimeters($pValue = 0)
166162
{
167-
if ($pValue != 0) {
168-
return $pValue / 566.928;
169-
} else {
163+
if ($pValue == 0) {
170164
return 0;
171165
}
166+
return $pValue / 566.928;
172167
}
173168

174169
/**
175170
* Convert inches width to twips
176171
*
177172
* @param integer $pValue
173+
* @return float
178174
*/
179175
public static function inchesToTwips($pValue = 0)
180176
{
181-
if ($pValue != 0) {
182-
return $pValue * 1440;
183-
} else {
177+
if ($pValue == 0) {
184178
return 0;
185179
}
180+
return $pValue * 1440;
186181
}
187182

188183
/**
189184
* Convert twips width to inches
190185
*
191186
* @param integer $pValue
187+
* @return float
192188
*/
193189
public static function twipsToInches($pValue = 0)
194190
{
195-
if ($pValue != 0) {
196-
return $pValue / 1440;
197-
} else {
191+
if ($pValue == 0) {
198192
return 0;
199193
}
194+
return $pValue / 1440;
200195
}
201196

202197
/**
203198
* Convert twips width to pixels
204199
*
205200
* @param integer $pValue
201+
* @return float
206202
*/
207203
public static function twipsToPixels($pValue = 0)
208204
{
209-
if ($pValue != 0) {
210-
return round($pValue / 15.873984);
211-
} else {
205+
if ($pValue == 0) {
212206
return 0;
213207
}
208+
return round($pValue / 15.873984);
214209
}
215210

216211
/**

‎src/Common/Text.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ public static function controlCharacterOOXML2PHP($value = '')
115115
/**
116116
* Check if a string contains UTF-8 data
117117
*
118+
* @deprecated 0.2.4 Use `Zend\Stdlib\StringUtils::isValidUtf8` instead.
119+
*
118120
* @param string $value
119121
* @return boolean
120122
*/

0 commit comments

Comments
 (0)