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

Added: `Phalcon\Acl\Adapter\Memory::addRole` support multiple inherited to 4.0.x #13557

Merged
merged 3 commits into from Nov 1, 2018

Conversation

Projects
None yet
3 participants
@cq-z
Copy link
Contributor

cq-z commented Oct 31, 2018

Hello!

  • Type: bug fix | new feature | code quality | documentation
  • Link to issue:

In raising this pull request, I confirm the following (please check boxes):

  • 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.

Small description of change:

Thanks

@cq-z cq-z changed the title Added: `Phalcon\Acl\Adapter\Memory::addRole` support multiple inherited Added: `Phalcon\Acl\Adapter\Memory::addRole` support multiple inherited to 4.0.x Oct 31, 2018

@cq-z

This comment has been minimized.

Copy link
Contributor Author

cq-z commented Oct 31, 2018

@sergeyklay the php7.0error not is this change

1) testLoggerAdapterFileDefaultLoggingUsesDebug | default logging does not use debug
 Test  vendor/codeception/specify/src/Codeception/Specify/SpecifyTest.php:testLoggerAdapterFileDefaultLoggingUsesDebug | default logging does not use debug
No text '[Wed, 31 Oct 18 07:06:48 +0000][DEBUG] Hello' in currently opened file
Failed asserting that '[Wed, 31 Oct 18 07:06:47 +0000][DEBUG] Hello\n
' contains "[Wed, 31 Oct 18 07:06:48 +0000][DEBUG] Hello".
@Jurigag

This comment has been minimized.

Copy link
Member

Jurigag commented Oct 31, 2018

@cq-z this error can sometimes happen, let me restart this.

@niden

niden approved these changes Nov 1, 2018

@niden niden merged commit 2336fa5 into phalcon:4.0.x Nov 1, 2018

1 of 2 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@niden

This comment has been minimized.

Copy link
Member

niden commented Nov 1, 2018

Thank you!!

@cq-z cq-z deleted the cq-z:feature/acl_role_multiple_inheritance_4.x branch Nov 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment