adjust namespace

pear2 · Apr 20, 2012 · 7e565d1 · 7e565d1
1 parent 7df697a
commit 7e565d1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/tests/PEAR2/Services/NYTimes/Test/ArticlesearchTest.php b/tests/PEAR2/Services/NYTimes/Test/ArticlesearchTest.php
@@ -13,6 +13,8 @@
  * @link      https://github.com/pear2/Services_NYTimes
  */
 
+namespace PEAR2\Services\NYTimes\Test;
+
 /**
  * ArticlesearchTest covers {@link \PEAR2\Services\NYTimes\Articlesearch}.
  *
@@ -23,7 +25,6 @@
  * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
  * @link      https://github.com/pear2/Services_NYTimes
  */
-namespace PEAR2\Services\NYTimes;
 class ArticlesearchTest extends TestCase
 {
     /**

diff --git a/tests/PEAR2/Services/NYTimes/Test/BaseTest.php b/tests/PEAR2/Services/NYTimes/Test/BaseTest.php
@@ -13,6 +13,8 @@
  * @link      https://github.com/pear2/Services_NYTimes
  */
 
+namespace PEAR2\Services\NYTimes\Test;
+
 /**
  * BaseTest covers {@link \PEAR2\Services\NYTimes\Base}.
  *
@@ -23,7 +25,6 @@
  * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
  * @link      https://github.com/pear2/Services_NYTimes
  */
-namespace PEAR2\Services\NYTimes;
 class BaseTest extends TestCase
 {
     /**

diff --git a/tests/PEAR2/Services/NYTimes/Test/MainTest.php b/tests/PEAR2/Services/NYTimes/Test/MainTest.php
@@ -13,6 +13,8 @@
  * @link      https://github.com/pear2/Services_NYTimes
  */
 
+namespace PEAR2\Services\NYTimes\Test;
+
 /**
  * MainTest covers {@link \PEAR2\Services\NYTimes\Main}.
  *
@@ -23,7 +25,6 @@
  * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
  * @link      https://github.com/pear2/Services_NYTimes
  */
-namespace PEAR2\Services\NYTimes;
 class MainTest extends TestCase
 {
     /**

diff --git a/tests/PEAR2/Services/NYTimes/Test/NewswireTest.php b/tests/PEAR2/Services/NYTimes/Test/NewswireTest.php
@@ -13,6 +13,8 @@
  * @link      https://github.com/pear2/Services_NYTimes
  */
 
+namespace PEAR2\Services\NYTimes\Test;
+
 /**
  * NewswireTest covers {@link \PEAR2\Services\NYTimes\Newswire}.
  *
@@ -25,7 +27,6 @@
  * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
  * @link      https://github.com/pear2/Services_NYTimes
  */
-namespace PEAR2\Services\NYTimes;
 class NewswireTest extends TestCase
 {
     /**

diff --git a/tests/PEAR2/Services/NYTimes/Test/TestCase.php b/tests/PEAR2/Services/NYTimes/Test/TestCase.php
@@ -13,6 +13,8 @@
  * @link      https://github.com/pear2/Services_NYTimes
  */
 
+namespace PEAR2\Services\NYTimes\Test;
+
 /**
  * An abstract TestCase class for test cases.
  *
@@ -23,7 +25,6 @@
  * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
  * @link      https://github.com/pear2/Services_NYTimes
  */
-namespace PEAR2\Services\NYTimes;
 abstract class TestCase extends \PHPUnit_Framework_TestCase
 {
     /**

diff --git a/tests/TestInit.php b/tests/TestInit.php
@@ -4,7 +4,7 @@
  */
 require_once 'PHPUnit/Autoload.php';
 
-require_once __DIR__ . '/Services/NYTimes/TestCase.php';
+require_once __DIR__ . '/PEAR2/Services/NYTimes/Test/TestCase.php';
 
 /**
  * testAutoloader
@@ -16,8 +16,7 @@
 function testAutoloader($className) {
     if (substr($className, 0, 22) == 'PEAR2\Services\NYTimes') {
 
-        $file  = substr($className, 6);
+        $file  = str_replace("\\", '/', $className);
-        $file  = str_replace("\\", '/', $file);
         $file .= '.php';
 
         $path = realpath(__DIR__ . '/../src');