Merge pull request zendframework#6237

HolgerW1 · May 7, 2014 · d8158b4 · d8158b4
2 parents b173c71 + b11fca0
commit d8158b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php b/library/Zend/Cache/Storage/Adapter/RedisResourceManager.php
@@ -153,8 +153,8 @@ public function setResource($id, $resource)
             //there are two ways of determining if redis is already initialized
             //with connect function:
             //1) pinging server
-            //2) checking undocummented property socket which is available only
-            //after successfull connect
+            //2) checking undocumented property socket which is available only
+            //after successful connect
             $resource = array_merge($defaults, array(
                     'resource' => $resource,
                     'initialized' => isset($resource->socket),

diff --git a/tests/ZendTest/Mvc/Router/Http/RouteMatchTest.php b/tests/ZendTest/Mvc/Router/Http/RouteMatchTest.php
@@ -53,7 +53,7 @@ public function testMatchedRouteNameIsPrependedWhenAlreadySet()
         $this->assertEquals('bar/foo', $match->getMatchedRouteName());
     }
 
-    public function testMatchedRouteNameIsOverridenOnMerge()
+    public function testMatchedRouteNameIsOverriddenOnMerge()
     {
         $match = new RouteMatch(array());
         $match->setMatchedRouteName('foo');