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

Add more extensions on composer.json, improve phpdocs and remove dead code #145

Merged
merged 1 commit into from
Nov 2, 2018

Conversation

tgalopin
Copy link
Contributor

@tgalopin tgalopin commented Oct 22, 2018

This PR proposes a few things:

  • add ctype, iconv and mbstring extensions in composer.json for the same reason as the DOM extension ;
  • improve several phpdocs by adding more detailed information on types and arguments
  • remove a few unused variables
  • fix a few bugs

Don't hesitate to answer my comments when you think I'm wrong :) !

@@ -136,6 +136,7 @@ class DOMTreeBuilder implements EventHandler
protected $stack = array();

protected $current; // Pointer in the tag hierarchy.
protected $rules;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The property was dynamically set in the constructor.

@@ -126,7 +131,7 @@ public function currentLine()
*/
public function getCurrentLine()
{
return currentLine();
return $this->currentLine();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this was a bug.

@tgalopin tgalopin force-pushed the phpdoc-improvements branch 4 times, most recently from 579445c to 8bcaeec Compare October 22, 2018 22:03
composer.json Outdated
"ext-dom": "*",
"ext-iconv": "*",
Copy link
Member

Choose a reason for hiding this comment

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

iconv is used only as fallback when mbstring is not present, so technically both iconv and mbstring are optional (but at least one of them is required)

Any idea on how to express this in composer?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right, I don't think there is any way to ask Composer for that. Let's keep an exception :) .

@tgalopin
Copy link
Contributor Author

tgalopin commented Nov 2, 2018

Updated :)

@goetas goetas merged commit 7453ab0 into Masterminds:2.x Nov 2, 2018
@goetas
Copy link
Member

goetas commented Nov 2, 2018

Thanks!
Sorry if it took so long to merge it, but somehow I've lost this PR!

@tgalopin tgalopin deleted the phpdoc-improvements branch November 2, 2018 23:29
@tgalopin
Copy link
Contributor Author

tgalopin commented Nov 2, 2018

No problem, I didn't update it before anyway :) . Thanks for the merge!

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.

2 participants