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

Merge pull request #95 from gabrielbull/develop 

Removed fake namespacing from tests and reformatted code to PSR-2 coding standards
This commit is contained in:
Progi1984 2014-03-09 19:34:16 +01:00
parent 99b43ced29 69a8192652
commit 88836672c3
18 changed files with 320 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Classes/PHPWord/Exceptions/InvalidStyleException.php Normal file
View File

@ -0,0 +1,15 @@
<?php
namespace PHPWord\Exceptions;
use InvalidArgumentException;
/**
* InvalidStyleException
*
* Exception used for when a style value is invalid
*
* @package PHPWord
*/
class InvalidStyleException extends InvalidArgumentException
{
}

17
Classes/PHPWord/Section/Text.php
View File

@ -48,7 +48,7 @@ class PHPWord_Section_Text
/** /**
* Paragraph style * Paragraph style
* *
* @var PHPWord_Style_Font * @var \PHPWord_Style_Paragraph
*/ */
private $_styleParagraph; private $_styleParagraph;
@ -116,7 +116,9 @@ class PHPWord_Section_Text
/** /**
* Set Paragraph style * Set Paragraph style
* *
* @return PHPWord_Style_Paragraph * @param array|\PHPWord_Style_Paragraph $styleParagraph
* @return \PHPWord_Style_Paragraph
* @throws \Exception
*/ */
public function setParagraphStyle($styleParagraph) public function setParagraphStyle($styleParagraph)
{ {
@ -124,14 +126,19 @@ class PHPWord_Section_Text
$this->_styleParagraph = new PHPWord_Style_Paragraph(); $this->_styleParagraph = new PHPWord_Style_Paragraph();
foreach ($styleParagraph as $key => $value) { foreach ($styleParagraph as $key => $value) {
if (substr($key, 0, 1) != '_') { if ($key === 'line-height') {
null;
} elseif (substr($key, 0, 1) != '_') {
$key = '_' . $key; $key = '_' . $key;
} }
$this->_styleParagraph->setStyleValue($key, $value); $this->_styleParagraph->setStyleValue($key, $value);
} }
} else { } elseif ($styleParagraph instanceof PHPWord_Style_Paragraph) {
$this->_styleParagraph = $styleParagraph; $this->_styleParagraph = $styleParagraph;
} else {
throw new Exception('Expected array or PHPWord_Style_Paragraph');
} }
return $this->_styleParagraph;
} }
/** /**
@ -143,4 +150,4 @@ class PHPWord_Section_Text
{ {
return $this->_text; return $this->_text;
} }
} }

29
Classes/PHPWord/Style/Font.php
View File

@ -30,7 +30,6 @@
*/ */
class PHPWord_Style_Font class PHPWord_Style_Font
{ {
const UNDERLINE_NONE = 'none'; const UNDERLINE_NONE = 'none';
const UNDERLINE_DASH = 'dash'; const UNDERLINE_DASH = 'dash';
const UNDERLINE_DASHHEAVY = 'dashHeavy'; const UNDERLINE_DASHHEAVY = 'dashHeavy';
@ -153,8 +152,8 @@ class PHPWord_Style_Font
/** /**
* New font style * New font style
* *
* @param string $type Type of font * @param string $type Type of font
* @param array $styleParagraph Paragraph styles definition * @param array $styleParagraph Paragraph styles definition
*/ */
public function __construct($type = 'text', $styleParagraph = null) public function __construct($type = 'text', $styleParagraph = null)
{ {
@ -187,8 +186,8 @@ class PHPWord_Style_Font
/** /**
* Set style value * Set style value
* *
* @param string $key * @param string $key
* @param mixed $value * @param mixed $value
*/ */
public function setStyleValue($key, $value) public function setStyleValue($key, $value)
{ {
@ -211,7 +210,7 @@ class PHPWord_Style_Font
/** /**
* Set font name * Set font name
* *
* @param string $pValue * @param string $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setName($pValue = PHPWord::DEFAULT_FONT_NAME) public function setName($pValue = PHPWord::DEFAULT_FONT_NAME)
@ -236,7 +235,7 @@ class PHPWord_Style_Font
/** /**
* Set font size * Set font size
* *
* @param int|float $pValue * @param int|float $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setSize($pValue = PHPWord::DEFAULT_FONT_SIZE) public function setSize($pValue = PHPWord::DEFAULT_FONT_SIZE)
@ -261,7 +260,7 @@ class PHPWord_Style_Font
/** /**
* Set bold * Set bold
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setBold($pValue = false) public function setBold($pValue = false)
@ -286,7 +285,7 @@ class PHPWord_Style_Font
/** /**
* Set italics * Set italics
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setItalic($pValue = false) public function setItalic($pValue = false)
@ -311,7 +310,7 @@ class PHPWord_Style_Font
/** /**
* Set superscript * Set superscript
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setSuperScript($pValue = false) public function setSuperScript($pValue = false)
@ -337,7 +336,7 @@ class PHPWord_Style_Font
/** /**
* Set subscript * Set subscript
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setSubScript($pValue = false) public function setSubScript($pValue = false)
@ -363,7 +362,7 @@ class PHPWord_Style_Font
/** /**
* Set underline * Set underline
* *
* @param string $pValue * @param string $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setUnderline($pValue = PHPWord_Style_Font::UNDERLINE_NONE) public function setUnderline($pValue = PHPWord_Style_Font::UNDERLINE_NONE)
@ -388,7 +387,7 @@ class PHPWord_Style_Font
/** /**
* Set strikethrough * Set strikethrough
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setStrikethrough($pValue = false) public function setStrikethrough($pValue = false)
@ -413,7 +412,7 @@ class PHPWord_Style_Font
/** /**
* Set font color * Set font color
* *
* @param string $pValue * @param string $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setColor($pValue = PHPWord::DEFAULT_FONT_COLOR) public function setColor($pValue = PHPWord::DEFAULT_FONT_COLOR)
@ -438,7 +437,7 @@ class PHPWord_Style_Font
/** /**
* Set foreground/highlight color * Set foreground/highlight color
* *
* @param string $pValue * @param string $pValue
* @return PHPWord_Style_Font * @return PHPWord_Style_Font
*/ */
public function setFgColor($pValue = null) public function setFgColor($pValue = null)

92
Classes/PHPWord/Style/Paragraph.php
View File

@ -25,11 +25,21 @@
* @version 0.7.0 * @version 0.7.0
*/ */
use PHPWord\Exceptions\InvalidStyleException;
/** /**
* PHPWord_Style_Paragraph * PHPWord_Style_Paragraph
*/ */
class PHPWord_Style_Paragraph class PHPWord_Style_Paragraph
{ {
const LINE_HEIGHT = 240;
/*
* Text line height
*
* @var int
*/
private $lineHeight;
/** /**
* Paragraph alignment * Paragraph alignment
@ -85,7 +95,7 @@ class PHPWord_Style_Paragraph
* *
* @var string * @var string
*/ */
private $_basedOn; private $_basedOn = 'Normal';
/** /**
* Style for next paragraph * Style for next paragraph
@ -99,63 +109,46 @@ class PHPWord_Style_Paragraph
* *
* @var bool * @var bool
*/ */
private $_widowControl; private $_widowControl = true;
/** /**
* Keep paragraph with next paragraph * Keep paragraph with next paragraph
* *
* @var bool * @var bool
*/ */
private $_keepNext; private $_keepNext = false;
/** /**
* Keep all lines on one page * Keep all lines on one page
* *
* @var bool * @var bool
*/ */
private $_keepLines; private $_keepLines = false;
/** /**
* Start paragraph on next page * Start paragraph on next page
* *
* @var bool * @var bool
*/ */
private $_pageBreakBefore; private $_pageBreakBefore = false;
/**
* New Paragraph Style
*/
public function __construct()
{
$this->_align = null;
$this->_spaceBefore = null;
$this->_spaceAfter = null;
$this->_spacing = null;
$this->_tabs = null;
$this->_indent = null;
$this->_hanging = null;
$this->_basedOn = 'Normal';
$this->_next = null;
$this->_widowControl = true;
$this->_keepNext = false;
$this->_keepLines = false;
$this->_pageBreakBefore = false;
}
/** /**
* Set Style value * Set Style value
* *
* @param string $key * @param string $key
* @param mixed $value * @param mixed $value
*/ */
public function setStyleValue($key, $value) public function setStyleValue($key, $value)
{ {
if ($key == '_indent' || $key == '_hanging') { if ($key == '_indent' || $key == '_hanging') {
$value = $value * 720; $value = $value * 720;
} } elseif ($key == '_spacing') {
if ($key == '_spacing') {
$value += 240; // because line height of 1 matches 240 twips $value += 240; // because line height of 1 matches 240 twips
} elseif ($key === 'line-height') {
$this->setLineHeight($value);
return;
} }
$this->$key = $value;
$method = 'set' . substr($key, 1); $method = 'set' . substr($key, 1);
if (method_exists($this, $method)) { if (method_exists($this, $method)) {
$this->$method($value); $this->$method($value);
@ -335,7 +328,7 @@ class PHPWord_Style_Paragraph
/** /**
* Set parent style ID * Set parent style ID
* *
* @param string $pValue * @param string $pValue
* @return PHPWord_Style_Paragraph * @return PHPWord_Style_Paragraph
*/ */
public function setBasedOn($pValue = 'Normal') public function setBasedOn($pValue = 'Normal')
@ -357,7 +350,7 @@ class PHPWord_Style_Paragraph
/** /**
* Set style for next paragraph * Set style for next paragraph
* *
* @param string $pValue * @param string $pValue
* @return PHPWord_Style_Paragraph * @return PHPWord_Style_Paragraph
*/ */
public function setNext($pValue = null) public function setNext($pValue = null)
@ -379,7 +372,7 @@ class PHPWord_Style_Paragraph
/** /**
* Set keep paragraph with next paragraph setting * Set keep paragraph with next paragraph setting
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Paragraph * @return PHPWord_Style_Paragraph
*/ */
public function setWidowControl($pValue = true) public function setWidowControl($pValue = true)
@ -404,7 +397,7 @@ class PHPWord_Style_Paragraph
/** /**
* Set keep paragraph with next paragraph setting * Set keep paragraph with next paragraph setting
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Paragraph * @return PHPWord_Style_Paragraph
*/ */
public function setKeepNext($pValue = false) public function setKeepNext($pValue = false)
@ -429,7 +422,7 @@ class PHPWord_Style_Paragraph
/** /**
* Set keep all lines on one page setting * Set keep all lines on one page setting
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Paragraph * @return PHPWord_Style_Paragraph
*/ */
public function setKeepLines($pValue = false) public function setKeepLines($pValue = false)
@ -454,7 +447,7 @@ class PHPWord_Style_Paragraph
/** /**
* Set start paragraph on next page setting * Set start paragraph on next page setting
* *
* @param bool $pValue * @param bool $pValue
* @return PHPWord_Style_Paragraph * @return PHPWord_Style_Paragraph
*/ */
public function setPageBreakBefore($pValue = false) public function setPageBreakBefore($pValue = false)
@ -466,4 +459,33 @@ class PHPWord_Style_Paragraph
return $this; return $this;
} }
/**
* Set the line height
*
* @param int|float|string $lineHeight
* @return $this
* @throws \PHPWord\Exceptions\InvalidStyleException
*/
public function setLineHeight($lineHeight)
{
if (is_string($lineHeight)) {
$lineHeight = floatval(preg_replace('/[^0-9\.\,]/', '', $lineHeight));
}
if ((!is_integer($lineHeight) && !is_float($lineHeight)) || !$lineHeight) {
throw new InvalidStyleException('Line height must be a valid number');
}
$this->lineHeight = $lineHeight;
$this->setSpacing($lineHeight * self::LINE_HEIGHT);
return $this;
}
/**
* @return int
*/
public function getLineHeight()
{
return $this->lineHeight;
}
} }

83
Tests/PHPWord/IOFactoryTest.php
View File

@ -5,55 +5,58 @@ use PHPUnit_Framework_TestCase;
use PHPWord; use PHPWord;
use PHPWord_IOFactory; use PHPWord_IOFactory;
use PHPWord_Writer_Word2007; use PHPWord_Writer_Word2007;
use Exception;
/** /**
* Class PHPWord_IOFactoryTest * Class IOFactoryTest
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_IOFactoryTest extends \PHPUnit_Framework_TestCase { class IOFactoryTest extends \PHPUnit_Framework_TestCase
public function testGetSearchLocations() {
{ public function testGetSearchLocations()
$this->assertAttributeEquals(PHPWord_IOFactory::getSearchLocations(), '_searchLocations','PHPWord_IOFactory'); {
} $this->assertAttributeEquals(PHPWord_IOFactory::getSearchLocations(), '_searchLocations', 'PHPWord_IOFactory');
}
public function testSetSearchLocationsWithArray() public function testSetSearchLocationsWithArray()
{ {
PHPWord_IOFactory::setSearchLocations(array()); PHPWord_IOFactory::setSearchLocations(array());
$this->assertAttributeEquals(array(), '_searchLocations','PHPWord_IOFactory'); $this->assertAttributeEquals(array(), '_searchLocations', 'PHPWord_IOFactory');
} }
/** /**
* @expectedException Exception * @expectedException Exception
* @expectedExceptionMessage Invalid parameter passed. * @expectedExceptionMessage Invalid parameter passed.
*/ */
public function testSetSearchLocationsWithNotArray() public function testSetSearchLocationsWithNotArray()
{ {
PHPWord_IOFactory::setSearchLocations('String'); PHPWord_IOFactory::setSearchLocations('String');
} }
public function testAddSearchLocation() public function testAddSearchLocation()
{ {
PHPWord_IOFactory::setSearchLocations(array()); PHPWord_IOFactory::setSearchLocations(array());
PHPWord_IOFactory::addSearchLocation('type', 'location', 'classname'); PHPWord_IOFactory::addSearchLocation('type', 'location', 'classname');
$this->assertAttributeEquals(array(array('type' => 'type', 'path' => 'location', 'class' => 'classname')), '_searchLocations','PHPWord_IOFactory'); $this->assertAttributeEquals(array(array('type' => 'type', 'path' => 'location', 'class' => 'classname')), '_searchLocations', 'PHPWord_IOFactory');
} }
/** /**
* @expectedException Exception * @expectedException Exception
* @expectedExceptionMessage No IWriter found for type * @expectedExceptionMessage No IWriter found for type
*/ */
public function testCreateWriterException(){ public function testCreateWriterException()
$oPHPWord = new PHPWord(); {
$oPHPWord = new PHPWord();
PHPWord_IOFactory::setSearchLocations(array()); PHPWord_IOFactory::setSearchLocations(array());
PHPWord_IOFactory::createWriter($oPHPWord); PHPWord_IOFactory::createWriter($oPHPWord);
} }
public function testCreateWriter(){ public function testCreateWriter()
$oPHPWord = new PHPWord(); {
$oPHPWord = new PHPWord();
$this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord)); $this->assertEquals(PHPWord_IOFactory::createWriter($oPHPWord, 'Word2007'), new PHPWord_Writer_Word2007($oPHPWord));
} }
} }

39
Tests/PHPWord/MediaTest.php
View File

@ -4,26 +4,25 @@ namespace PHPWord\Tests;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord_Media; use PHPWord_Media;
class PHPWord_MediaTest extends \PHPUnit_Framework_TestCase { class MediaTest extends \PHPUnit_Framework_TestCase
{
public function testGetSectionMediaElementsWithNull()
{
$this->assertEquals(PHPWord_Media::getSectionMediaElements(), array());
}
public function testGetSectionMediaElementsWithNull() public function testCountSectionMediaElementsWithNull()
{ {
$this->assertEquals(PHPWord_Media::getSectionMediaElements(), array()); $this->assertEquals(PHPWord_Media::countSectionMediaElements(), 0);
} }
public function testCountSectionMediaElementsWithNull() public function testGetHeaderMediaElements()
{ {
$this->assertEquals(PHPWord_Media::countSectionMediaElements(), 0); $this->assertAttributeEquals(PHPWord_Media::getHeaderMediaElements(), '_headerMedia', 'PHPWord_Media');
} }
public function testGetHeaderMediaElements() public function testGetFooterMediaElements()
{ {
$this->assertAttributeEquals(PHPWord_Media::getHeaderMediaElements(), '_headerMedia','PHPWord_Media'); $this->assertAttributeEquals(PHPWord_Media::getFooterMediaElements(), '_footerMedia', 'PHPWord_Media');
} }
}
public function testGetFooterMediaElements()
{
$this->assertAttributeEquals(PHPWord_Media::getFooterMediaElements(), '_footerMedia','PHPWord_Media');
}
}

56
Tests/PHPWord/SectionTest.php
View File

@ -4,35 +4,35 @@ namespace PHPWord\Tests;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord_Section; use PHPWord_Section;
class PHPWord_SectionTest extends \PHPUnit_Framework_TestCase { class SectionTest extends \PHPUnit_Framework_TestCase
public function testGetSettings() {
{ public function testGetSettings()
$oSection = new PHPWord_Section(0); {
$this->assertAttributeEquals($oSection->getSettings(), '_settings', new PHPWord_Section(0)); $oSection = new PHPWord_Section(0);
} $this->assertAttributeEquals($oSection->getSettings(), '_settings', new PHPWord_Section(0));
}
public function testGetElementss() public function testGetElementss()
{ {
$oSection = new PHPWord_Section(0); $oSection = new PHPWord_Section(0);
$this->assertAttributeEquals($oSection->getElements(), '_elementCollection',new PHPWord_Section(0)); $this->assertAttributeEquals($oSection->getElements(), '_elementCollection', new PHPWord_Section(0));
} }
public function testGetFooter() public function testGetFooter()
{ {
$oSection = new PHPWord_Section(0); $oSection = new PHPWord_Section(0);
$this->assertAttributeEquals($oSection->getFooter(), '_footer',new PHPWord_Section(0)); $this->assertAttributeEquals($oSection->getFooter(), '_footer', new PHPWord_Section(0));
} }
public function testGetHeaders() public function testGetHeaders()
{ {
$oSection = new PHPWord_Section(0); $oSection = new PHPWord_Section(0);
$this->assertAttributeEquals($oSection->getHeaders(), '_headers',new PHPWord_Section(0)); $this->assertAttributeEquals($oSection->getHeaders(), '_headers', new PHPWord_Section(0));
} }
public function testGetElements() public function testGetElements()
{ {
$oSection = new PHPWord_Section(0); $oSection = new PHPWord_Section(0);
$this->assertAttributeEquals($oSection->getElements(), '_elementCollection',new PHPWord_Section(0)); $this->assertAttributeEquals($oSection->getElements(), '_elementCollection', new PHPWord_Section(0));
} }
} }

10
Tests/PHPWord/Shared/FontTest.php
View File

@ -1,19 +1,18 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Shared;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord; use PHPWord;
use PHPWord_Shared_Font; use PHPWord_Shared_Font;
/** /**
* Class PHPWord_Writer_Shared_FontTest * Class FontTest
* *
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Writer_Shared_FontTest extends \PHPUnit_Framework_TestCase class FontTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* Test various conversions * Test various conversions
*/ */
@ -44,5 +43,4 @@ class PHPWord_Writer_Shared_FontTest extends \PHPUnit_Framework_TestCase
$result = PHPWord_Shared_Font::pointSizeToTwips($original); $result = PHPWord_Shared_Font::pointSizeToTwips($original);
$this->assertEquals($original * 20, $result); $this->assertEquals($original * 20, $result);
} }
}
}

