Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trunk #1

Merged
merged 7 commits into from
Jan 14, 2013
Merged

Trunk #1

merged 7 commits into from
Jan 14, 2013

Conversation

b1lb0
Copy link
Contributor

@b1lb0 b1lb0 commented Jan 9, 2013

Hi David,

I have merged all my locals changes in this fork. I have also executed phpdt over doctest pear dir and all works fine. Let me know if you need more information.

You could find comments for new features and fix over the commit message but feel free to contact me.

Cheers

Tobia

- Added tmplCode flag for complex framework template
- Added --template-code from command line for complex framework template
- Added doctest for new tmplCode flag
- Fixed docs/test1.php file
- Fixed return code of phpdt for fail or error in doctest execution and
parsing
- Fixed execution of doctest even if parsing error occur
- Added tmpl_code.doctest.php file
}
}

} catch( Exception $e ) {
$this->_testCase->parsingError = $e->getMessage();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This unfortunately will tend to lose backtrace information if it's some other exception you don't expect. Can you catch a more specific exception?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are right. I will make another pull for that.

@CloCkWeRX
Copy link
Member

Probably worth running PHPCS over the changes.

@izimobil
Copy link
Contributor

Looks good to me.
Nice new features. phpcs is silent and the few doctests in the package run fine.
Pulled.

izimobil added a commit that referenced this pull request Jan 14, 2013
@izimobil izimobil merged commit fb1ad08 into pear:trunk Jan 14, 2013
@izimobil
Copy link
Contributor

For the record, just fixed this hardcoded path:
3bf0804

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants