Skip to content

Commit

Permalink
Merge branch 'hotfix/zend_file' of https://github.com/Maks3w/zf2 into…
Browse files Browse the repository at this point in the history
… feature/file-refactor
  • Loading branch information
weierophinney committed Apr 9, 2012
2 parents fbbbb25 + 8b9a59c commit e8929c5
Show file tree
Hide file tree
Showing 16 changed files with 737 additions and 550 deletions.
27 changes: 23 additions & 4 deletions library/Zend/File/ClassFileLocator.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
<?php
/**
* Zend Framework
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to [email protected] so we can send you a copy immediately.
*
* @category Zend
* @package Zend_File
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\File;

Expand All @@ -11,9 +29,11 @@

/**
* Locate files containing PHP classes, interfaces, or abstracts
*
*
* @category Zend
* @package Zend_File
* @license New BSD {@link http://framework.zend.com/license/new-bsd}
* @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 ClassFileLocator extends FilterIterator
{
Expand All @@ -23,8 +43,7 @@ class ClassFileLocator extends FilterIterator
* Expects either a directory, or a DirectoryIterator (or its recursive variant)
* instance.
*
* @param string|DirectoryIterator $dirOrIterator
* @return void
* @param string|DirectoryIterator $dirOrIterator
*/
public function __construct($dirOrIterator = '.')
{
Expand Down
Loading

0 comments on commit e8929c5

Please sign in to comment.