Merge branch '5.2' into 5.3

javiereguiluz · javiereguiluz · commit 3fc39140b6ed · 2021-07-12T09:25:17.000+02:00
* 5.2:
  Typo in class name
  Fix example in Regex.rst
diff --git a/reference/constraints/Regex.rst b/reference/constraints/Regex.rst
@@ -244,7 +244,7 @@ need to specify the HTML5 compatible pattern in the ``htmlPattern`` option:
         {
             #[Assert\Regex(
                 pattern: '/^[a-z]+$/i',
-                match: '^[a-zA-Z]+$'
+                htmlPattern: '^[a-zA-Z]+$'
             )]
             protected $name;
         }
diff --git a/service_container/factories.rst b/service_container/factories.rst
@@ -204,7 +204,7 @@ method name:
 
             App\Email\NewsletterManager:
                 class:   App\Email\NewsletterManager
-                factory: '@App\Email\NewsletterManagerFactory'
+                factory: '@App\Email\InvokableNewsletterManagerFactory'
 
     .. code-block:: xml
 
@@ -220,7 +220,7 @@ method name:
 
                 <service id="App\Email\NewsletterManager"
                          class="App\Email\NewsletterManager">
-                    <factory service="App\Email\NewsletterManagerFactory"/>
+                    <factory service="App\Email\InvokableNewsletterManagerFactory"/>
                 </service>
             </services>
         </container>
@@ -237,7 +237,7 @@ method name:
             $services = $configurator->services();
 
             $services->set(NewsletterManager::class)
-                ->factory(service(NewsletterManagerFactory::class));
+                ->factory(service(InvokableNewsletterManagerFactory::class));
         };
 
 .. _factories-passing-arguments-factory-method:

Original file line number	Diff line number	Diff line change
@@ -244,7 +244,7 @@ need to specify the HTML5 compatible pattern in the ``htmlPattern`` option:
`244`	`244`	`{`
`245`	`245`	`#[Assert\Regex(`
`246`	`246`	`pattern: '/^[a-z]+$/i',`
`247`		`- match: '^[a-zA-Z]+$'`
	`247`	`+ htmlPattern: '^[a-zA-Z]+$'`
`248`	`248`	`)]`
`249`	`249`	`protected $name;`
`250`	`250`	`}`