Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3444020 by andypost, smustgrave: [8.4] Fix implicitly nullable type declarations in composer plugin

merge-requests/7841/head
catch 2024-04-29 23:08:32 +01:00
parent 8ecbefce56
commit 031b4907aa
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
composer/Plugin/Scaffold/Operations/AppendOp.php
View File

@ -59,16 +59,21 @@ class AppendOp extends AbstractOperation {
/**
* Constructs an AppendOp.
*
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $prepend_path
* The relative path to the prepend file.
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $append_path
* The relative path to the append file.
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $prepend_path
* (optional) The relative path to the prepend file.
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $append_path
* (optional) The relative path to the append file.
* @param bool $force_append
* TRUE if is okay to append to a file that was not scaffolded.
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $default_path
* The relative path to the default data.
* (optional) TRUE if is okay to append to a file that was not scaffolded.
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $default_path
* (optional) The relative path to the default data.
*/
public function __construct(ScaffoldFilePath $prepend_path = NULL, ScaffoldFilePath $append_path = NULL, $force_append = FALSE, ScaffoldFilePath $default_path = NULL) {
public function __construct(
?ScaffoldFilePath $prepend_path = NULL,
?ScaffoldFilePath $append_path = NULL,
$force_append = FALSE,
?ScaffoldFilePath $default_path = NULL,
) {
$this->forceAppend = $force_append;
$this->prepend = $prepend_path;
$this->append = $append_path;

6
composer/Plugin/Scaffold/Operations/OperationFactory.php
View File

@ -122,13 +122,13 @@ class OperationFactory {
/**
* Checks to see if the specified scaffold file exists and has content.
*
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $file
* Scaffold file to check.
* @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath|null $file
* (optional) Scaffold file to check.
*
* @return bool
* True if the file exists and has content.
*/
protected function hasContent(ScaffoldFilePath $file = NULL) {
protected function hasContent(?ScaffoldFilePath $file = NULL) {
if (!$file) {
return FALSE;
}