minor #26161 [DI] Top micro benchmarks (nicolas-grekas)

chalasr · chalasr · commit 4d6c481e3a7d · 2018-02-13T10:46:30.000+01:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [DI] Top micro benchmarks | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This makes Symfony rank 1st most of the time, 2nd within the margin error otherwise. Follow up of kocsismate/php-di-container-benchmarks#21 Commits ------- 3edf5f1 [DI] Top micro benchmarks
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -217,21 +217,18 @@ public function has($id)
      */
     public function get($id, $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERENCE */ 1)
     {
-        if (isset($this->aliases[$id])) {
-            $id = $this->aliases[$id];
-        }
-
-        // Re-use shared service instance if it exists.
-        if (isset($this->services[$id])) {
-            return $this->services[$id];
-        }
-        if ('service_container' === $id) {
-            return $this;
-        }
-        if (isset($this->factories[$id])) {
-            return $this->factories[$id]();
-        }
+        return $this->services[$id]
+            ?? $this->services[$id = $this->aliases[$id] ?? $id]
+            ?? ('service_container' === $id ? $this : ($this->factories[$id] ?? array($this, 'make'))($id, $invalidBehavior));
+    }
 
+    /**
+     * Creates a service.
+     *
+     * As a separate method to allow "get()" to use the really fast `??` operator.
+     */
+    private function make(string $id, int $invalidBehavior)
+    {
         if (isset($this->loading[$id])) {
             throw new ServiceCircularReferenceException($id, array_keys($this->loading));
         }
