Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mvriel committed Oct 14, 2013
2 parents 4ac5d71 + 19fa1a2 commit c8ef5f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
2013/09/28: Version 2.1
2013/10/14: Version 2.1
-----------------------

```
Expand All @@ -13,6 +13,8 @@ ADDED: Show which traits are consumed by a class
ADDED: Link to the traits that are consumed by a class
ADDED: Show traits with their methods and properties
CHANGED: phpDocumentor now checks for transformation requirements at the start of the application (#148)
FIXED: Fatal error with some of the old-style validations
FIXED: Template:list command errors due to an incorrect path
FIXED: Checkstyle error report only showed errors of the file itself and not subelements (#1046)
FIXED: Validation to check for validity of return types
FIXED: Validation to check for validity of parameters
Expand Down
6 changes: 2 additions & 4 deletions src/phpDocumentor/Parser/ServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,17 +95,15 @@ function () {
$app['partials'] = $partialsCollection;

$app->command(new ParseCommand($app['descriptor.builder'], $app['parser'], $translator));

/** @var Dispatcher $dispatcher */
$dispatcher = $app['event_dispatcher'];
$dispatcher->addListener('reflection.docblock-extraction.post', array($this, 'validateDocBlocks'));
}

/**
* Checks all phpDocumentor whether they match the given rules.
*
* @param PostDocBlockExtractionEvent $data Event object containing the parameters.
*
* @todo convert this method to the new style validators; this method is not invoked anymore
*
* @return void
*/
public function validateDocBlocks($data)
Expand Down

0 comments on commit c8ef5f8

Please sign in to comment.