Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Restrict param type of OptionsArray::merge#470

Merged
williamdes merged 2 commits intophpmyadmin:masterphpmyadmin/sql-parser:masterfrom
kamil-tekiela:OptionsArray-mergekamil-tekiela/sql-parser:OptionsArray-mergeCopy head branch name to clipboard
Jun 29, 2023
Merged

Restrict param type of OptionsArray::merge#470
williamdes merged 2 commits intophpmyadmin:masterphpmyadmin/sql-parser:masterfrom
kamil-tekiela:OptionsArray-mergekamil-tekiela/sql-parser:OptionsArray-mergeCopy head branch name to clipboard

Conversation

@kamil-tekiela
Copy link
Contributor

We have no need to allow this method to take an array. Even upstream PMA doesn't use this method.

@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.01 ⚠️

Comparison is base (539462d) 96.61% compared to head (5293688) 96.61%.

Additional details and impacted files
@@             Coverage Diff              @@
##             master     #470      +/-   ##
============================================
- Coverage     96.61%   96.61%   -0.01%     
+ Complexity     2181     2178       -3     
============================================
  Files            66       66              
  Lines          5059     5056       -3     
============================================
- Hits           4888     4885       -3     
  Misses          171      171              
Impacted Files Coverage Δ
src/Core.php 87.50% <ø> (ø)
src/Utils/Error.php 100.00% <ø> (ø)
src/Components/OptionsArray.php 100.00% <100.00%> (ø)
src/Statement.php 100.00% <100.00%> (ø)
src/Statements/DeleteStatement.php 100.00% <100.00%> (ø)
src/Statements/ExplainStatement.php 100.00% <100.00%> (ø)
src/Statements/InsertStatement.php 100.00% <100.00%> (ø)
src/Statements/LoadStatement.php 100.00% <100.00%> (ø)
src/Statements/ReplaceStatement.php 100.00% <100.00%> (ø)
src/Statements/SelectStatement.php 100.00% <100.00%> (ø)
... and 2 more

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
@williamdes williamdes added this to the 6.0.0 milestone Jun 8, 2023
@williamdes williamdes self-assigned this Jun 29, 2023
@williamdes williamdes merged commit 6aac9c1 into phpmyadmin:master Jun 29, 2023
@kamil-tekiela kamil-tekiela deleted the OptionsArray-merge branch August 30, 2023 16:18
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

Morty Proxy This is a proxified and sanitized view of the page, visit original site.