Merge branch '3.4' into 4.4

fabpot · fabpot · commit 768ae09522c2 · 2020-08-17T09:31:35.000+02:00
* 3.4:
  Fix CS
  [Validator] Add Polish translation for ISIN constraint
diff --git a/Store/CombinedStore.php b/Store/CombinedStore.php
@@ -29,8 +29,8 @@
  */
 class CombinedStore implements StoreInterface, LoggerAwareInterface
 {
-    use LoggerAwareTrait;
     use ExpiringStoreTrait;
+    use LoggerAwareTrait;
 
     /** @var PersistingStoreInterface[] */
     private $stores;

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`	`*/`
`30`	`30`	`class CombinedStore implements StoreInterface, LoggerAwareInterface`
`31`	`31`	`{`
`32`		`- use LoggerAwareTrait;`
`33`	`32`	`use ExpiringStoreTrait;`
	`33`	`+ use LoggerAwareTrait;`
`34`	`34`
`35`	`35`	`/** @var PersistingStoreInterface[] */`
`36`	`36`	`private $stores;`