Merge pull request #1262 from mvriel/feature/1017

Fixes #1017: Erroneous behaviour of --hidden
phpDocumentor · May 17, 2014 · d715821 · d715821
2 parents f78fc5e + 9bae8ac
commit d715821
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/phpDocumentor/Command/Project/RunCommand.php b/src/phpDocumentor/Command/Project/RunCommand.php
@@ -136,7 +136,8 @@ protected function configure()
                 'hidden',
                 null,
                 InputOption::VALUE_NONE,
-                'set to on to descend into hidden directories (directories starting with \'.\'), default is on'
+                'Use this option to tell phpDocumentor to parse files and directories that begin with a period (.), '
+                . 'by default these are ignored'
             )
             ->addOption(
                 'ignore-symlinks',

diff --git a/src/phpDocumentor/Parser/Command/Project/ParseCommand.php b/src/phpDocumentor/Parser/Command/Project/ParseCommand.php
@@ -248,9 +248,8 @@ protected function getFileCollection($input)
             $configurationHelper->getOption($input, 'extensions', 'parser/extensions', array('php', 'php3', 'phtml'), true)
         );
         $files->setIgnorePatterns($configurationHelper->getOption($input, 'ignore', 'files/ignore', array(), true));
-        $files->setIgnoreHidden(
-            $configurationHelper->getOption($input, 'hidden', 'files/ignore-hidden', 'off') == 'on'
-        );
+        $ignoreHidden = $configurationHelper->getOption($input, 'hidden', 'files/ignore-hidden', 'off');
+        $files->setIgnoreHidden($ignoreHidden !== 'off' && $ignoreHidden === false);
         $files->setFollowSymlinks(
             $configurationHelper->getOption($input, 'ignore-symlinks', 'files/ignore-symlinks', 'off') == 'on'
         );

diff --git a/src/phpDocumentor/Parser/Messages/en.php b/src/phpDocumentor/Parser/Messages/en.php
@@ -27,8 +27,8 @@
         . 'Wildcards * and ? are supported',
     'PPCPP:OPT-IGNORETAGS'         => 'Comma-separated list of tags that will be ignored, defaults to none. package, '
         . 'subpackage and ignore may not be ignored.',
-    'PPCPP:OPT-HIDDEN'             => 'Set to on to descend into hidden directories (directories starting with \'.\'), '
-        . 'default is on',
+    'PPCPP:OPT-HIDDEN'             => 'Use this option to tell phpDocumentor to parse files and directories that begin '
+        . 'with a period (.), by default these are ignored',
     'PPCPP:OPT-IGNORESYMLINKS'     => 'Ignore symlinks to other files or directories, default is on',
     'PPCPP:OPT-MARKERS'            => 'Comma-separated list of markers/tags to filter',
     'PPCPP:OPT-TITLE'              => 'Sets the title for this project; default is the phpDocumentor logo',