Rename all occurrences of rootDir to projectDir #1891
Merged
Conversation
This file contains 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
aschempp
commented
Jul 1, 2020
| @@ -24,13 +24,13 @@ class EnvironmentTest extends TestCase | |||
| /** | |||
| * @var string | |||
| */ | |||
| public $rootDir; | |||
| public $projectDir; | |||
There was a problem hiding this comment.
not sure it's a problem this is a public property?
There was a problem hiding this comment.
Since it is a unit test class, it should not be a problem. Not sure why the property is public at all?
There was a problem hiding this comment.
While we are on it, let's also fix the visibility (see #1892).
leofeyer
approved these changes
Jul 2, 2020
leofeyer
added a commit
that referenced
this pull request
Jul 2, 2020
…1892) Description ----------- See #1891 (review) Commits ------- 4fb8986 Make the $projectDir property of the EnvironmentTest class private
leofeyer
added a commit
to contao/core-bundle
that referenced
this pull request
Jul 2, 2020
… #1892) Description ----------- See contao/contao#1891 (review) Commits ------- 4fb89860 Make the $projectDir property of the EnvironmentTest class private
leofeyer
pushed a commit
to contao/manager-plugin
that referenced
this pull request
Jul 8, 2020
Description ----------- ~~This requires contao/contao#1891 before the build passes. I assume contao/contao#1891 will be merged into Contao 4.9.4, therefore the conflict rule in `composer.json`.~~ **Road to Symfony 5:** contao/contao#1889 Commits ------- fa5b6fd Add compatibility with Symfony 5 114ad3b Pass the kernel.root_dir if available 8cbb1d9 Fix tests and CS a572701 Remove the composer conflict 9709cfb Fix the coding style 6abab3a Fix the unit tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
Kernel::getRootDir()method andkernel.root_dirparameter are deprecated since Symfony 4.2 and have been removed in Symfony 5. The only place Contao still uses the actualrootDirwas in theContaoModuleBundleclass, which has been fixed here to allow either version. I have also renamed all uses of$rootDirto be consistent across the code base.Road to Symfony 5: #1889