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

Flatten directory tree on 3.0 #11140

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Flatten directory tree on 3.0 #11140

merged 1 commit into from
Jan 2, 2024

Conversation

greg0ire
Copy link
Member

@greg0ire greg0ire commented Dec 28, 2023

It will make fuzzy matchers more efficient, and configuration files more readable.

  • lib/Doctrine/ORM becomes just src
  • tests/Doctrine/ becomes just tests

@greg0ire greg0ire changed the title Switch source directory to PSR-4 Switch to PSR-4 Dec 28, 2023
@derrabus
Copy link
Member

The PR title is misleading. We've been using PSR-4 for quite a while already. 😉

@greg0ire greg0ire changed the title Switch to PSR-4 Flatten directory tree Dec 28, 2023
@greg0ire
Copy link
Member Author

Note: I think this will make merge ups more difficult in the cases of files that have too different versions in 2.x vs 3.x

@derrabus
Copy link
Member

Note: I think this will make merge ups more difficult in the cases of files that have too different versions in 2.x vs 3.x

Shall we apply this change to 2.18.x instead then?

@greg0ire
Copy link
Member Author

greg0ire commented Dec 28, 2023

I think you're right. Let me first do a bunch of merges up to start on a clean state, and then I will:

  • do this on 2.18.x
  • rebase this PR
  • do a merge up with the -s ours flag

@greg0ire greg0ire changed the title Flatten directory tree Flatten directory tree on 3.0 Jan 2, 2024
@greg0ire greg0ire marked this pull request as ready for review January 2, 2024 19:12
It will make fuzzy matchers more efficient, and configuration files more
readable.
@greg0ire greg0ire merged commit 588d29d into doctrine:3.0.x Jan 2, 2024
65 checks passed
@greg0ire greg0ire deleted the psr-4 branch January 2, 2024 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants