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

3.1.x model code fix #12674

Merged
merged 1 commit into from
Mar 8, 2017
Merged

Conversation

Jurigag
Copy link
Contributor

@Jurigag Jurigag commented Mar 3, 2017

Hello!

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: model validate wasn't setting code in model message got from validation message, now it does.

Also i changed test structure, now models with validation are moved to seperated namespace.

Thanks

@Jurigag Jurigag changed the title 3.1.x model code fix [WIP]3.1.x model code fix Mar 3, 2017
@Jurigag Jurigag force-pushed the 3.1.x-model-code-fix branch 2 times, most recently from 037b33b to 25a504e Compare March 3, 2017 11:30
@Jurigag Jurigag changed the title [WIP]3.1.x model code fix 3.1.x model code fix Mar 3, 2017
@Jurigag Jurigag force-pushed the 3.1.x-model-code-fix branch 10 times, most recently from ca7255b to 3b282c4 Compare March 3, 2017 16:03
@@ -1505,7 +1505,9 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
new Message(
message->getMessage(),
message->getField(),
message->getType()
message->getType(),
null,
Copy link
Contributor Author

@Jurigag Jurigag Mar 3, 2017

Choose a reason for hiding this comment

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

Im not really sure about this null, it should be this here anyway, but this will break tests(not sure about apps).

@sergeyklay
Copy link
Contributor

@Jurigag Could you please rebase

@Jurigag
Copy link
Contributor Author

Jurigag commented Mar 4, 2017

@sergeyklay rebased

@sergeyklay sergeyklay merged commit 6df415f into phalcon:3.1.x Mar 8, 2017
@sergeyklay
Copy link
Contributor

Thank you

@Jurigag Jurigag deleted the 3.1.x-model-code-fix branch March 9, 2017 23:05
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