12
Tests/PHPWord/Style/CellTest.php
View File

@ -1,18 +1,17 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Style;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord_Style_Cell; use PHPWord_Style_Cell;
/** /**
* Class PHPWord_Style_CellTest * Class CellTest
* *
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Style_CellTest extends \PHPUnit_Framework_TestCase class CellTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* Test setting style with normal value * Test setting style with normal value
*/ */
@ -35,7 +34,7 @@ class PHPWord_Style_CellTest extends \PHPUnit_Framework_TestCase
'gridSpan' => 2, 'gridSpan' => 2,
'vMerge' => 2, 'vMerge' => 2,
); );
//'defaultBorderColor' => null, //'defaultBorderColor' => null,
foreach ($attributes as $key => $value) { foreach ($attributes as $key => $value) {
$set = "set{$key}"; $set = "set{$key}";
$get = "get{$key}"; $get = "get{$key}";
@ -76,5 +75,4 @@ class PHPWord_Style_CellTest extends \PHPUnit_Framework_TestCase
$object->setStyleValue('_borderSize', $value); $object->setStyleValue('_borderSize', $value);
$this->assertEquals($expected, $object->getBorderSize()); $this->assertEquals($expected, $object->getBorderSize());
} }
}
}

10
Tests/PHPWord/Style/FontTest.php
View File

@ -1,19 +1,18 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Style;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord; use PHPWord;
use PHPWord_Style_Font; use PHPWord_Style_Font;
/** /**
* Class PHPWord_Style_FontTest * Class FontTest
* *
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Style_FontTest extends \PHPUnit_Framework_TestCase class FontTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* Test initiation for style type and paragraph style * Test initiation for style type and paragraph style
*/ */
@ -78,5 +77,4 @@ class PHPWord_Style_FontTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($value, $object->$get()); $this->assertEquals($value, $object->$get());
} }
} }
}
}

44
Tests/PHPWord/Style/ParagraphTest.php
View File

@ -1,18 +1,24 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Style;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord;
use PHPWord_Style_Paragraph; use PHPWord_Style_Paragraph;
use PHPWord_Style_Tab; use PHPWord_Style_Tab;
use PHPWord\Tests\TestHelperDOCX;
/** /**
* Class PHPWord_Style_ParagraphTest * Class ParagraphTest
* *
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Style_ParagraphTest extends \PHPUnit_Framework_TestCase class ParagraphTest extends \PHPUnit_Framework_TestCase
{ {
public function tearDown()
{
TestHelperDOCX::clear();
}
/** /**
* Test setting style values with null or empty value * Test setting style values with null or empty value
@ -87,4 +93,34 @@ class PHPWord_Style_ParagraphTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('PHPWord_Style_Tabs', $object->getTabs()); $this->assertInstanceOf('PHPWord_Style_Tabs', $object->getTabs());
} }
} public function testLineHeight()
{
$PHPWord = new PHPWord();
$section = $PHPWord->createSection();
// Test style array
$text = $section->addText('This is a test', array(), array(
'line-height' => 2.0
));
$doc = TestHelperDOCX::getDocument($PHPWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:spacing');
$lineHeight = $element->getAttribute('w:line');
$lineRule = $element->getAttribute('w:lineRule');
$this->assertEquals(480, $lineHeight);
$this->assertEquals('auto', $lineRule);
// Test setter
$text->getParagraphStyle()->setLineHeight(3.0);
$doc = TestHelperDOCX::getDocument($PHPWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:spacing');
$lineHeight = $element->getAttribute('w:line');
$lineRule = $element->getAttribute('w:lineRule');
$this->assertEquals(720, $lineHeight);
$this->assertEquals('auto', $lineRule);
}
}

14
Tests/PHPWord/TemplateTest.php
View File

@ -6,7 +6,7 @@ use PHPWord_Template;
/** /**
* @coversDefaultClass PHPWord_Template * @coversDefaultClass PHPWord_Template
*/ */
class PHPWord_TemplateTest extends \PHPUnit_Framework_TestCase class TemplateTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @covers ::applyXslStyleSheet * @covers ::applyXslStyleSheet
@ -20,7 +20,7 @@ class PHPWord_TemplateTest extends \PHPUnit_Framework_TestCase
array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'with_table_macros.docx') array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'templates', 'with_table_macros.docx')
) )
); );
$xslDOMDocument = new \DOMDocument(); $xslDOMDocument = new \DOMDocument();
$xslDOMDocument->load( $xslDOMDocument->load(
\join( \join(
@ -28,31 +28,31 @@ class PHPWord_TemplateTest extends \PHPUnit_Framework_TestCase
array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'xsl', 'remove_tables_by_needle.xsl') array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'xsl', 'remove_tables_by_needle.xsl')
) )
); );
foreach (array('${employee.', '${scoreboard.') as $needle) { foreach (array('${employee.', '${scoreboard.') as $needle) {
$template->applyXslStyleSheet($xslDOMDocument, array('needle' => $needle)); $template->applyXslStyleSheet($xslDOMDocument, array('needle' => $needle));
} }
$actualDocument = $template->save(); $actualDocument = $template->save();
$expectedDocument = \join( $expectedDocument = \join(
\DIRECTORY_SEPARATOR, \DIRECTORY_SEPARATOR,
array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'documents', 'without_table_macros.docx') array(\PHPWORD_TESTS_DIR_ROOT, '_files', 'documents', 'without_table_macros.docx')
); );
$actualZip = new \ZipArchive(); $actualZip = new \ZipArchive();
$actualZip->open($actualDocument); $actualZip->open($actualDocument);
$actualXml = $actualZip->getFromName('word/document.xml'); $actualXml = $actualZip->getFromName('word/document.xml');
if ($actualZip->close() === false) { if ($actualZip->close() === false) {
throw new \Exception('Could not close zip file "' . $actualDocument . '".'); throw new \Exception('Could not close zip file "' . $actualDocument . '".');
} }
$expectedZip = new \ZipArchive(); $expectedZip = new \ZipArchive();
$expectedZip->open($expectedDocument); $expectedZip->open($expectedDocument);
$expectedXml = $expectedZip->getFromName('word/document.xml'); $expectedXml = $expectedZip->getFromName('word/document.xml');
if ($expectedZip->close() === false) { if ($expectedZip->close() === false) {
throw new \Exception('Could not close zip file "' . $expectedDocument . '".'); throw new \Exception('Could not close zip file "' . $expectedDocument . '".');
} }
$this->assertXmlStringEqualsXmlString($expectedXml, $actualXml); $this->assertXmlStringEqualsXmlString($expectedXml, $actualXml);
} }

