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

Merge pull request #97 from gabrielbull/develop 

Changed PHPWord namespace to PhpOffice\PhpWord
This commit is contained in:
Progi1984 2014-03-09 22:34:30 +01:00
parent bf13fefcd1 f2122c152a
commit 8fb7da46ee
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/PHPWord/Autoloader.php
View File

@ -36,7 +36,7 @@ if (!defined('PHPWORD_BASE_PATH')) {
*/
class PHPWord_Autoloader
{
const PREFIX = 'PHPWord';
const PREFIX = 'PhpOffice\PhpWord';
/**
* Register the autoloader

2
Classes/PHPWord/Exceptions/InvalidStyleException.php
View File

@ -1,5 +1,5 @@
<?php
namespace PHPWord\Exceptions;
namespace PhpOffice\PhpWord\Exceptions;
use InvalidArgumentException;

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

@ -25,7 +25,7 @@
* @version 0.7.0
*/
use PHPWord\Exceptions\InvalidStyleException;
use PhpOffice\PhpWord\Exceptions\InvalidStyleException;
/**
* Class PHPWord_Style_Font
@ -488,7 +488,7 @@ class PHPWord_Style_Font
*
* @param int|float|string $lineHeight
* @return $this
* @throws \PHPWord\Exceptions\InvalidStyleException
* @throws InvalidStyleException
*/
public function setLineHeight($lineHeight)
{

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

@ -25,7 +25,7 @@
* @version 0.7.0
*/
use PHPWord\Exceptions\InvalidStyleException;
use PhpOffice\PhpWord\Exceptions\InvalidStyleException;
/**
* PHPWord_Style_Paragraph
@ -482,7 +482,7 @@ class PHPWord_Style_Paragraph
*
* @param int|float|string $lineHeight
* @return $this
* @throws \PHPWord\Exceptions\InvalidStyleException
* @throws InvalidStyleException
*/
public function setLineHeight($lineHeight)
{

6
Tests/PHPWord/AutoloaderTest.php
View File

@ -25,8 +25,8 @@ class AutoloaderTest extends PHPUnit_Framework_TestCase
$declared = get_declared_classes();
$declaredCount = count($declared);
Autoloader::autoload('Foo');
$this->assertEquals($declaredCount, count(get_declared_classes()), 'PHPWord\\Autoloader::autoload() is trying to load classes outside of the PHPWord namespace');
Autoloader::autoload('PHPWord\\Exceptions\\InvalidStyleException'); // TODO change this class to the main PHPWord class when it is namespaced
$this->assertTrue(in_array('PHPWord\\Exceptions\\InvalidStyleException', get_declared_classes()), 'PHPWord\\Autoloader::autoload() failed to autoload the PHPWord\\Exceptions\\InvalidStyleException class');
$this->assertEquals($declaredCount, count(get_declared_classes()), 'PhpOffice\\PhpWord\\Autoloader::autoload() is trying to load classes outside of the PhpOffice\\PhpWord namespace');
Autoloader::autoload('PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException'); // TODO change this class to the main PHPWord class when it is namespaced
$this->assertTrue(in_array('PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException', get_declared_classes()), 'PhpOffice\\PhpWord\\Autoloader::autoload() failed to autoload the PhpOffice\\PhpWord\\Exceptions\\InvalidStyleException class');
}
}