Merge branch 'hotfix/2685' into develop

Forward port zendframework/zendframework#2685 Conflicts: library/Zend/Code/Scanner/ClassScanner.php tests/ZendTest/ModuleManager/Listener/ListenerOptionsTest.php
zendframework · Oct 8, 2012 · 06b12b7 · 06b12b7
commit 06b12b7
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 7 deletions.
diff --git a/src/Header/MessageId.php b/src/Header/MessageId.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Mail\Header;
 
-use Zend\Mail\Headers;
 
 /**
  * @category   Zend

diff --git a/src/Storage/Part/File.php b/src/Storage/Part/File.php
@@ -12,7 +12,6 @@
 
 use Zend\Mail\Headers;
 use Zend\Mail\Storage\Part;
-use Zend\Mime;
 
 /**
  * @category   Zend

diff --git a/test/Protocol/SmtpTest.php b/test/Protocol/SmtpTest.php
@@ -13,7 +13,6 @@
 use Zend\Mail\Headers;
 use Zend\Mail\Message;
 use Zend\Mail\Transport\Smtp;
-use Zend\Mail\Transport\SmtpOptions;
 use ZendTest\Mail\TestAsset\SmtpProtocolSpy;
 
 /**

diff --git a/test/Storage/ImapTest.php b/test/Storage/ImapTest.php
@@ -11,9 +11,7 @@
 namespace ZendTest\Mail\Storage;
 
 use Zend\Config;
-use Zend\Mail\Exception as MailException;
 use Zend\Mail\Protocol;
-use Zend\Mail\Protocol\Exception as ProtocolException;
 use Zend\Mail\Storage;
 use Zend\Mail\Storage\Exception;
 

diff --git a/test/Storage/MaildirWritableTest.php b/test/Storage/MaildirWritableTest.php
@@ -11,7 +11,6 @@
 namespace ZendTest\Mail\Storage;
 
 use Zend\Mail;
-use Zend\Mail\Exception as MailException;
 use Zend\Mail\Storage;
 use Zend\Mail\Storage\Writable;
 

diff --git a/test/Storage/MboxFolderTest.php b/test/Storage/MboxFolderTest.php
@@ -11,7 +11,6 @@
 namespace ZendTest\Mail\Storage;
 
 use Zend\Config;
-use Zend\Mail\Exception as MailException;
 use Zend\Mail\Storage\Folder;
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ @@
     namespace Zend\Mail\Header;
-    use Zend\Mail\Headers;
     /**
      * @category   Zend
@@ Expand Down @@