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

https://github.com/PHPOffice/PHPWord/issues/310

This commit is contained in:
Roman Syroeshko 2014-08-11 22:30:46 +04:00
parent 3d06c77fc1
commit 6f2d444ba9
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpWord/Element/Image.php
View File

@ -422,6 +422,8 @@ class Image extends AbstractElement
/** /**
* Get image size from archive * Get image size from archive
* *
* @since 0.12.0 Throws CreateTemporaryFileException.
*
* @param string $source * @param string $source
* @return array|null * @return array|null
* @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException * @throws \PhpOffice\PhpWord\Exception\CreateTemporaryFileException

6
src/PhpWord/Settings.php
View File

@ -279,9 +279,10 @@ class Settings
/** /**
* Sets the user defined path to temporary directory. * Sets the user defined path to temporary directory.
* *
* @since 0.12.0
*
* @param string $tempDir The user defined path to temporary directory. * @param string $tempDir The user defined path to temporary directory.
* @return void * @return void
* @since 0.12.0
*/ */
public static function setTempDir($tempDir) public static function setTempDir($tempDir)
{ {
@ -291,8 +292,9 @@ class Settings
/** /**
* Returns path to temporary directory. * Returns path to temporary directory.
* *
* @return string
* @since 0.12.0 * @since 0.12.0
*
* @return string
*/ */
public static function getTempDir() public static function getTempDir()
{ {

2
tests/PhpWord/Tests/_includes/TestHelperDOCX.php
View File

@ -37,6 +37,8 @@ class TestHelperDOCX
/** /**
* Get document content * Get document content
* *
* @since 0.12.0 Throws CreateTemporaryFileException.
*
* @param \PhpOffice\PhpWord\PhpWord $phpWord * @param \PhpOffice\PhpWord\PhpWord $phpWord
* @param string $writerName * @param string $writerName
* @return \PhpOffice\PhpWord\Tests\XmlDocument * @return \PhpOffice\PhpWord\Tests\XmlDocument