Merge branch 'feature/7334' into develop

Close zendframework/zendframework#7334
zendframework · Mar 17, 2015 · afcb58d · afcb58d
commit afcb58d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/test/Adapter/Http/ApacheResolverTest.php b/test/Adapter/Http/ApacheResolverTest.php
@@ -38,6 +38,11 @@ class ApacheResolverTest extends \PHPUnit_Framework_TestCase
      */
     protected $_badPath;
 
+    /**
+     * @var Apache
+     */
+    protected $_apache;
+
     /**
      * Sets the paths to files used in this test, and creates a shared resolver instance
      * having a valid path.
@@ -104,7 +109,8 @@ public function providePasswordFiles()
             array( $path . '/htbasic.plaintext' ),
             array( $path . '/htbasic.md5' ),
             array( $path . '/htbasic.sha1' ),
-            array( $path . '/htbasic.crypt' )
+            array( $path . '/htbasic.crypt' ),
+            array( $path . '/htbasic.bcrypt' ),
         );
     }
 

diff --git a/test/Adapter/Http/TestAsset/htbasic.bcrypt b/test/Adapter/Http/TestAsset/htbasic.bcrypt
@@ -0,0 +1 @@
+test:$2y$05$BYMNSHjpDGCMWb9Qpv6z3eGLenGdw9eXmWHBpBDZyCF7YKuKlfqKy
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		test:$2y$05$BYMNSHjpDGCMWb9Qpv6z3eGLenGdw9eXmWHBpBDZyCF7YKuKlfqKy