Skip to content

Commit

Permalink
Completely strip unwanted text.
Browse files Browse the repository at this point in the history
  • Loading branch information
yunosh committed Mar 23, 2017
1 parent 6395f47 commit 62ce78f
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 0 deletions.
17 changes: 17 additions & 0 deletions framework/Refactor/lib/Horde/Refactor/Config/FileLevelDocBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,13 @@ class FileLevelDocBlock extends Base
*/
public $fileDescriptionExtractRegexp;

/**
* Text to strip from file summaries and descriptions.
*
* @var string
*/
public $fileStripText;

/**
* Default tags for new, empty file-level DocBlocks.
*
Expand Down Expand Up @@ -137,6 +144,13 @@ class FileLevelDocBlock extends Base
*/
public $classDescriptionExtractRegexp;

/**
* Text to strip from file summaries and descriptions.
*
* @var string
*/
public $classStripText;

/**
* Default tags for new, empty class-level DocBlocks.
*
Expand Down Expand Up @@ -213,13 +227,16 @@ class FileLevelDocBlock extends Base
*/
public function __construct(array $params = array())
{
$stripRegexp = new Regexp('/^PHP version .*$/im');
$linkRegexp = new Regexp('|^https?://pear\.horde\.org|');
$params = array_merge(
array(
'year' => date('Y'),
'fileStripText' => $stripRegexp,
'fileForbiddenTags' => array_merge(
$this->fileForbiddenTags, array('link' => $linkRegexp)
),
'classStripText' => $stripRegexp,
'classForbiddenTags' => array_merge(
$this->classForbiddenTags, array('link' => $linkRegexp)
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ protected function _checkDocBlock($which)

// Cleaning the summary and description.
$text = $docblock->getText();
if ($this->_config->{$which . 'StripText'}) {
$text = trim(preg_replace(
$this->_config->{$which . 'StripText'}, '', $text
));
}
$text = $this->_stripIncorrectText($text, $other);
if ($text != $docblock->getText()) {
$this->addWarning(sprintf(
Expand Down
4 changes: 4 additions & 0 deletions framework/Refactor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
<file name="NoFileLevelDocBlock.php" role="test" />
<file name="OtherCopyright.php" role="test" />
<file name="RemoveForbiddenTags.php" role="test" />
<file name="RemoveStripText.php" role="test" />
</dir> <!-- /test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored -->
<file name="ClassLevelDocBlock.php" role="test" />
<file name="ClassLevelDocBlockWithFileLevelDocs.php" role="test" />
Expand All @@ -194,6 +195,7 @@
<file name="NoFileLevelDocBlock.php" role="test" />
<file name="OtherCopyright.php" role="test" />
<file name="RemoveForbiddenTags.php" role="test" />
<file name="RemoveStripText.php" role="test" />
</dir> <!-- /test/Horde/Refactor/fixtures/FileLevelDocBlock -->
<dir name="Php4Constructor">
<dir name="refactored">
Expand Down Expand Up @@ -356,6 +358,7 @@
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/NoFileLevelDocBlock.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/NoFileLevelDocBlock.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/OtherCopyright.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/OtherCopyright.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/RemoveForbiddenTags.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/RemoveForbiddenTags.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/RemoveStripText.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/RemoveStripText.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/ClassLevelDocBlock.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/ClassLevelDocBlock.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/ClassLevelDocBlockWithFileLevelDocs.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/ClassLevelDocBlockWithFileLevelDocs.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/ClassLevelDocsInFileLevel.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/ClassLevelDocsInFileLevel.php" />
Expand All @@ -365,6 +368,7 @@
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/NoFileLevelDocBlock.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/NoFileLevelDocBlock.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/OtherCopyright.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/OtherCopyright.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/RemoveForbiddenTags.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/RemoveForbiddenTags.php" />
<install as="Horde/Refactor/fixtures/FileLevelDocBlock/refactored/RemoveStripText.php" name="test/Horde/Refactor/fixtures/FileLevelDocBlock/refactored/RemoveStripText.php" />
<install as="Horde/Refactor/fixtures/Php4Constructor/Php4ConstructorOnly.php" name="test/Horde/Refactor/fixtures/Php4Constructor/Php4ConstructorOnly.php" />
<install as="Horde/Refactor/fixtures/Php4Constructor/Php5Constructor.php" name="test/Horde/Refactor/fixtures/Php4Constructor/Php5Constructor.php" />
<install as="Horde/Refactor/fixtures/Php4Constructor/WrongConstructorOrder.php" name="test/Horde/Refactor/fixtures/Php4Constructor/WrongConstructorOrder.php" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public function getFileNames()
array('ClassLevelDocsInFileLevel.php', false),
array('FileLevelDocsInClassLevel.php', false),
array('RemoveForbiddenTags.php', false),
array('RemoveStripText.php', false),
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php
/**
* Copyright 2017 Horde LLC (http://www.horde.org/)
*
* PHP Version 5
*
* See the enclosed file COPYING for license information (LGPL). If you did
* not receive this file, see http://www.horde.org/licenses/lgpl21.
*
* @author Some Author <author@acme.org>
* @category Horde
* @license http://www.horde.org/licenses/lgpl21 LGPL-2.1
* @package Auth
*/

/**
* This class does stuff.
*
* @author Some Author <author@acme.org>
* @category Horde
* @copyright 2017 Horde LLC
* @license http://www.horde.org/licenses/lgpl21 LGPL-2.1
* @package Auth
*/
class Foo
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php
/**
* Copyright 2017 Horde LLC (http://www.horde.org/)
*
* See the enclosed file COPYING for license information (LGPL). If you did
* not receive this file, see http://www.horde.org/licenses/lgpl21.
*
* @author Some Author <author@acme.org>
* @category Horde
* @license http://www.horde.org/licenses/lgpl21 LGPL-2.1
* @package Auth
*/

/**
* This class does stuff.
*
* @author Some Author <author@acme.org>
* @category Horde
* @copyright 2017 Horde LLC
* @license http://www.horde.org/licenses/lgpl21 LGPL-2.1
* @package Auth
*/
class Foo
{
}

0 comments on commit 62ce78f

Please sign in to comment.