85
Tests/PHPWord/Writer/Word2007/BaseTest.php
View File

@ -1,62 +1,62 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Writer\Word2007;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord; use PHPWord;
use PHPWord_Writer_Word2007; use PHPWord\Tests\TestHelperDOCX;
use PHPWord_Writer_Word2007_Base;
/** /**
* Class PHPWord_Writer_Word2007_BaseTest * Class BaseTest
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Writer_Word2007_BaseTest extends \PHPUnit_Framework_TestCase { class BaseTest extends \PHPUnit_Framework_TestCase
/** {
* Executed before each method of the class /**
*/ * Executed before each method of the class
public function tearDown() */
{ public function tearDown()
TestHelperDOCX::clear(); {
} TestHelperDOCX::clear();
}
public function testWriteImage_Position() public function testWriteImage_Position()
{ {
$PHPWord = new PHPWord(); $PHPWord = new PHPWord();
$section = $PHPWord->createSection(); $section = $PHPWord->createSection();
$section->addImage( $section->addImage(
PHPWORD_TESTS_DIR_ROOT . '/_files/images/earth.jpg', PHPWORD_TESTS_DIR_ROOT . '/_files/images/earth.jpg',
array( array(
'marginTop' => -1, 'marginTop' => -1,
'marginLeft' => -1, 'marginLeft' => -1,
'wrappingStyle' => 'behind' 'wrappingStyle' => 'behind'
) )
); );
$doc = TestHelperDOCX::getDocument($PHPWord); $doc = TestHelperDOCX::getDocument($PHPWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:r/w:pict/v:shape'); $element = $doc->getElement('/w:document/w:body/w:p/w:r/w:pict/v:shape');
$style = $element->getAttribute('style'); $style = $element->getAttribute('style');
$this->assertRegExp('/z\-index:\-[0-9]*/', $style); $this->assertRegExp('/z\-index:\-[0-9]*/', $style);
$this->assertRegExp('/position:absolute;/', $style); $this->assertRegExp('/position:absolute;/', $style);
} }
public function testWriteParagraphStyle_Align() public function testWriteParagraphStyle_Align()
{ {
$PHPWord = new PHPWord(); $PHPWord = new PHPWord();
$section = $PHPWord->createSection(); $section = $PHPWord->createSection();
$section->addText('This is my text', null, array('align' => 'right')); $section->addText('This is my text', null, array('align' => 'right'));
$doc = TestHelperDOCX::getDocument($PHPWord); $doc = TestHelperDOCX::getDocument($PHPWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:jc'); $element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:jc');
$this->assertEquals('right', $element->getAttribute('w:val')); $this->assertEquals('right', $element->getAttribute('w:val'));
} }
public function testWriteCellStyle_CellGridSpan() public function testWriteCellStyle_CellGridSpan()
{ {
$PHPWord = new PHPWord(); $PHPWord = new PHPWord();
$section = $PHPWord->createSection(); $section = $PHPWord->createSection();
@ -77,7 +77,7 @@ class PHPWord_Writer_Word2007_BaseTest extends \PHPUnit_Framework_TestCase {
$element = $doc->getElement('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:gridSpan'); $element = $doc->getElement('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:gridSpan');
$this->assertEquals(5, $element->getAttribute('w:val')); $this->assertEquals(5, $element->getAttribute('w:val'));
} }
/** /**
* Test write paragraph pagination * Test write paragraph pagination
@ -108,5 +108,4 @@ class PHPWord_Writer_Word2007_BaseTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals($expected, $element->getAttribute('w:val')); $this->assertEquals($expected, $element->getAttribute('w:val'));
} }
} }
} }

43
Tests/PHPWord/Writer/Word2007/DocumentTest.php
View File

@ -1,35 +1,36 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Writer\Word2007;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord; use PHPWord;
use PHPWord_Writer_Word2007; use PHPWord_Writer_Word2007;
use PHPWord_Writer_Word2007_Document; use PHPWord_Writer_Word2007_Document;
use PHPWord\Tests\TestHelperDOCX;
/** /**
* Class PHPWord_Writer_Word2007_DocumentTest * Class DocumentTest
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Writer_Word2007_DocumentTest extends \PHPUnit_Framework_TestCase { class DocumentTest extends \PHPUnit_Framework_TestCase
/** {
* Executed before each method of the class /**
*/ * Executed before each method of the class
public function tearDown() */
{ public function tearDown()
TestHelperDOCX::clear(); {
} TestHelperDOCX::clear();
}
public function testWriteEndSection_PageNumbering() public function testWriteEndSection_PageNumbering()
{ {
$PHPWord = new PHPWord(); $PHPWord = new PHPWord();
$section = $PHPWord->createSection(); $section = $PHPWord->createSection();
$section->getSettings()->setPageNumberingStart(2); $section->getSettings()->setPageNumberingStart(2);
$doc = TestHelperDOCX::getDocument($PHPWord); $doc = TestHelperDOCX::getDocument($PHPWord);
$element = $doc->getElement('/w:document/w:body/w:sectPr/w:pgNumType'); $element = $doc->getElement('/w:document/w:body/w:sectPr/w:pgNumType');
$this->assertEquals(2, $element->getAttribute('w:start')); $this->assertEquals(2, $element->getAttribute('w:start'));
} }
} }

