-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Use constructor property promotion in module Sample Data #37224
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
Open
leonhelmus
wants to merge
1
commit into
magento:2.4-develop
Choose a base branch
from
leonhelmus:feature/php8.1-constructor-property-promotion-sample-data
base: 2.4-develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -11,8 +11,11 @@ | |||
use Magento\Framework\Composer\ComposerInformation; | ||||
use Magento\Framework\Config\Composer\Package; | ||||
use Magento\Framework\Config\Composer\PackageFactory; | ||||
use Magento\Framework\Exception\FileSystemException; | ||||
use Magento\Framework\Filesystem; | ||||
use Magento\Framework\Filesystem\Directory\ReadFactory; | ||||
use Magento\Framework\Filesystem\Directory\ReadInterface; | ||||
use stdClass; | ||||
|
||||
/** | ||||
* Sample Data dependency | ||||
|
@@ -24,46 +27,23 @@ class Dependency | |||
*/ | ||||
public const SAMPLE_DATA_SUGGEST = 'Sample Data version:'; | ||||
|
||||
/** | ||||
* @var ComposerInformation | ||||
*/ | ||||
protected $composerInformation; | ||||
|
||||
/** | ||||
* @var PackageFactory | ||||
*/ | ||||
private $packageFactory; | ||||
|
||||
/** | ||||
* @var ComponentRegistrarInterface | ||||
*/ | ||||
private $componentRegistrar; | ||||
|
||||
/** | ||||
* @var ReadFactory | ||||
*/ | ||||
private $directoryReadFactory; | ||||
|
||||
/** | ||||
* Initialize dependencies. | ||||
* | ||||
* @param ComposerInformation $composerInformation | ||||
* @param Filesystem $filesystem @deprecated 2.3.0 $directoryReadFactory is used instead | ||||
* @param PackageFactory $packageFactory | ||||
* @param ComponentRegistrarInterface $componentRegistrar | ||||
* @param Filesystem\Directory\ReadFactory|null $directoryReadFactory | ||||
* @param ReadFactory|null $directoryReadFactory | ||||
* @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||||
*/ | ||||
public function __construct( | ||||
ComposerInformation $composerInformation, | ||||
protected readonly ComposerInformation $composerInformation, | ||||
Filesystem $filesystem, | ||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should this be removed? It does not appear to be used.
Suggested change
|
||||
PackageFactory $packageFactory, | ||||
ComponentRegistrarInterface $componentRegistrar, | ||||
\Magento\Framework\Filesystem\Directory\ReadFactory $directoryReadFactory = null | ||||
private readonly PackageFactory $packageFactory, | ||||
private readonly ComponentRegistrarInterface $componentRegistrar, | ||||
private ?ReadFactory $directoryReadFactory = null | ||||
) { | ||||
$this->composerInformation = $composerInformation; | ||||
$this->packageFactory = $packageFactory; | ||||
$this->componentRegistrar = $componentRegistrar; | ||||
$this->directoryReadFactory = $directoryReadFactory ?: | ||||
ObjectManager::getInstance()->get(ReadFactory::class); | ||||
} | ||||
|
@@ -72,7 +52,7 @@ public function __construct( | |||
* Retrieve list of sample data packages from suggests | ||||
* | ||||
* @return array | ||||
* @throws \Magento\Framework\Exception\FileSystemException | ||||
* @throws FileSystemException | ||||
*/ | ||||
public function getSampleDataPackages() | ||||
{ | ||||
|
@@ -91,7 +71,7 @@ public function getSampleDataPackages() | |||
* Retrieve suggested sample data packages from modules composer.json | ||||
* | ||||
* @return array | ||||
* @throws \Magento\Framework\Exception\FileSystemException | ||||
* @throws FileSystemException | ||||
*/ | ||||
protected function getSuggestsFromModules() | ||||
{ | ||||
|
@@ -111,7 +91,7 @@ protected function getSuggestsFromModules() | |||
* | ||||
* @param string $moduleDir | ||||
* @return Package | ||||
* @throws \Magento\Framework\Exception\FileSystemException | ||||
* @throws FileSystemException | ||||
*/ | ||||
private function getModuleComposerPackage($moduleDir) | ||||
{ | ||||
|
@@ -122,13 +102,13 @@ private function getModuleComposerPackage($moduleDir) | |||
* see: https://github.com/php-pds/skeleton | ||||
*/ | ||||
foreach ([$moduleDir, $moduleDir . DIRECTORY_SEPARATOR . '..'] as $dir) { | ||||
/** @var Filesystem\Directory\ReadInterface $directory */ | ||||
/** @var ReadInterface $directory */ | ||||
$directory = $this->directoryReadFactory->create($dir); | ||||
if ($directory->isExist('composer.json') && $directory->isReadable('composer.json')) { | ||||
/** @var Package $package */ | ||||
return $this->packageFactory->create(['json' => json_decode($directory->readFile('composer.json'))]); | ||||
} | ||||
} | ||||
return $this->packageFactory->create(['json' => new \stdClass]); | ||||
return $this->packageFactory->create(['json' => new stdClass]); | ||||
} | ||||
} |
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.