Merge branch 'mehdihasanpour-Fix--Refactor' into 5.x

thephpleague · Mar 13, 2024 · 141d0d6 · 141d0d6
2 parents 983e12b + e9838da
commit 141d0d6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Container.php b/src/Container.php
@@ -63,7 +63,7 @@ public function __construct(
 
     public function add(string $id, $concrete = null): DefinitionInterface
     {
-        $concrete = $concrete ?? $id;
+        $concrete ??= $id;
 
         if (true === $this->defaultToShared) {
             return $this->addShared($id, $concrete);
@@ -74,7 +74,7 @@ public function add(string $id, $concrete = null): DefinitionInterface
 
     public function addShared(string $id, $concrete = null): DefinitionInterface
     {
-        $concrete = $concrete ?? $id;
+        $concrete ??= $id;
         return $this->definitions->addShared($id, $concrete);
     }
 

diff --git a/src/Definition/Definition.php b/src/Definition/Definition.php
@@ -61,7 +61,7 @@ class Definition implements ArgumentResolverInterface, DefinitionInterface
      */
     public function __construct(string $id, $concrete = null)
     {
-        $concrete = $concrete ?? $id;
+        $concrete ??= $id;
         $this->alias    = $id;
         $this->concrete = $concrete;
     }

diff --git a/src/ReflectionContainer.php b/src/ReflectionContainer.php
@@ -72,7 +72,7 @@ public function has($id): bool
 
     public function call(callable $callable, array $args = [])
     {
-        if (is_string($callable) && strpos($callable, '::') !== false) {
+        if (is_string($callable) && str_contains($callable, '::')) {
             $callable = explode('::', $callable);
         }