Merge branch 'hotfix/4074' into develop

Forward port #4074
zendframework · Mar 28, 2013 · bb753b9 · bb753b9
2 parents e86925f + 21a5382
commit bb753b9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/library/Zend/Http/Headers.php b/library/Zend/Http/Headers.php
@@ -286,7 +286,7 @@ public function has($name)
     }
 
     /**
-     * Advance the pointer for this object as an interator
+     * Advance the pointer for this object as an iterator
      *
      * @return void
      */

diff --git a/library/Zend/Http/Response/Stream.php b/library/Zend/Http/Response/Stream.php
@@ -26,7 +26,7 @@ class Stream extends Response
     protected $contentLength = null;
 
     /**
-     * The portion of the body that has alredy been streamed
+     * The portion of the body that has already been streamed
      *
      * @var int
      */

diff --git a/tests/ZendTest/Db/Adapter/ParameterContainerTest.php b/tests/ZendTest/Db/Adapter/ParameterContainerTest.php
@@ -236,7 +236,7 @@ public function testValid()
     }
 
     /**
-     * @testdox unit test: Test rewind() resets the interators pointer
+     * @testdox unit test: Test rewind() resets the iterators pointer
      * @covers Zend\Db\Adapter\ParameterContainer::rewind
      */
     public function testRewind()

diff --git a/tests/ZendTest/Ldap/CrudTest.php b/tests/ZendTest/Ldap/CrudTest.php
@@ -100,7 +100,7 @@ public function testIllegalUpdate()
             }
             $this->getLDAP()->delete($dn);
             if (!$exThrown) {
-                $this->fail('no exception thrown while illegaly updating entry');
+                $this->fail('no exception thrown while illegally updating entry');
             }
         } catch (Exception\LdapException $e) {
             $this->fail($e->getMessage());

diff --git a/tests/ZendTest/Session/SessionArrayStorageTest.php b/tests/ZendTest/Session/SessionArrayStorageTest.php
@@ -172,7 +172,7 @@ public function testUndefinedSessionManipulation()
      */
     public function testExpirationHops()
     {
-        // since we cannot explicitly test reinitalizing the session
+        // since we cannot explicitly test reinitializing the session
         // we will act in how session manager would in this case.
         $storage = new SessionArrayStorage();
         $manager = new SessionManager(null, $storage);

diff --git a/tests/ZendTest/XmlRpc/ResponseTest.php b/tests/ZendTest/XmlRpc/ResponseTest.php
@@ -30,7 +30,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
     /**
      * @var bool
      */
-    protected $_errorOccured = false;
+    protected $_errorOccurred = false;
 
     /**
      * Setup environment
@@ -133,9 +133,9 @@ public function testExceptionIsThrownWhenInvalidXmlIsReturnedByServer()
         set_error_handler(array($this, 'trackError'));
         $invalidResponse = 'foo';
         $response = new Response();
-        $this->assertFalse($this->_errorOccured);
+        $this->assertFalse($this->_errorOccurred);
         $this->assertFalse($response->loadXml($invalidResponse));
-        $this->assertFalse($this->_errorOccured);
+        $this->assertFalse($this->_errorOccurred);
     }
 
     /**
@@ -242,7 +242,7 @@ public function testLoadXmlThrowsExceptionWithMissingNodes3()
 
     public function trackError($error)
     {
-        $this->_errorOccured = true;
+        $this->_errorOccurred = true;
     }
 
     /**