Merge branch '5.2' into 5.x

chalasr · chalasr · commit 16bfd73bb438 · 2021-02-15T19:57:44.000+01:00
* 5.2:
  [Workflow] Re-add InvalidTokenConfigurationException for BC
  Fix PHP 8.1 null values
  [Console] Fix PHP 8.1 null error for preg_match flag
  Fix: Article
  Definition::removeMethodCall should remove all matching calls
  [HttpFoundation] Fix typo in exception message
  mark the LazyIterator class as internal
  fix extracting mixed type-hinted property types
  [Worflow] Fixed GuardListener when using the new Security system
  keep valid submitted choices when additional choices are submitted
diff --git a/Store/PdoStore.php b/Store/PdoStore.php
@@ -386,7 +386,7 @@ private function getDriver(): string
     }
 
     /**
-     * Provides a SQL function to get the current timestamp regarding the current connection's driver.
+     * Provides an SQL function to get the current timestamp regarding the current connection's driver.
      */
     private function getCurrentTimestampStatement(): string
     {

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ private function getDriver(): string`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`/**`
`389`		`- * Provides a SQL function to get the current timestamp regarding the current connection's driver.`
	`389`	`+ * Provides an SQL function to get the current timestamp regarding the current connection's driver.`
`390`	`390`	`*/`
`391`	`391`	`private function getCurrentTimestampStatement(): string`
`392`	`392`	`{`