Fixes #12079 #12824

Merged
merged 4 commits into from Dec 20, 2016

Projects

None yet

4 participants

@ragnerok
Contributor

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

Added mocking of response object methods to the test

Signed-off-by: Osaid osaid.nasir@gmail.com

@ragnerok ragnerok Added mocking of response object
6ba93a4
@phpmyadmin-bot

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

@ragnerok ragnerok Rectified mistake of calling method once
9934b0b
@phpmyadmin-bot

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

@ragnerok ragnerok implemented mock properly
f91fddb
@phpmyadmin-bot

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

@ragnerok
Contributor

@nijel do I need to install the response mock twice to remove this error ?

@nijel
Member
nijel commented Dec 19, 2016

You need to rewrite setup/lib/form_processing.lib.php:76 to use Response::header instead of the PHP function.

@nijel nijel self-assigned this Dec 19, 2016
@ragnerok ragnerok replaced header with response header Signed-off-by: Osaid osaid.nasir…
…@gmail.com
48a8d78
@phpmyadmin-bot

This commit is missing Signed-Off-By line to indicate that you agree with phpMyAdmin Developer's Certificate of Origin. Please check contributing documentation for more information.

@codecov-io

Current coverage is 54.27% (diff: 100%)

Merging #12824 into master will increase coverage by 0.03%

@@             master     #12824   diff @@
==========================================
  Files           466        466          
  Lines         69638      69636     -2   
  Methods        2122       2127     +5   
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          37773      37797    +24   
+ Misses        31865      31839    -26   
  Partials          0          0          

Powered by Codecov. Last update c16f1eb...48a8d78

@nijel nijel merged commit 73c6a7e into phpmyadmin:master Dec 20, 2016

4 checks passed

Scrutinizer 1 new issues
Details
codecov/patch 100% of diff hit (target 54.24%)
Details
codecov/project 54.27% (+0.03%) compared to c16f1eb
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@nijel
Member
nijel commented Dec 20, 2016

Merged, thanks for your contribution!

@nijel nijel added this to the 4.7.0 milestone Dec 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment