Merge pull request #1798 from deguif/null-coalescing-operator

Use null coalescing operator
FriendsOfSymfony · May 24, 2021 · f2c7626 · f2c7626
2 parents a6ffdc1 + f85e8cd
commit f2c7626
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/src/DependencyInjection/FOSElasticaExtension.php b/src/DependencyInjection/FOSElasticaExtension.php
@@ -316,7 +316,7 @@ private function loadIndexConfig(array $index, array &$indexConfig): void
  'dynamic_date_formats',
  'numeric_detection',
  ] as $field) {
- $indexConfig['config'][$field] = \array_key_exists($field, $index) ? $index[$field] : null;
+ $indexConfig['config'][$field] = $index[$field] ?? null;
  }
  }
 

diff --git a/src/Elastica/Client.php b/src/Elastica/Client.php
@@ -85,20 +85,14 @@ public function request(string $path, string $method = Request::GET, $data = [],
 
  public function getIndex(string $name): BaseIndex
  {
- if (isset($this->indexCache[$name])) {
- return $this->indexCache[$name];
- }
-
- return $this->indexCache[$name] = new Index($this, $name);
+ // TODO PHP >= 7.4 ??=
+ return $this->indexCache[$name] ?? ($this->indexCache[$name] = new Index($this, $name));
  }
 
  public function getIndexTemplate($name): IndexTemplate
  {
- if (isset($this->indexTemplateCache[$name])) {
- return $this->indexTemplateCache[$name];
- }
-
- return $this->indexTemplateCache[$name] = new IndexTemplate($this, $name);
+ // TODO PHP >= 7.4 ??=
+ return $this->indexTemplateCache[$name] ?? ($this->indexTemplateCache[$name] = new IndexTemplate($this, $name));
  }
 
  /**

diff --git a/src/Manager/RepositoryManager.php b/src/Manager/RepositoryManager.php
@@ -69,11 +69,7 @@ public function hasRepository(string $indexName): bool
 
  protected function getRepositoryName(string $indexName): string
  {
- if (isset($this->indexes[$indexName]['repositoryName'])) {
- return $this->indexes[$indexName]['repositoryName'];
- }
-
- return Repository::class;
+ return $this->indexes[$indexName]['repositoryName'] ?? Repository::class;
  }
 
  /**