Merge branch '5.2' into 5.x

derrabus · derrabus · commit 40c81226bf86 · 2021-04-07T18:09:00.000+02:00
* 5.2:
  [CS] Replace easy occurences of ?: with ??
diff --git a/Extension/DumpExtension.php b/Extension/DumpExtension.php
@@ -74,7 +74,7 @@ public function dump(Environment $env, array $context): ?string
         }
 
         $dump = fopen('php://memory', 'r+');
-        $this->dumper = $this->dumper ?: new HtmlDumper();
+        $this->dumper = $this->dumper ?? new HtmlDumper();
         $this->dumper->setCharset($env->getCharset());
 
         foreach ($vars as $value) {

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function dump(Environment $env, array $context): ?string`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`$dump = fopen('php://memory', 'r+');`
`77`		`- $this->dumper = $this->dumper ?: new HtmlDumper();`
	`77`	`+ $this->dumper = $this->dumper ?? new HtmlDumper();`
`78`	`78`	`$this->dumper->setCharset($env->getCharset());`
`79`	`79`
`80`	`80`	`foreach ($vars as $value) {`