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

#14801 - Phalcon\Helper\Arr::blackList() #14808

Closed
wants to merge 4 commits into from
Closed

#14801 - Phalcon\Helper\Arr::blackList() #14808

wants to merge 4 commits into from

Conversation

TimurFlush
Copy link

Hello!

In raising this pull request, I confirm the following:

  • I have read and understood the Contributing Guidelines
  • I have checked that another pull request for this purpose does not exist
  • I wrote some tests for this PR
  • I have updated the relevant CHANGELOG
  • I have created a PR for the documentation about this change

Thanks

@TimurFlush TimurFlush requested a review from ruudboon February 4, 2020 09:53
@ruudboon
Copy link
Member

ruudboon commented Feb 4, 2020

See #14802 as well

@ruudboon
Copy link
Member

ruudboon commented Feb 4, 2020

Can you sent it to the 4.1.x branch?

@TimurFlush
Copy link
Author

Can you sent it to the 4.1.x branch?

Oh my god, i'm sorry
One moment please

See #14802 as well

There's a lot of conflict.

CHANGELOG-4.0.md Outdated
@@ -1,5 +1,6 @@
# [4.0.3](https://github.com/phalcon/cphalcon/releases/tag/v4.0.3) (2020-01-25)
## Added
- Added `Phalcon\Helper\Arr::blackList()` to exclude elements of an array by the keys obtained from the elements of a blacklist [#14801](https://github.com/phalcon/cphalcon/issues/14801) [@TimurFlush](https://github.com/TimurFlush)
Copy link
Member

Choose a reason for hiding this comment

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

Please add this to the CHANGELOG-4.1.md

@codecov
Copy link

codecov bot commented Feb 4, 2020

Codecov Report

Merging #14808 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #14808      +/-   ##
==========================================
+ Coverage   67.99%      68%   +<.01%     
==========================================
  Files         483      483              
  Lines      111463   111479      +16     
==========================================
+ Hits        75789    75808      +19     
+ Misses      35674    35671       -3

@TimurFlush TimurFlush closed this Feb 4, 2020
@TimurFlush TimurFlush deleted the blacklist-4.1.x branch February 4, 2020 10:35
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