From f2122c152a735cbaeaec12bbb4d8c73c667afeb7 Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Sun, 9 Mar 2014 16:05:50 -0400 Subject: [PATCH] Changed PHPWord namespace to PhpOffice\PhpWord --- Classes/PHPWord/Autoloader.php | 2 +- Classes/PHPWord/Exceptions/InvalidStyleException.php | 2 +- Classes/PHPWord/Style/Font.php | 4 ++-- Classes/PHPWord/Style/Paragraph.php | 4 ++-- Tests/PHPWord/AutoloaderTest.php | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Classes/PHPWord/Autoloader.php b/Classes/PHPWord/Autoloader.php index 0e740822..cf476646 100755 --- a/Classes/PHPWord/Autoloader.php +++ b/Classes/PHPWord/Autoloader.php @@ -36,7 +36,7 @@ if (!defined('PHPWORD_BASE_PATH')) { */ class PHPWord_Autoloader { - const PREFIX = 'PHPWord'; + const PREFIX = 'PhpOffice\PhpWord'; /** * Register the autoloader diff --git a/Classes/PHPWord/Exceptions/InvalidStyleException.php b/Classes/PHPWord/Exceptions/InvalidStyleException.php index fb570625..d624c62c 100644 --- a/Classes/PHPWord/Exceptions/InvalidStyleException.php +++ b/Classes/PHPWord/Exceptions/InvalidStyleException.php @@ -1,5 +1,5 @@ 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'); } } \ No newline at end of file