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

Fixed exceptions in reader/writer

This commit is contained in:
Gabriel Bull 2014-03-23 12:14:07 -04:00
parent 421b6e6f9d
commit 66c73c07c5
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/PhpWord/IOFactory.php
View File

@ -37,13 +37,12 @@ abstract class IOFactory
*/
public static function createWriter(PhpWord $phpWord, $name)
{
try {
$fqName = "PhpOffice\\PhpWord\\Writer\\{$name}";
return new $fqName($phpWord);
} catch (\Exception $ex) {
throw new Exception("Could not instantiate \"{$name}\" class.");
if ($name !== 'IWriter' && $name !== 'ODText' && $name !== 'RTF' && $name !== 'Word2007') {
throw new Exception("\"{$name}\" is not a valid writer.");
}
$fqName = "PhpOffice\\PhpWord\\Writer\\{$name}";
return new $fqName($phpWord);
}
/**
@ -53,13 +52,12 @@ abstract class IOFactory
*/
public static function createReader($name)
{
try {
$fqName = "PhpOffice\\PhpWord\\Reader\\{$name}";
return new $fqName();
} catch (\Exception $ex) {
throw new Exception("Could not instantiate \"{$name}\" class.");
if ($name !== 'IReader' && $name !== 'Word2007') {
throw new Exception("\"{$name}\" is not a valid reader.");
}
$fqName = "PhpOffice\\PhpWord\\Reader\\{$name}";
return new $fqName();
}
/**

2
test/PhpWord/Tests/IOFactoryTest.php
View File

@ -24,7 +24,6 @@ final class IOFactoryTest extends \PHPUnit_Framework_TestCase
/**
* @covers ::createWriter
* @expectedException \PhpOffice\PhpWord\Exceptions\Exception
* @expectedExceptionMessage Could not instantiate "Word2006" class.
*/
final public function testNonexistentWriterCanNotBeCreated()
{
@ -45,7 +44,6 @@ final class IOFactoryTest extends \PHPUnit_Framework_TestCase
/**
* @covers ::createReader
* @expectedException \PhpOffice\PhpWord\Exceptions\Exception
* @expectedExceptionMessage Could not instantiate "Word2006" class.
*/
final public function testNonexistentReaderCanNotBeCreated()
{