Merge branch 'master' of git://git.zendframework.com/zf

zendframework · Jul 21, 2010 · 50a5cf9 · 50a5cf9
2 parents 9c496b9 + 0fcf91c
commit 50a5cf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Transfer/Adapter/HTTP.php → src/Transfer/Adapter/Http.php b/src/Transfer/Adapter/HTTP.php → src/Transfer/Adapter/Http.php
@@ -38,7 +38,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */
-class HTTP extends AbstractAdapter
+class Http extends AbstractAdapter
 {
     protected static $_callbackApc            = 'apc_fetch';
     protected static $_callbackUploadProgress = 'uploadprogress_get_info';
@@ -309,7 +309,7 @@ public static function getProgress($id = null)
             throw new Transfer\Exception('Wether APC nor uploadprogress extension installed');
         }
 
-        $session = 'Zend\File\Transfer\Adapter\HTTP\ProgressBar';
+        $session = 'Zend\File\Transfer\Adapter\Http\ProgressBar';
         $status  = array(
             'total'    => 0,
             'current'  => 0,

diff --git a/test/Transfer/Adapter/HTTPTest.php b/test/Transfer/Adapter/HTTPTest.php
@@ -287,7 +287,7 @@ public function testValidationOfPhpExtendsFormError()
     }
 }
 
-class HTTPTestMockAdapter extends \Zend\File\Transfer\Adapter\HTTP
+class HTTPTestMockAdapter extends \Zend\File\Transfer\Adapter\Http
 {
     public function __construct()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -287,7 +287,7 @@ public function testValidationOfPhpExtendsFormError() @@
         }
     }
-    class HTTPTestMockAdapter extends \Zend\File\Transfer\Adapter\HTTP
+    class HTTPTestMockAdapter extends \Zend\File\Transfer\Adapter\Http
     {
         public function __construct()
         {
@@ Expand Down @@