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

Catch up with woothee v1.10.0 #48

Merged
merged 6 commits into from May 20, 2019
Merged

Catch up with woothee v1.10.0 #48

merged 6 commits into from May 20, 2019

Conversation

tell-k
Copy link
Member

@tell-k tell-k commented May 11, 2019

@okonomi

I've catched up with woothee v1.9.0 and v1.10.0.
Please feel free to merge it. Thx.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.006%) to 97.658% when pulling 1a6b3f9 on tell-k:master into cb72f71 on woothee:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.006%) to 97.658% when pulling 1a6b3f9 on tell-k:master into cb72f71 on woothee:master.

@coveralls
Copy link

coveralls commented May 11, 2019

Coverage Status

Coverage remained the same at 97.665% when pulling 2c1349f on tell-k:master into cb72f71 on woothee:master.


if ($epos > -1) {
if (preg_match('#Edge/([.0-9]+)#', $ua, $matches)) {
if ($epos1 > -1 || $epos2 > -1 ) {
Copy link
Member

Choose a reason for hiding this comment

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

If it checks that it starts with Edg, Edge check may not be necessary.

@@ -17,8 +17,9 @@ public static function challenge($ua, &$result)
$version = null;

if (strpos($ua, 'Android') !== false) {
$data = DataSet::get('Android');
if (preg_match('/Android[- ](\\d+\\.\\d+(?:\\.\\d+)?)/', $ua, $matches)) {
$data = DataSet::get('Android');
Copy link
Member

Choose a reason for hiding this comment

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

Please fix indent.

@tell-k
Copy link
Member Author

tell-k commented May 19, 2019

@okonomi Thank you for your review. I've fixed where you pointed it out. Please review this again. :)

@okonomi okonomi merged commit 7f3665c into woothee:master May 20, 2019
@okonomi
Copy link
Member

okonomi commented May 20, 2019

@tell-k Thank you for your contribution!

@zonuexe zonuexe mentioned this pull request May 23, 2019
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.

None yet

3 participants