Skip to content

Commit

Permalink
Revert "Revert "remove the initial value before the required paramete…
Browse files Browse the repository at this point in the history
…r. (#1618)" (#1620)"

This reverts commit e2dd899.
  • Loading branch information
mrook committed Aug 27, 2021
1 parent 4b92e8b commit 03008b6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion classes/phing/tasks/ext/phpdoc/PhingPhpDocumentorSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class PhingPhpDocumentorSetup extends phpDocumentor_setup
* @param object $task The task we're working with, so we can pass it on to the ErrorTracker
* @internal param string $configDir Directory in which to look for configuration files.
*/
public function __construct($configdir = null, $task)
public function __construct($configdir, $task)
{
global $_phpDocumentor_cvsphpfile_exts, $_phpDocumentor_setting, $_phpDocumentor_phpfile_exts;

Expand Down
6 changes: 3 additions & 3 deletions classes/phing/util/FileUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ public static function getChainedReader(Reader $in, &$filterChains, Project $pro
public function copyFile(
PhingFile $sourceFile,
PhingFile $destFile,
$overwrite = false,
$preserveLastModified = true,
&$filterChains = null,
$overwrite,
$preserveLastModified,
&$filterChains,
Project $project,
$mode = 0755,
$preservePermissions = true
Expand Down

0 comments on commit 03008b6

Please sign in to comment.