Updated repository with case-sensitive changes

intypica · Jun 16, 2010 · dfc035b · dfc035b
1 parent 65374d9
commit dfc035b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/...ry/Zend/Controller/Action/Helper/Json.php → ...ry/Zend/Controller/Action/Helper/JSON.php b/...ry/Zend/Controller/Action/Helper/Json.php → ...ry/Zend/Controller/Action/Helper/JSON.php
diff --git a/library/Zend/Controller/Response/Http.php → library/Zend/Controller/Response/HTTP.php b/library/Zend/Controller/Response/Http.php → library/Zend/Controller/Response/HTTP.php
diff --git a/...Zend/Controller/Response/HttpTestCase.php → ...Zend/Controller/Response/HTTPTestCase.php b/...Zend/Controller/Response/HttpTestCase.php → ...Zend/Controller/Response/HTTPTestCase.php
diff --git a/library/Zend/View/Helper/Json.php → library/Zend/View/Helper/JSON.php b/library/Zend/View/Helper/Json.php → library/Zend/View/Helper/JSON.php
diff --git a/tests/Zend/Controller/Action/Helper/URLTest.php b/tests/Zend/Controller/Action/Helper/URLTest.php
@@ -52,7 +52,7 @@ public function setUp()
         $this->front = \Zend\Controller\Front::getInstance();
         $this->front->resetInstance();
         $this->front->setRequest(new \Zend\Controller\Request\HTTP());
-        $this->helper = new \Zend\Controller\Action\Helper\Url();
+        $this->helper = new \Zend\Controller\Action\Helper\URL();
     }
 
     /**
@@ -66,15 +66,15 @@ public function tearDown()
         unset($this->helper);
     }
 
-    public function testSimpleWithAllParamsProducesAppropriateUrl()
+    public function testSimpleWithAllParamsProducesAppropriateURL()
     {
         $url = $this->helper->simple('baz', 'bar', 'foo', array('bat' => 'foo', 'ho' => 'hum'));
         $this->assertEquals('/foo/bar/baz', substr($url, 0, 12));
         $this->assertContains('/bat/foo', $url);
         $this->assertContains('/ho/hum', $url);
     }
 
-    public function testSimpleWithMissingControllerAndModuleProducesAppropriateUrl()
+    public function testSimpleWithMissingControllerAndModuleProducesAppropriateURL()
     {
         $request = $this->front->getRequest();
         $request->setModuleName('foo')
@@ -85,13 +85,13 @@ public function testSimpleWithMissingControllerAndModuleProducesAppropriateUrl()
         $this->assertContains('/ho/hum', $url);
     }
 
-    public function testSimpleWithDefaultModuleProducesUrlWithoutModuleSegment()
+    public function testSimpleWithDefaultModuleProducesURLWithoutModuleSegment()
     {
         $url = $this->helper->simple('baz', 'bar', 'default', array('bat' => 'foo', 'ho' => 'hum'));
         $this->assertEquals('/bar/baz', substr($url, 0, 8));
     }
 
-    public function testUrlMethodCreatesUrlBasedOnNamedRouteAndPassedParameters()
+    public function testURLMethodCreatesURLBasedOnNamedRouteAndPassedParameters()
     {
         $router = $this->front->getRouter();
         $route  = new Route\Route(
@@ -108,7 +108,7 @@ public function testUrlMethodCreatesUrlBasedOnNamedRouteAndPassedParameters()
         $this->assertEquals('/foo/bar/3', $url);
     }
 
-    public function testUrlMethodCreatesUrlBasedOnNamedRouteAndDefaultParameters()
+    public function testURLMethodCreatesURLBasedOnNamedRouteAndDefaultParameters()
     {
         $router = $this->front->getRouter();
         $route  = new Route\Route(
@@ -125,7 +125,7 @@ public function testUrlMethodCreatesUrlBasedOnNamedRouteAndDefaultParameters()
         $this->assertEquals('/foo', $url);
     }
 
-    public function testUrlMethodCreatesUrlBasedOnPassedParametersUsingDefaultRouteWhenNoNamedRoutePassed()
+    public function testURLMethodCreatesURLBasedOnPassedParametersUsingDefaultRouteWhenNoNamedRoutePassed()
     {
         $this->front->getRouter()->addDefaultRoutes();
         $this->front->addModuleDirectory(dirname(__FILE__) . '/../../_files/modules');
@@ -152,9 +152,9 @@ public function testDirectProxiesToSimple()
     /**
      * @group ZF-2822
      */
-    public function testBaseUrlIsAssembledIntoUrl()
+    public function testBaseURLIsAssembledIntoURL()
     {
-        $this->front->setBaseUrl('baseurl');
+        $this->front->setBaseURL('baseurl');
 
         $request = $this->front->getRequest();
         $request->setModuleName('module')
@@ -165,7 +165,3 @@ public function testBaseUrlIsAssembledIntoUrl()
     }
 }
 
-// Call Zend_Controller_Action_Helper_UrlTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Controller_Action_Helper_UrlTest::main") {
-    \Zend_Controller_Action_Helper_UrlTest::main();
-}
diff --git a/tests/Zend/View/Helper/ActionTest.php b/tests/Zend/View/Helper/ActionTest.php
@@ -61,8 +61,8 @@ public function setUp()
         $front = Controller\Front::getInstance();
         $front->resetInstance();
 
-        $this->request  = new Request\Http('http://framework.zend.com/action-foo');
-        $this->response = new Response\Http();
+        $this->request  = new Request\HTTP('http://framework.zend.com/action-foo');
+        $this->response = new Response\HTTP();
         $this->response->headersSentThrowsException = false;
         $front->setRequest($this->request)
               ->setResponse($this->response)
@@ -213,7 +213,7 @@ public function testConstructorThrowsExceptionWithNoRequestInFrontController()
         $front = Controller\Front::getInstance();
         $front->resetInstance();
 
-        $response = new Response\Http();
+        $response = new Response\HTTP();
         $response->headersSentThrowsException = false;
         $front->setResponse($response)
               ->addModuleDirectory(dirname(__FILE__) . '/_files/modules');
@@ -232,7 +232,7 @@ public function testConstructorThrowsExceptionWithNoResponseInFrontController()
         $front = Controller\Front::getInstance();
         $front->resetInstance();
 
-        $request = new Request\Http('http://framework.zend.com/foo');
+        $request = new Request\HTTP('http://framework.zend.com/foo');
         $front->setRequest($this->request)
               ->addModuleDirectory(dirname(__FILE__) . '/_files/modules');
         try {