[zen-27][zendframework#1107] Fixes some imports/resolutions of interf…

…aces
james481 · May 7, 2012 · 92528ee · 92528ee
1 parent 03b99ea
commit 92528ee
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 25 deletions.
diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
 
-use Zend\Search\Lucene\Analysis\TokenFilter,
-    Zend\Search\Lucene\Analysis\Token;
+use Zend\Search\Lucene\Analysis\Token;
 
 /**
  * Lower case Token filter.
@@ -33,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class LowerCase implements TokenFilter
+class LowerCase implements TokenFilterInterface
 {
     /**
      * Normalize Token or remove it (if null is returned)

diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
 
-use Zend\Search\Lucene\Analysis\TokenFilter,
-    Zend\Search\Lucene\Analysis\Token,
+use Zend\Search\Lucene\Analysis\Token,
     Zend\Search\Lucene,
     Zend\Search\Lucene\Exception\ExtensionNotLoadedExtension;
 
@@ -35,7 +34,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class LowerCaseUtf8 implements TokenFilter
+class LowerCaseUtf8 implements TokenFilterInterface
 {
     /**
      * Object constructor

diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
 
-use Zend\Search\Lucene\Analysis\TokenFilter,
-    Zend\Search\Lucene\Analysis\Token;
+use Zend\Search\Lucene\Analysis\Token;
 
 /**
  * Token filter that removes short words. What is short word can be configured with constructor.
@@ -33,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ShortWords implements TokenFilter
+class ShortWords implements TokenFilterInterface
 {
     /**
      * Minimum allowed term length

diff --git a/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php b/library/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php
@@ -20,8 +20,8 @@
  */
 
 namespace Zend\Search\Lucene\Analysis\TokenFilter;
+
 use Zend\Search\Lucene,
-    Zend\Search\Lucene\Analysis\TokenFilter,
     Zend\Search\Lucene\Analysis\Token,
     Zend\Search\Lucene\Exception\InvalidArgumentException,
     Zend\Search\Lucene\Exception\RuntimeException;
@@ -38,7 +38,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class StopWords implements TokenFilter
+class StopWords implements TokenFilterInterface
 {
     /**
      * Stop Words

diff --git a/library/Zend/Search/Lucene/Document/HTML.php b/library/Zend/Search/Lucene/Document/HTML.php
@@ -23,7 +23,7 @@
 
 use Zend\Search\Lucene\Document,
     Zend\Search\Lucene,
-    Zend\Search\Lucene\Analysis\Analyzer\AnalyzerInterface,
+    Zend\Search\Lucene\Analysis\Analyzer,
     Zend\Search\Lucene\Exception\RuntimeException,
     Zend\Search\Lucene\Exception\InvalidArgumentException;
 

diff --git a/library/Zend/Search/Lucene/Index.php b/library/Zend/Search/Lucene/Index.php
@@ -109,11 +109,11 @@ class Index implements SearchIndexInterface
      * 0 means pre-2.1 index format
      * -1 means there are no segments files.
      *
-     * @param \Zend\Search\Lucene\Storage\Directory $directory
+     * @param \Zend\Search\Lucene\Storage\Directory\DirectoryInterface $directory
      * @throws \Zend\Search\Lucene\Exception\RuntimeException
      * @return integer
      */
-    public static function getActualGeneration(Directory $directory)
+    public static function getActualGeneration(Directory\DirectoryInterface $directory)
     {
         /**
          * Zend_Search_Lucene uses segments.gen file to retrieve current generation number

diff --git a/library/Zend/Search/Lucene/LockManager.php b/library/Zend/Search/Lucene/LockManager.php
@@ -20,7 +20,7 @@
 
 namespace Zend\Search\Lucene;
 
-use Zend\Search\Lucene\Storage\Directory,
+use Zend\Search\Lucene\Storage\Directory\DirectoryInterface as Directory,
 	Zend\Search\Lucene\Exception\RuntimeException;
 
 /**

diff --git a/library/Zend/Search/Lucene/Search/Highlighter/DefaultHighlighter.php b/library/Zend/Search/Lucene/Search/Highlighter/DefaultHighlighter.php
@@ -21,8 +21,7 @@
 
 namespace Zend\Search\Lucene\Search\Highlighter;
 
-use Zend\Search\Lucene\Search\Highlighter,
-    Zend\Search\Lucene\Document;
+use Zend\Search\Lucene\Document;
 
 /**
  * @category   Zend
@@ -31,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class DefaultHighlighter implements Highlighter
+class DefaultHighlighter implements HighlighterInterface
 {
     /**
      * List of colors for text highlighting

diff --git a/library/Zend/Search/Lucene/Search/QueryParser.php b/library/Zend/Search/Lucene/Search/QueryParser.php
@@ -22,7 +22,7 @@
 namespace Zend\Search\Lucene\Search;
 
 use Zend\Search\Lucene,
-	Zend\Search\Lucene\Analysis\Analyzer\AnalyzerInterface,
+	Zend\Search\Lucene\Analysis\Analyzer,
 	Zend\Search\Lucene\Index,
 	Zend\Search\Lucene\Search\Exception\QueryParserException,
 	Zend\Search\Lucene\Exception\RuntimeException;

diff --git a/library/Zend/Search/Lucene/SearchIndexInterface.php b/library/Zend/Search/Lucene/SearchIndexInterface.php
@@ -35,11 +35,11 @@ interface SearchIndexInterface extends Index\TermsStreamInterface
      * 0 means pre-2.1 index format
      * -1 means there are no segments files.
      *
-     * @param \Zend\Search\Lucene\Storage\Directory $directory
+     * @param \Zend\Search\Lucene\Storage\Directory\DirectoryInterface $directory
      * @return integer
      * @throws \Zend\Search\Lucene\Exception\ExceptionInterface
      */
-    public static function getActualGeneration(Storage\Directory $directory);
+    public static function getActualGeneration(Storage\Directory\DirectoryInterface $directory);
 
     /**
      * Get segments file name
@@ -66,9 +66,9 @@ public function getFormatVersion();
     public function setFormatVersion($formatVersion);
 
     /**
-     * Returns the Zend_Search_Lucene_Storage_Directory instance for this index.
+     * Returns the Zend\Search\Lucene\Storage\Directory\DirectoryInterface instance for this index.
      *
-     * @return \Zend\Search\Lucene\Storage\Directory
+     * @return \Zend\Search\Lucene\Storage\Directory\DirectoryInterface
      */
     public function getDirectory();
 

diff --git a/tests/Zend/Search/Lucene/AnalysisTest.php b/tests/Zend/Search/Lucene/AnalysisTest.php
@@ -20,7 +20,8 @@
  */
 
 namespace ZendTest\Search\Lucene;
-use Zend\Search\Lucene\Analysis\AnalyzerInterface;
+use Zend\Search\Lucene\Analysis\Analyzer\Analyzer;
+use Zend\Search\Lucene\Analysis\Analyzer\AnalyzerInterface;
 use Zend\Search\Lucene\Analysis\Analyzer\Common;
 use Zend\Search\Lucene\Analysis\Analyzer\Common\Text;
 use Zend\Search\Lucene\Analysis\Analyzer\Common\TextNum;
@@ -47,7 +48,7 @@ class AnalysisTest extends \PHPUnit_Framework_TestCase
 {
     public function testAnalyzer()
     {
-        $currentAnalyzer = Analyzer\Analyzer::getDefault();
+        $currentAnalyzer = Analyzer::getDefault();
         $this->assertTrue($currentAnalyzer instanceof AnalyzerInterface);
 
         /** Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num */