search

starekrow / lockbox

Encrypted storage with built-in key management facilities
MIT License
95 stars 6 forks source link

Fixed PhpDoc #8

Closed alexmanno closed 6 years ago

alexmanno commented 6 years ago

According to issue https://github.com/starekrow/lockbox/issues/7, I've fixed PhpDoc for better compatibility with fig-standards

starekrow commented 6 years ago

Looks good in principle, but the whitespace changes leaked all over the code. Can you resubmit with just the comments changed?

KJLJon commented 6 years ago

here is what this looks like after psr-2 is adopoted (#14) https://github.com/KJLJon/lockbox/commit/601fe28bc547ce3cf0ef1509031d4f8f3e42ebec

alexmanno commented 6 years ago

@KJLJon LGTM! I think we can merge PSR-2 rules + Fixed PhpDoc together @starekrow do you approve?

starekrow commented 6 years ago

Yep, I'd be happy to take a PR for both. Right now I'm getting a slightly cleaner merge by starting with #8 than #14 but there's a lot of bits to fixup by hand; I'll hold off for now. Definitely want to do a change like this (touching every source line) sooner than later.

KJLJon commented 6 years ago

KJLJon/lockbox@601fe28 merges #8 and #14 together from the 2 separate timelines / branches. I will submit a PR for that and if approved it should automatically close both #14 and #8 since it is pulled from both of their histories.