From 9e047122f1651b1bad1eec221bcdd768de28c24f Mon Sep 17 00:00:00 2001 From: Iltar van der Berg Date: Fri, 16 Jun 2017 14:40:34 +0200 Subject: [PATCH] Fixed composer resources between web/cli --- .../Config/Resource/ComposerResource.php | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Component/Config/Resource/ComposerResource.php b/src/Symfony/Component/Config/Resource/ComposerResource.php index 56224d16c01d..64288ea1db2d 100644 --- a/src/Symfony/Component/Config/Resource/ComposerResource.php +++ b/src/Symfony/Component/Config/Resource/ComposerResource.php @@ -18,16 +18,13 @@ */ class ComposerResource implements SelfCheckingResourceInterface, \Serializable { - private $versions; private $vendors; - private static $runtimeVersion; private static $runtimeVendors; public function __construct() { self::refresh(); - $this->versions = self::$runtimeVersion; $this->vendors = self::$runtimeVendors; } @@ -51,36 +48,23 @@ public function isFresh($timestamp) { self::refresh(); - if (self::$runtimeVersion !== $this->versions) { - return false; - } - return self::$runtimeVendors === $this->vendors; } public function serialize() { - return serialize(array($this->versions, $this->vendors)); + return serialize($this->vendors); } public function unserialize($serialized) { - list($this->versions, $this->vendors) = unserialize($serialized); + $this->vendors = unserialize($serialized); } private static function refresh() { - if (null !== self::$runtimeVersion) { - return; - } - - self::$runtimeVersion = array(); self::$runtimeVendors = array(); - foreach (get_loaded_extensions() as $ext) { - self::$runtimeVersion[$ext] = phpversion($ext); - } - foreach (get_declared_classes() as $class) { if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) { $r = new \ReflectionClass($class);