Merge branch 'master' of git://github.com/zendframework/zf2

thomasweidner · thomasweidner · commit 5883d28d54fa · 2011-06-26T12:31:18.000+02:00
diff --git a/src/ClassFileLocator.php b/src/ClassFileLocator.php
@@ -16,10 +16,10 @@
  * @package    Zend_File
  * @license    New BSD {@link http://framework.zend.com/license/new-bsd}
  */
-class ClassFileLocater extends FilterIterator
+class ClassFileLocator extends FilterIterator
 {
     /**
-     * Create an instance of the locater iterator
+     * Create an instance of the locator iterator
      * 
      * Expects either a directory, or a DirectoryIterator (or its recursive variant) 
      * instance.
diff --git a/src/Transfer/Adapter/AbstractAdapter.php b/src/Transfer/Adapter/AbstractAdapter.php
@@ -27,7 +27,7 @@
     Zend\File\Transfer\Exception,
     Zend\Loader\PrefixPathLoader,
     Zend\Loader\PrefixPathMapper,
-    Zend\Loader\ShortNameLocater,
+    Zend\Loader\ShortNameLocator,
     Zend\Validator,
     Zend\Filter;
 
@@ -223,12 +223,12 @@ abstract public function isFiltered($files = null);
     /**
      * Set plugin loader to use for validator or filter chain
      *
-     * @param  \Zend\Loader\PrefixPathMapper $loader
+     * @param  \Zend\Loader\ShortNameLocator $loader
      * @param  string $type 'filter', or 'validator'
      * @return \Zend\File\Transfer\Adapter\AbstractAdapter
      * @throws \Zend\File\Transfer\Exception on invalid type
      */
-    public function setPluginLoader(ShortNameLocater $loader, $type)
+    public function setPluginLoader(ShortNameLocator $loader, $type)
     {
         $type = strtoupper($type);
         switch ($type) {
@@ -248,7 +248,7 @@ public function setPluginLoader(ShortNameLocater $loader, $type)
      * 'filter' or 'validator' for $type.
      *
      * @param  string $type
-     * @return \Zend\Loader\ShortNameLocater
+     * @return \Zend\Loader\ShortNameLocator
      * @throws \Zend\File\Transfer\Exception on invalid type.
      */
     public function getPluginLoader($type)
diff --git a/src/Transfer/Exception.php b/src/Transfer/Exception.php
@@ -26,30 +26,12 @@
 /**
  * Exception class for Zend_File_Transfer
  *
- * @uses       \Zend\Exception
  * @category   Zend
  * @package    Zend_File_Transfer
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface Exception
 {
-//    protected $_fileerror = null;
-//
-//    public function __construct($message, $fileerror = 0)
-//    {
-//        $this->_fileerror = $fileerror;
-//        parent::__construct($message);
-//    }
-//
-//    /**
-//     * Returns the transfer error code for the exception
-//     * This is not the exception code !!!
-//     *
-//     * @return integer
-//     */
-//    public function getFileError()
-//    {
-//        return $this->_fileerror;
-//    }
+
 }
diff --git a/test/ClassFileLocatorTest.php b/test/ClassFileLocatorTest.php
@@ -21,10 +21,11 @@
 
 namespace ZendTest\File;
 
-use Zend\File\ClassFileLocater;
+use Zend\File\ClassFileLocator,
+    PHPUnit_Framework_TestCase as TestCase;
 
 /**
- * Test class for Zend\File\ClassFileLocater
+ * Test class for Zend\File\ClassFileLocator
  *
  * @category   Zend
  * @package    Zend_File
@@ -33,36 +34,36 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @group      Zend_File
  */
-class ClassFileLocaterTest extends \PHPUnit_Framework_TestCase
+class ClassFileLocatorTest extends TestCase
 {
 
     public function testConstructorThrowsInvalidArgumentExceptionForInvalidStringDirectory()
     {
         $this->setExpectedException('Zend\File\Exception\InvalidArgumentException');
-        $locater = new ClassFileLocater('__foo__');
+        $locator = new ClassFileLocator('__foo__');
     }
 
     public function testConstructorThrowsInvalidArgumentExceptionForNonDirectoryIteratorArgument()
     {
         $iterator = new \ArrayIterator(array());
         $this->setExpectedException('Zend\File\Exception\InvalidArgumentException');
-        $locater = new ClassFileLocater($iterator);
+        $locator = new ClassFileLocator($iterator);
     }
 
     public function testIterationShouldReturnOnlyPhpFiles()
     {
-        $locater = new ClassFileLocater(__DIR__);
-        foreach ($locater as $file) {
+        $locator = new ClassFileLocator(__DIR__);
+        foreach ($locator as $file) {
             $this->assertRegexp('/\.php$/', $file->getFilename());
         }
     }
 
     public function testIterationShouldReturnOnlyPhpFilesContainingClasses()
     {
-        $locater = new ClassFileLocater(__DIR__);
+        $locator = new ClassFileLocator(__DIR__);
         $found = false;
-        foreach ($locater as $file) {
-            if (preg_match('/locater-should-skip-this\.php$/', $file->getFilename())) {
+        foreach ($locator as $file) {
+            if (preg_match('/locator-should-skip-this\.php$/', $file->getFilename())) {
                 $found = true;
             }
         }
@@ -71,30 +72,30 @@ public function testIterationShouldReturnOnlyPhpFilesContainingClasses()
 
     public function testIterationShouldReturnInterfaces()
     {
-        $locater = new ClassFileLocater(__DIR__);
+        $locator = new ClassFileLocator(__DIR__);
         $found = false;
-        foreach ($locater as $file) {
-            if (preg_match('/LocaterShouldFindThis\.php$/', $file->getFilename())) {
+        foreach ($locator as $file) {
+            if (preg_match('/LocatorShouldFindThis\.php$/', $file->getFilename())) {
                 $found = true;
             }
         }
-        $this->assertTrue($found, "Locater skipped an interface?");
+        $this->assertTrue($found, "Locator skipped an interface?");
     }
 
     public function testIterationShouldInjectNamespaceInFoundItems()
     {
-        $locater = new ClassFileLocater(__DIR__);
+        $locator = new ClassFileLocator(__DIR__);
         $found = false;
-        foreach ($locater as $file) {
+        foreach ($locator as $file) {
             $this->assertTrue(isset($file->namespace));
         }
     }
 
     public function testIterationShouldInjectClassInFoundItems()
     {
-        $locater = new ClassFileLocater(__DIR__);
+        $locator = new ClassFileLocator(__DIR__);
         $found = false;
-        foreach ($locater as $file) {
+        foreach ($locator as $file) {
             $this->assertTrue(isset($file->classname));
         }
     }
diff --git a/test/TestAsset/LocatorShouldFindThis.php b/test/TestAsset/LocatorShouldFindThis.php
@@ -27,6 +27,6 @@
  * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface LocaterShouldFindThis
+interface LocatorShouldFindThis
 {
 }
diff --git a/test/Transfer/Adapter/AbstractTest.php b/test/Transfer/Adapter/AbstractTest.php
@@ -25,7 +25,7 @@
 namespace ZendTest\File\Transfer\Adapter;
 
 use Zend\Loader\PrefixPathLoader,
-    Zend\Loader\ShortNameLocater,
+    Zend\Loader\ShortNameLocator,
     Zend\Validator\File,
     Zend\Filter,
     Zend\File\Transfer;
@@ -339,7 +339,7 @@ public function testErrorCodesShouldBePopulatedAfterInvalidTransfer()
     public function testAdapterShouldHavePluginLoaderForFilters()
     {
         $loader = $this->adapter->getPluginLoader('filter');
-        $this->assertTrue($loader instanceof ShortNameLocater);
+        $this->assertTrue($loader instanceof ShortNameLocator);
     }
 
     public function testFilterPluginLoaderShouldRegisterPathsForBaseAndFileFiltersByDefault()
diff --git a/test/_files/locater-should-skip-this.php b/test/_files/locater-should-skip-this.php
diff --git a/test/_files/locator-should-skip-this.php b/test/_files/locator-should-skip-this.php
@@ -0,0 +1,2 @@
+<?php
+// Locator should skip this file; no classes in it
diff --git a/test/_files/locator-should-skip-this.xml b/test/_files/locator-should-skip-this.xml

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@`
`16`	`16`	`* @package Zend_File`
`17`	`17`	`* @license New BSD {@link http://framework.zend.com/license/new-bsd}`
`18`	`18`	`*/`
`19`		`-class ClassFileLocater extends FilterIterator`
	`19`	`+class ClassFileLocator extends FilterIterator`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Create an instance of the locater iterator`
	`22`	`+ * Create an instance of the locator iterator`
`23`	`23`	`*`
`24`	`24`	`* Expects either a directory, or a DirectoryIterator (or its recursive variant)`
`25`	`25`	`* instance.`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,11 @@`
`21`	`21`
`22`	`22`	`namespace ZendTest\File;`
`23`	`23`
`24`		`-use Zend\File\ClassFileLocater;`
	`24`	`+use Zend\File\ClassFileLocator,`
	`25`	`+ PHPUnit_Framework_TestCase as TestCase;`
`25`	`26`
`26`	`27`	`/**`
`27`		`- * Test class for Zend\File\ClassFileLocater`
	`28`	`+ * Test class for Zend\File\ClassFileLocator`
`28`	`29`	`*`
`29`	`30`	`* @category Zend`
`30`	`31`	`* @package Zend_File`
`@@ -33,36 +34,36 @@`
`33`	`34`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`34`	`35`	`* @group Zend_File`
`35`	`36`	`*/`
`36`		`-class ClassFileLocaterTest extends \PHPUnit_Framework_TestCase`
	`37`	`+class ClassFileLocatorTest extends TestCase`
`37`	`38`	`{`
`38`	`39`
`39`	`40`	`public function testConstructorThrowsInvalidArgumentExceptionForInvalidStringDirectory()`
`40`	`41`	`{`
`41`	`42`	`$this->setExpectedException('Zend\File\Exception\InvalidArgumentException');`
`42`		`- $locater = new ClassFileLocater('__foo__');`
	`43`	`+ $locator = new ClassFileLocator('__foo__');`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`public function testConstructorThrowsInvalidArgumentExceptionForNonDirectoryIteratorArgument()`
`46`	`47`	`{`
`47`	`48`	`$iterator = new \ArrayIterator(array());`
`48`	`49`	`$this->setExpectedException('Zend\File\Exception\InvalidArgumentException');`
`49`		`- $locater = new ClassFileLocater($iterator);`
	`50`	`+ $locator = new ClassFileLocator($iterator);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`public function testIterationShouldReturnOnlyPhpFiles()`
`53`	`54`	`{`
`54`		`- $locater = new ClassFileLocater(__DIR__);`
`55`		`- foreach ($locater as $file) {`
	`55`	`+ $locator = new ClassFileLocator(__DIR__);`
	`56`	`+ foreach ($locator as $file) {`
`56`	`57`	`$this->assertRegexp('/\.php$/', $file->getFilename());`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`public function testIterationShouldReturnOnlyPhpFilesContainingClasses()`
`61`	`62`	`{`
`62`		`- $locater = new ClassFileLocater(__DIR__);`
	`63`	`+ $locator = new ClassFileLocator(__DIR__);`
`63`	`64`	`$found = false;`
`64`		`- foreach ($locater as $file) {`
`65`		`- if (preg_match('/locater-should-skip-this\.php$/', $file->getFilename())) {`
	`65`	`+ foreach ($locator as $file) {`
	`66`	`+ if (preg_match('/locator-should-skip-this\.php$/', $file->getFilename())) {`
`66`	`67`	`$found = true;`
`67`	`68`	`}`
`68`	`69`	`}`
`@@ -71,30 +72,30 @@ public function testIterationShouldReturnOnlyPhpFilesContainingClasses()`
`71`	`72`
`72`	`73`	`public function testIterationShouldReturnInterfaces()`
`73`	`74`	`{`
`74`		`- $locater = new ClassFileLocater(__DIR__);`
	`75`	`+ $locator = new ClassFileLocator(__DIR__);`
`75`	`76`	`$found = false;`
`76`		`- foreach ($locater as $file) {`
`77`		`- if (preg_match('/LocaterShouldFindThis\.php$/', $file->getFilename())) {`
	`77`	`+ foreach ($locator as $file) {`
	`78`	`+ if (preg_match('/LocatorShouldFindThis\.php$/', $file->getFilename())) {`
`78`	`79`	`$found = true;`
`79`	`80`	`}`
`80`	`81`	`}`
`81`		`- $this->assertTrue($found, "Locater skipped an interface?");`
	`82`	`+ $this->assertTrue($found, "Locator skipped an interface?");`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`public function testIterationShouldInjectNamespaceInFoundItems()`
`85`	`86`	`{`
`86`		`- $locater = new ClassFileLocater(__DIR__);`
	`87`	`+ $locator = new ClassFileLocator(__DIR__);`
`87`	`88`	`$found = false;`
`88`		`- foreach ($locater as $file) {`
	`89`	`+ foreach ($locator as $file) {`
`89`	`90`	`$this->assertTrue(isset($file->namespace));`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`public function testIterationShouldInjectClassInFoundItems()`
`94`	`95`	`{`
`95`		`- $locater = new ClassFileLocater(__DIR__);`
	`96`	`+ $locator = new ClassFileLocator(__DIR__);`
`96`	`97`	`$found = false;`
`97`		`- foreach ($locater as $file) {`
	`98`	`+ foreach ($locator as $file) {`
`98`	`99`	`$this->assertTrue(isset($file->classname));`
`99`	`100`	`}`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)`
`28`	`28`	`* @license http://framework.zend.com/license/new-bsd New BSD License`
`29`	`29`	`*/`
`30`		`-interface LocaterShouldFindThis`
	`30`	`+interface LocatorShouldFindThis`
`31`	`31`	`{`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<?php`
	`2`	`+// Locator should skip this file; no classes in it`