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

Extension removal #14317

Merged
merged 1 commit into from May 30, 2018
Merged

Extension removal #14317

merged 1 commit into from May 30, 2018

Conversation

@laps15
Copy link
Contributor

@laps15 laps15 commented May 22, 2018

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
  • Any new functionality is covered by tests
@codecov
Copy link

@codecov codecov bot commented May 22, 2018

Codecov Report

Merging #14317 into master will decrease coverage by 0.02%.
The diff coverage is 0%.

@@             Coverage Diff              @@
##             master   #14317      +/-   ##
============================================
- Coverage     50.45%   50.43%   -0.03%     
- Complexity    14410    14428      +18     
============================================
  Files           502      502              
  Lines         67019    67042      +23     
============================================
- Hits          33814    33811       -3     
- Misses        33205    33231      +26

@laps15 laps15 force-pushed the extension_removal branch 3 times, most recently from 5ddd3e3 to f46a453 May 23, 2018
@codecov
Copy link

@codecov codecov bot commented May 23, 2018

Codecov Report

Merging #14317 into master will decrease coverage by 0.1%.
The diff coverage is 16.21%.

@@             Coverage Diff              @@
##             master   #14317      +/-   ##
============================================
- Coverage      51.1%      51%   -0.11%     
- Complexity    14413    14444      +31     
============================================
  Files           501      500       -1     
  Lines         66180    66242      +62     
============================================
- Hits          33823    33788      -35     
- Misses        32357    32454      +97

@laps15 laps15 force-pushed the extension_removal branch 2 times, most recently from 76ae1df to 34aa034 May 28, 2018
isset($fieldkey) ? $fieldkey : null,
isset($data) ? $data : null
isset($fieldkey) ? $fieldkey : (string)null,
isset($data) ? $data : (string)null
Copy link
Member

@mauriciofauth mauriciofauth May 28, 2018

Wouldn't it be better to use an empty string?

'databases' => isset($databases) ? $databases : null,
'dbi' => $this->dbi,
'dbi' => $GLOBALS['dbi'],
Copy link
Member

@mauriciofauth mauriciofauth May 28, 2018

It seems to me that you are reverting the dce862d changes. Is this intentional?

Copy link
Contributor Author

@laps15 laps15 May 28, 2018

No ideia why this hapenned. I'm trying to fix it.

Copy link
Contributor Author

@laps15 laps15 May 28, 2018

It probably was a rebase with the master branch that placed my changes over yours. Sorry.

@laps15 laps15 force-pushed the extension_removal branch 3 times, most recently from 27f3617 to 4222cfa May 30, 2018
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
@laps15 laps15 force-pushed the extension_removal branch from 4222cfa to 5d0fd81 May 30, 2018
@mauriciofauth mauriciofauth merged commit 0665674 into phpmyadmin:master May 30, 2018
2 of 3 checks passed
@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented May 30, 2018

Merged, thanks for your contribution!

@mauriciofauth mauriciofauth added this to the 5.0.0 milestone May 30, 2018
@mauriciofauth mauriciofauth self-assigned this May 30, 2018
@laps15 laps15 deleted the extension_removal branch May 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants