-
Notifications
You must be signed in to change notification settings - Fork 136
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
support storing attributes as \SAML2\XML\saml\Attribute objects #106
Conversation
Hi, thanks for the PR. I will need to review it into more detail. It would be very helpful/a good start if you could update your branch to current master so it's rid of conflicts and the travis build passes. |
Do you think you can rebase it on master? That would be helpful. |
Yes I will rebase to latest current when I get some time |
Something must have gone wrong with the merge from master, because I see two completely different versions of the constructor in |
I don't see multiple versions of a constructor in AttributeValue...the travis build is complaining about "Calling assert() with a string argument is deprecated". This was related to writing the original code based on a older version of the library. I'm working through the travis issues now. I'm not sure how half this stuff ever passed as I'm being forced to fix things that I didn't write LOL |
Oh I think I see what you meant...the constructor assert was different in my master vs simplesamlphp master. That should be fixed now. Seems like this codeclimate stuff is new...I don't remember seeing that before. Are those issues something I should be concerned with? I'm not sure how its complaining about some of the stuff it thinks is an issue as there are much longer and complex methods in simplesaml master compared to the stuff I changed. |
Yes, that was exactly what I meant, but I missed for a sec that those differences are part of the PR 😆 |
You may have to teach me how to do that lol. I'm fairly new to github, although I used distributed version control systems before (mainly Mercurial). I couldn't even figure out how to pull simplesamlphp/saml2 master changes back into my clone (dub357/saml2) using the github interface so I was forced to work out all the conflicts and fix things using the built-in editing capability. Because of this, it was kind of a trial and error process getting the travis build to pass because its difficult to tell where the offending whitespaces were (when sometimes a tab was all that was needed to be removed) and thats why there were so many commits to fix them. All the whitespace requirements are a bit over the top if you ask me LOL - whats wrong with a single space at the end of a line or no space between a close parentheses and an open bracket? |
You can do that by running I've disabled codeclimate. I'm very allergic to "failing" builds for weeks on end as that teaches everyone to ignore the ❌'s and that's very bad. |
Unit tests are crucial for PR's, as well as coding standards and syntax-checking... @dub357: If you're not familiar with the git command-line, I can help you out |
@tvdijen I think I need some help. I tried to do this rebase stuff, but I dont think it worked as planned. |
Hehe, somehow you've added an empty commit... |
So I dont want my inability to squash these dumb whitespace commits to hold up the review and/or pull of this. I'm kinda new to GitHub and I have a pull request submitted for simplesaml (simplesamlphp/simplesamlphp#691) that unfortunately now includes commits that depend on this code :( |
This is weird, I don't know what happened here, but.. The PR closed while attempting to squash those commits and I can't reopen it anymore.. |
So I can’t figure out how to reopen this PR and it doesn’t look like I can create another PR without maybe adding another commit to my fork . Looks like another recent PR changing the Assertion class has been pulled in the meantime so there probably more conflicts to deal with. |
I feel your pain @dub357, I had the same frustrations with this PR last night..
Within your fork, you should make separate feature branches for that.. Don't put everything in master. |
This is a fairly big change, but should be backwards compatible. In conjunction with a change to simplesamlphp (for which another pull request will be generated), it will allow for finer control of attributes (specifically NameFormats and FriendlyNames) since simplesamlphp doesn't currently support attribute friendly names or different name formats per attribute