Improve runtime container changes

Author: Riimu

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.3.1] - 2018-10-17
+### Fixed
+- The container can now be modified on runtime without losing benefits of static array opcache optimization
+
 ## [0.3.0] - 2018-10-17
 ### Added
 - The `Container::getCacheFile()` now accepts an optional callable parameter for encoding values.
@@ -32,7 +36,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Initial development release
 
-[Unreleased]: https://github.com/simply-framework/container/compare/v0.3.0...HEAD
+[Unreleased]: https://github.com/simply-framework/container/compare/v0.3.1...HEAD
+[0.3.1]: https://github.com/simply-framework/container/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/simply-framework/container/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/simply-framework/container/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/simply-framework/container/compare/v0.1.0...v0.2.0

src/Container.php

@@ -22,7 +22,7 @@ class Container implements ContainerInterface, \ArrayAccess
     /** @var array[] Information about cached container entries */
     protected $entries = [];
 
-    /** @var EntryInterface[] Cached entries used to resolve values */
+    /** @var EntryInterface[] Cached entry instances used to resolve values */
     private $entryCache;
 
     /** @var array Cached values for container entries */
@@ -81,18 +81,14 @@ public function getCacheFile(callable $encoder = null): string
      */
     private function loadCacheParameters(): void
     {
-        foreach ($this->entries as $id => $data) {
-            if (!isset($this->entryCache[$id])) {
-                continue;
-            }
-
-            $parameters = $this->entryCache[$id]->getCacheParameters();
+        foreach ($this->entryCache as $id => $entry) {
+            $parameters = $entry->getCacheParameters();
 
             if (!$this->isConstantValue($parameters)) {
                 throw new ContainerException("Unable to cache entry '$id', the cache parameters are not static");
             }
 
-            $this->entries[$id] = [\get_class($this->entryCache[$id]), $parameters];
+            $this->entries[$id] = [\get_class($entry), $parameters];
         }
     }
 
@@ -124,11 +120,10 @@ private function isConstantValue($value): bool
      */
     public function addEntry(string $id, EntryInterface $type): void
     {
-        if (isset($this->entries[$id])) {
+        if (isset($this[$id])) {
             throw new ContainerException("Entry for identifier '$id' already exists");
         }
 
-        $this->entries[$id] = [];
         $this->entryCache[$id] = $type;
     }
 
@@ -186,7 +181,7 @@ private function getEntry(string $id): EntryInterface
      */
     public function has($id): bool
     {
-        return isset($this->entries[$id]);
+        return isset($this->entries[$id]) || isset($this->entryCache[$id]);
     }
 
     /**