Merge branch '6.1' into 6.2

OskarStark · OskarStark · commit 63c7050c0d11 · 2023-01-09T19:46:45.000+01:00
* 6.1:
  [Uid] Use constructor property promotion for UuidFactory and UlidFactory examples
diff --git a/components/uid.rst b/components/uid.rst
@@ -161,11 +161,8 @@ on the configuration you defined::
 
     class FooService
     {
-        private UuidFactory $uuidFactory;
-
-        public function __construct(UuidFactory $uuidFactory)
+        public function __construct(private UuidFactory $uuidFactory)
         {
-            $this->uuidFactory = $uuidFactory;
         }
 
         public function generate(): void
@@ -365,11 +362,8 @@ Like UUIDs, ULIDs have their own factory, ``UlidFactory``, that can be used to g
 
     class FooService
     {
-        private UlidFactory $ulidFactory;
-
-        public function __construct(UlidFactory $ulidFactory)
+        public function __construct(private UlidFactory $ulidFactory)
         {
-            $this->ulidFactory = $ulidFactory;
         }
 
         public function generate(): void

Original file line number	Diff line number	Diff line change
`@@ -161,11 +161,8 @@ on the configuration you defined::`
`161`	`161`
`162`	`162`	`class FooService`
`163`	`163`	`{`
`164`		`- private UuidFactory $uuidFactory;`
`165`		`-`
`166`		`- public function __construct(UuidFactory $uuidFactory)`
	`164`	`+ public function __construct(private UuidFactory $uuidFactory)`
`167`	`165`	`{`
`168`		`- $this->uuidFactory = $uuidFactory;`
`169`	`166`	`}`
`170`	`167`
`171`	`168`	`public function generate(): void`
@@ -365,11 +362,8 @@ Like UUIDs, ULIDs have their own factory, ``UlidFactory``, that can be used to g
`365`	`362`
`366`	`363`	`class FooService`
`367`	`364`	`{`
`368`		`- private UlidFactory $ulidFactory;`
`369`		`-`
`370`		`- public function __construct(UlidFactory $ulidFactory)`
	`365`	`+ public function __construct(private UlidFactory $ulidFactory)`
`371`	`366`	`{`
`372`		`- $this->ulidFactory = $ulidFactory;`
`373`	`367`	`}`
`374`	`368`
`375`	`369`	`public function generate(): void`