Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'remove-code-marked-as-deprecated' of https://github.com…
Browse files Browse the repository at this point in the history
…/Maks3w/zf2 into feature/deprecation-removal

Conflicts:
	library/Zend/GData/YouTube/Extension/Description.php
	library/Zend/GData/YouTube/Extension/Racy.php
  • Loading branch information
weierophinney committed Jul 10, 2012
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions src/File/Rename.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ class Rename extends Filter\AbstractFilter
* 'overwrite' => Shall existing files be overwritten ?
*
* @param string|array|Traversable $options Target file or directory to be renamed
* @param string $target Source filename or directory (deprecated)
* @param bool $overwrite Should existing files be overwritten (deprecated)
* @throws Exception\InvalidArgumentException
*/
public function __construct($options)
Expand All @@ -50,18 +48,6 @@ public function __construct($options)
throw new Exception\InvalidArgumentException('Invalid options argument provided to filter');
}

if (1 < func_num_args()) {
$argv = func_get_args();
array_shift($argv);
$source = array_shift($argv);
$overwrite = false;
if (!empty($argv)) {
$overwrite = array_shift($argv);
}
$options['source'] = $source;
$options['overwrite'] = $overwrite;
}

$this->setFile($options);
}

Expand Down

0 comments on commit f7fb71d

Please sign in to comment.