8000 Fixed composer resources between web/cli by linaori · Pull Request #23213 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Fixed composer resources between web/cli #23213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2017
Merged

Fixed composer resources between web/cli #23213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fixed composer resources between web/cli
  • Loading branch information
Iltar van der Berg committed Jun 16, 2017
commit 9e047122f1651b1bad1eec221bcdd768de28c24f
20 changes: 2 additions & 18 deletions src/Symfony/Component/Config/Resource/ComposerResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
Expand Down
0