2c2
< index 60f57f2..5e5e912 100644
---
> index 35056de..4333562 100644
5c5
< @@ -6491,32 +6491,6 @@ function drupal_check_incompatibility($v, $current_version) {
---
> @@ -6528,32 +6528,6 @@ function drupal_check_incompatibility($v, $current_version) {
38c38
< @@ -6525,7 +6499,7 @@ function archiver_get_info() {
---
> @@ -6562,7 +6536,7 @@ function archiver_get_info() {
47,54c47,48
< @@ -6551,24 +6525,11 @@ function archiver_get_extensions() {
<   */
<  function archiver_get_archiver($file) {
<    // Archivers can only work on local paths
< -  $filepath = drupal_realpath($file);
< -  if (!is_file($filepath)) {
< +  $filename = drupal_realpath($file);
< +  if (!is_file($filename)) {
---
> @@ -6592,20 +6566,7 @@ function archiver_get_archiver($file) {
>    if (!is_file($filepath)) {
71c65
< +  return Drupal::service('plugin.manager.archiver')->getInstance(array('filename' => $filename));
---
> +  return Drupal::service('plugin.manager.archiver')->getInstance(array('filepath' => $filepath));
77c71
< index 0000000..92d25b9
---
> index 0000000..3885146
80c74
< @@ -0,0 +1,58 @@
---
> @@ -0,0 +1,60 @@
84c78
< + * Definition of \Drupal\Core\Archiver\ArchiverManager.
---
> + * Contains \Drupal\Core\Archiver\ArchiverManager.
89d82
< +
95a89,91
> +/**
> + * Archiver plugin manager.
> + */
102c98
< +   *   An array of paths keyed by it's corresponding namespaces.
---
> +   *   An array of paths keyed by its corresponding namespaces.
111c107
< +   * Overrides \Drupal\Component\Plugin\PluginManagerBase\createInstance().
---
> +   * Overrides \Drupal\Component\Plugin\PluginManagerBase::createInstance().
116c112
< +    return new $plugin_class($configuration['filename']);
---
> +    return new $plugin_class($configuration['filepath']);
120c116
< +   * Implements \Drupal\Core\PluginManagerInterface\getInstance.
---
> +   * Implements \Drupal\Core\PluginManagerInterface::getInstance().
123c119
< +    $filename = $options['filename'];
---
> +    $filepath = $options['filepath'];
131c127
< +        if (strrpos($filename, '.' . $extension) === strlen($filename) - strlen('.' . $extension)) {
---
> +        if (strrpos($filepath, '.' . $extension) === strlen($filepath) - strlen('.' . $extension)) {
140c136
< index 09fe145..b68524d 100644
---
> index ee63bfa..7e97986 100644
155c151
< index 0000000..053e454
---
> index 0000000..b582804
163c159
< + * Definition of Drupal\system\Plugin\Core\Archiver\Tar.
---
> + * Contains \Drupal\system\Plugin\Core\Archiver\Tar.
186c182
< index 0000000..95fcd28
---
> index 0000000..277d369
194c190
< + * Definition of Drupal\system\Plugin\Core\Archiver\Zip.
---
> + * Contains \Drupal\system\Plugin\Core\Archiver\Zip.
218c214
< index 935bc07..eb1219b 100644
---
> index 68127e2..8b968bf 100644
221c217
< @@ -3134,33 +3134,6 @@ function hook_file_mimetype_mapping_alter(&$mapping) {
---
> @@ -3097,33 +3097,6 @@ function hook_file_mimetype_mapping_alter(&$mapping) {
256c252
< index 4fc06f7..0529cf1 100644
---
> index 5a90e3e..c6365e8 100644
259c255
< @@ -3882,23 +3882,6 @@ function system_date_format_delete($date_format_id) {
---
> @@ -3886,23 +3886,6 @@ function system_date_format_delete($date_format_id) {
284c280
< index 1f88fe9..5184ead 100644
---
> index edc7aa4..31ee72d 100644