Merge branch '5.2' into 5.x

derrabus · derrabus · commit 77271a44ebc2 · 2021-04-07T18:09:00.000+02:00
* 5.2:
  [CS] Replace easy occurences of ?: with ??
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -46,7 +46,7 @@ public function __construct(CacheClearerInterface $cacheClearer, Filesystem $fil
         parent::__construct();
 
         $this->cacheClearer = $cacheClearer;
-        $this->filesystem = $filesystem ?: new Filesystem();
+        $this->filesystem = $filesystem ?? new Filesystem();
     }
 
     /**
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, $resource, array $opt
     {
         $this->container = $container;
         $this->resource = $resource;
-        $this->context = $context ?: new RequestContext();
+        $this->context = $context ?? new RequestContext();
         $this->logger = $logger;
         $this->setOptions($options);
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function __construct(CacheClearerInterface $cacheClearer, Filesystem $fil`
`46`	`46`	`parent::__construct();`
`47`	`47`
`48`	`48`	`$this->cacheClearer = $cacheClearer;`
`49`		`- $this->filesystem = $filesystem ?: new Filesystem();`
	`49`	`+ $this->filesystem = $filesystem ?? new Filesystem();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, $resource, array $opt`
`44`	`44`	`{`
`45`	`45`	`$this->container = $container;`
`46`	`46`	`$this->resource = $resource;`
`47`		`- $this->context = $context ?: new RequestContext();`
	`47`	`+ $this->context = $context ?? new RequestContext();`
`48`	`48`	`$this->logger = $logger;`
`49`	`49`	`$this->setOptions($options);`
`50`	`50`