Merge branch 'renecatharsis-patch-1'

zendframework · Jul 22, 2013 · 9432969 · 9432969
commit 9432969
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Password/Bcrypt.php b/src/Password/Bcrypt.php
@@ -90,7 +90,7 @@ public function create($password)
             // check if the password contains 8-bit character
             if (preg_match('/[\x80-\xFF]/', $password)) {
                 throw new Exception\RuntimeException(
-                    'The bcrypt implementation used by PHP can contains a security flaw ' .
+                    'The bcrypt implementation used by PHP can contain a security flaw ' .
                     'using password with 8-bit character. ' .
                     'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
                 );

diff --git a/test/Password/BcryptTest.php b/test/Password/BcryptTest.php
@@ -148,7 +148,7 @@ public function testPasswordWith8bitCharacter()
                                 $this->bcrypt->create($password));
         } else {
             $this->setExpectedException('Zend\Crypt\Password\Exception\RuntimeException',
-                'The bcrypt implementation used by PHP can contains a security flaw ' .
+                'The bcrypt implementation used by PHP can contain a security flaw ' .
                 'using password with 8-bit character. ' .
                 'We suggest to upgrade to PHP 5.3.7+ or use passwords with only 7-bit characters'
             );