5c5
< @@ -12,8 +12,8 @@
---
> @@ -13,8 +13,8 @@
14d13
<  use Drupal\Component\Utility\MapArray;
16c15,16
< @@ -2784,12 +2784,11 @@ function drupal_get_library($extension, $name = NULL) {
---
>  use Drupal\Core\Datetime\DrupalDateTime;
> @@ -2767,12 +2767,11 @@ function drupal_get_library($extension, $name = NULL) {
226c226
< @@ -8,9 +8,8 @@
---
> @@ -8,8 +8,8 @@
232d231
< -
237,241c236,243
<   * Class that parses Drupal module's, theme's and profile's .info.yml files.
< @@ -25,13 +24,6 @@ class InfoParser implements InfoParserInterface {
<    protected $parsedInfos = array();
<  
<    /**
---
>   * Parses extension .info.yml files.
> @@ -21,55 +21,35 @@ class InfoParser implements InfoParserInterface {
>     *
>     * @var array
>     */
> -  protected static $parsedInfos = array();
> -
> -  /**
247,248c249,251
< -
< -  /**
---
> +  protected $parsedInfos = array();
>  
>    /**
252c255,259
< @@ -41,16 +33,16 @@ public function parse($filename) {
---
> -    if (!isset(static::$parsedInfos[$filename])) {
> +    if (!isset($this->parsedInfos[$filename])) {
>        if (!file_exists($filename)) {
> -        static::$parsedInfos[$filename] = array();
> +        $this->parsedInfos[$filename] = array();
256c263
< -          $this->parsedInfos[$filename] = $this->getParser()->parse(file_get_contents($filename));
---
> -          static::$parsedInfos[$filename] = $this->getParser()->parse(file_get_contents($filename));
266c273,274
<          $missing_keys = array_diff($this->getRequiredKeys(), array_keys($this->parsedInfos[$filename]));
---
> -        $missing_keys = array_diff($this->getRequiredKeys(), array_keys(static::$parsedInfos[$filename]));
> +        $missing_keys = array_diff($this->getRequiredKeys(), array_keys($this->parsedInfos[$filename]));
272,277c280,290
<          if (isset($this->parsedInfos[$filename]['version']) && $this->parsedInfos[$filename]['version'] === 'VERSION') {
<            $this->parsedInfos[$filename]['version'] = \Drupal::VERSION;
< @@ -61,19 +53,6 @@ public function parse($filename) {
<    }
<  
<    /**
---
> -        if (isset(static::$parsedInfos[$filename]['version']) && static::$parsedInfos[$filename]['version'] === 'VERSION') {
> -          static::$parsedInfos[$filename]['version'] = \Drupal::VERSION;
> +        if (isset($this->parsedInfos[$filename]['version']) && $this->parsedInfos[$filename]['version'] === 'VERSION') {
> +          $this->parsedInfos[$filename]['version'] = \Drupal::VERSION;
>          }
>        }
>      }
> -    return static::$parsedInfos[$filename];
> -  }
> -
> -  /**
288,293c301,304
< -  }
< -
< -  /**
<     * Returns an array of keys required to exist in .info.yml file.
<     *
<     * @return array
---
> +    return $this->parsedInfos[$filename];
>    }
>  
>    /**
640c651
< @@ -3,4 +3,4 @@ type: module
---
> @@ -4,4 +4,4 @@ type: module