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

Fixes for last commit

This commit is contained in:
Ivan Lanin 2014-05-16 16:00:40 +07:00
parent 048436cd04
commit 7c12dfc735
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpWord/Settings.php
View File

@ -132,7 +132,7 @@ class Settings
* This sets the setIndent and setIndentString for better compatibility * This sets the setIndent and setIndentString for better compatibility
* *
* @param bool $compatibility * @param bool $compatibility
* @return true * @return bool
*/ */
public static function setCompatibility($compatibility) public static function setCompatibility($compatibility)
{ {

2
src/PhpWord/Style/Table.php
View File

@ -430,7 +430,7 @@ class Table extends Border
/** /**
* Get cell margin * Get cell margin
* *
* @return int[] * @return integer[]
*/ */
public function getCellMargin() public function getCellMargin()
{ {

2
tests/PhpWord/Tests/SettingsTest.php
View File

@ -103,6 +103,6 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
'defaultFontName' => 'Arial', 'defaultFontName' => 'Arial',
'defaultFontSize' => 10, 'defaultFontSize' => 10,
); );
$this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.yml.dist')); $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.ini.dist'));
} }
} }