Merge pull request zendframework/zendframework#5672 branch 'hotfix/cs…

…-cleanup'
zendframework · Jan 4, 2014 · 15ac5dd · 15ac5dd
commit 15ac5dd
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/src/BlockCipher.php b/src/BlockCipher.php
@@ -9,10 +9,8 @@
 
 namespace Zend\Crypt;
 
-use Zend\Crypt\Hmac;
 use Zend\Crypt\Key\Derivation\Pbkdf2;
 use Zend\Crypt\Symmetric\SymmetricInterface;
-use Zend\Crypt\Utils;
 use Zend\Math\Rand;
 
 /**

diff --git a/src/Key/Derivation/Scrypt.php b/src/Key/Derivation/Scrypt.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Crypt\Key\Derivation;
 
-use Zend\Crypt\Key\Derivation\Pbkdf2;
 
 /**
  * Scrypt key derivation function

diff --git a/src/PublicKey/Rsa.php b/src/PublicKey/Rsa.php
@@ -11,7 +11,6 @@
 
 use Traversable;
 use Zend\Crypt\PublicKey\Rsa\Exception;
-use Zend\Crypt\PublicKey\RsaOptions;
 use Zend\Stdlib\ArrayUtils;
 
 /**

diff --git a/test/PublicKey/DiffieHellmanTest.php b/test/PublicKey/DiffieHellmanTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Crypt;
+namespace ZendTest\Crypt\PublicKey;
 
 use Zend\Crypt\PublicKey\DiffieHellman;
 use Zend\Math\BigInteger;

diff --git a/test/PublicKey/RsaTest.php b/test/PublicKey/RsaTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Crypt;
+namespace ZendTest\Crypt\PublicKey;
 
 use Zend\Crypt\PublicKey\Rsa;
 use Zend\Crypt\PublicKey\RsaOptions;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     namespace Zend\Crypt\Key\Derivation;
-    use Zend\Crypt\Key\Derivation\Pbkdf2;
     /**
      * Scrypt key derivation function
@@ Expand Down @@