From 7c12dfc735226361f397825a99079b9899534a53 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Fri, 16 May 2014 16:00:40 +0700 Subject: [PATCH] Fixes for last commit --- src/PhpWord/Settings.php | 2 +- src/PhpWord/Style/Table.php | 2 +- tests/PhpWord/Tests/SettingsTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php index 3c73c3ac..17bc3429 100644 --- a/src/PhpWord/Settings.php +++ b/src/PhpWord/Settings.php @@ -132,7 +132,7 @@ class Settings * This sets the setIndent and setIndentString for better compatibility * * @param bool $compatibility - * @return true + * @return bool */ public static function setCompatibility($compatibility) { diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php index 90e8282f..68b53463 100644 --- a/src/PhpWord/Style/Table.php +++ b/src/PhpWord/Style/Table.php @@ -430,7 +430,7 @@ class Table extends Border /** * Get cell margin * - * @return int[] + * @return integer[] */ public function getCellMargin() { diff --git a/tests/PhpWord/Tests/SettingsTest.php b/tests/PhpWord/Tests/SettingsTest.php index aa9ef945..d188595e 100644 --- a/tests/PhpWord/Tests/SettingsTest.php +++ b/tests/PhpWord/Tests/SettingsTest.php @@ -103,6 +103,6 @@ class SettingsTest extends \PHPUnit_Framework_TestCase 'defaultFontName' => 'Arial', 'defaultFontSize' => 10, ); - $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.yml.dist')); + $this->assertEquals($expected, Settings::loadConfig(__DIR__ . '/../../../phpword.ini.dist')); } }