9
Tests/PHPWord/Writer/Word2007/StylesTest.php
View File

@ -1,16 +1,16 @@
<?php <?php
namespace PHPWord\Tests; namespace PHPWord\Tests\Writer\Word2007;
use PHPUnit_Framework_TestCase; use PHPUnit_Framework_TestCase;
use PHPWord; use PHPWord;
use PHPWord_Writer_Word2007_Styles; use PHPWord\Tests\TestHelperDOCX;
/** /**
* Class PHPWord_Writer_Word2007_StylesTest * Class PHPWord_Writer_Word2007_StylesTest
* @package PHPWord\Tests * @package PHPWord\Tests
* @runTestsInSeparateProcesses * @runTestsInSeparateProcesses
*/ */
class PHPWord_Writer_Word2007_StylesTest extends \PHPUnit_Framework_TestCase class StylesTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* Executed before each method of the class * Executed before each method of the class
@ -51,5 +51,4 @@ class PHPWord_Writer_Word2007_StylesTest extends \PHPUnit_Framework_TestCase
$element = $doc->getElement($path, $file); $element = $doc->getElement($path, $file);
$this->assertEquals('Normal', $element->getAttribute('w:val')); $this->assertEquals('Normal', $element->getAttribute('w:val'));
} }
}
}

2
Tests/_inc/TestHelperDOCX.php
View File

