Merged
Conversation
Signed-off-by: Patrick Jahns <github@patrickjahns.de>
Modernise 1.x branch
This has already been done on master, let us do it again, but with a BC layer.
We are not sure yet how this classes will be dealt with.
…-layer Namespace move BC compatibility layer
* 1.3.x: Add exceptions to abstract and exception rules Move everything to a new Persistence subnamespace Move phpstan configuration to config file Fix errors in new phpstan version Update to phpstan 0.11 Remove obsolete test bootstrap file Updated doctrine/coding-standard to 6.0
greg0ire
approved these changes
Dec 10, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merges changes from #73 and #71 into master. The merge was done using the
oursmerge strategy:git merge --no-ff -s ours 1.3.xChanges from #73 were back ported from master in the first place. Changes from #71 aren't necessary as the old files have been dropped.
Future merges to 1.3.x will be merged to master the "traditional" way.