Merge branch '5.4' into 6.2

javiereguiluz · javiereguiluz · commit 4a6ad8cd8501 · 2023-03-29T10:19:21.000+02:00
* 5.4:
  Update upload_file.rst
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -29,7 +29,7 @@ add a PDF brochure for each product. To do so, add a new property called
             return $this->brochureFilename;
         }
 
-        public function setBrochureFilename(string $brochureFilename)
+        public function setBrochureFilename(string $brochureFilename): self
         {
             $this->brochureFilename = $brochureFilename;
 
@@ -89,7 +89,7 @@ so Symfony doesn't try to get/set its value from the related entity::
             ;
         }
 
-        public function configureOptions(OptionsResolver $resolver)
+        public function configureOptions(OptionsResolver $resolver): void
         {
             $resolver->setDefaults([
                 'data_class' => Product::class,

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ add a PDF brochure for each product. To do so, add a new property called`
`29`	`29`	`return $this->brochureFilename;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function setBrochureFilename(string $brochureFilename)`
	`32`	`+ public function setBrochureFilename(string $brochureFilename): self`
`33`	`33`	`{`
`34`	`34`	`$this->brochureFilename = $brochureFilename;`
`35`	`35`
`@@ -89,7 +89,7 @@ so Symfony doesn't try to get/set its value from the related entity::`
`89`	`89`	`;`
`90`	`90`	`}`
`91`	`91`
`92`		`- public function configureOptions(OptionsResolver $resolver)`
	`92`	`+ public function configureOptions(OptionsResolver $resolver): void`
`93`	`93`	`{`
`94`	`94`	`$resolver->setDefaults([`
`95`	`95`	`'data_class' => Product::class,`