@ -25,7 +25,7 @@ class TestHelperDOCX
$zip = new \ZipArchive; $zip = new \ZipArchive;
$res = $zip->open(self::$file); $res = $zip->open(self::$file);
if ($res === true) { if ($res === true) {
$zip->extractTo(sys_get_temp_dir().'/PHPWord_Unit_Test/'); $zip->extractTo(sys_get_temp_dir() . '/PHPWord_Unit_Test/');
$zip->close(); $zip->close();
} }

4
Tests/bootstrap.php
View File

@ -3,8 +3,8 @@
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
// Constantes // Constantes
if(!defined('PHPWORD_TESTS_DIR_ROOT')){ if (!defined('PHPWORD_TESTS_DIR_ROOT')) {
define('PHPWORD_TESTS_DIR_ROOT', __DIR__); define('PHPWORD_TESTS_DIR_ROOT', __DIR__);
} }
// Includes // Includes

2
changelog.txt
View File

@ -29,7 +29,7 @@ Changes in branch for release 0.7.1 :
- Bugfix: (Progi1984) GH-89 - Example in README.md is broken - Bugfix: (Progi1984) GH-89 - Example in README.md is broken
- Feature: (RomanSyroeshko) GH-56 GH-57 - Template : Permit to save a template generated as a file (PHPWord_Template::saveAs()) - Feature: (RomanSyroeshko) GH-56 GH-57 - Template : Permit to save a template generated as a file (PHPWord_Template::saveAs())
- Feature: (gabrielbull) - Word2007 : Support sections page numbering - Feature: (gabrielbull) - Word2007 : Support sections page numbering
- Feature: (gabrielbull) - Word2007 : Added support for line height - Feature: (gabrielbull) - Word2007 : Added line height methods to mirror the line height settings in Word in the paragraph styling
- Feature: (JillElaine) GH-5 - Word2007 : Added support for page header & page footer height - Feature: (JillElaine) GH-5 - Word2007 : Added support for page header & page footer height
- Feature: (bskrtich) GH-6 GH-66 GH-84 - General : Add ability to manage line breaks after image insertion - Feature: (bskrtich) GH-6 GH-66 GH-84 - General : Add ability to manage line breaks after image insertion
- Feature: (RomanSyroeshko) GH-52 GH-53 GH-85 - Template : Ability to limit number of replacements performed by setValue() method of Template class - Feature: (RomanSyroeshko) GH-52 GH-53 GH-85 - Template : Ability to limit number of replacements performed by setValue() method of Template class