updated core from 8.4 to 8.5 : bug with login_destination

2018-03-13 14:01:21 +01:00
parent 0d78da249b
commit e668535a4e
3486 changed files with 89604 additions and 33283 deletions
@@ -6,8 +6,8 @@ package: Core
 # core: 8.x
 configure: config.sync

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -7,6 +7,8 @@ use Drupal\Core\Form\FormStateInterface;

 /**
 * Defines the configuration export form.
+ *
+ * @internal
 */
 class ConfigExportForm extends FormBase {

@@ -10,6 +10,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Defines the configuration import form.
+ *
+ * @internal
 */
 class ConfigImportForm extends FormBase {

@@ -15,6 +15,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Provides a form for exporting a single configuration file.
+ *
+ * @internal
 */
 class ConfigSingleExportForm extends FormBase {

@@ -26,6 +26,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;

 /**
 * Provides a form for importing a single configuration file.
+ *
+ * @internal
 */
 class ConfigSingleImportForm extends ConfirmFormBase {

@@ -21,6 +21,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Construct the storage changes in a configuration synchronization form.
+ *
+ * @internal
 */
 class ConfigSync extends FormBase {

@@ -9,8 +9,8 @@ regions:
  left: Left
  right: Right

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -8,8 +8,8 @@ package: Testing
 dependencies:
  - config_collection_install_test

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -6,8 +6,8 @@ package: Testing
 dependencies:
  - config_test

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -6,8 +6,8 @@ package: 'Testing'
 dependencies:
  - config_test

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -8,8 +8,8 @@ dependencies:
  - block
  - block_test

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -8,8 +8,8 @@ dependencies:
  - block
  - block_content

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -5,8 +5,8 @@ package: Testing
 # core: 8.x
 hidden: true

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -4,8 +4,8 @@ package: Testing
 # version: VERSION
 # core: 8.x

-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -8,6 +8,8 @@ use Drupal\Core\Language\LanguageInterface;

 /**
 * Form controller for the test config edit forms.
+ *
+ * @internal
 */
 class ConfigTestForm extends EntityForm {

@@ -5,8 +5,8 @@ package: Testing
 # core: 8.x
 dependencies:
  - config_test
-# Information added by Drupal.org packaging script on 2018-01-03
-version: '8.4.4'
+# Information added by Drupal.org packaging script on 2018-03-07
+version: '8.5.0'
 core: '8.x'
 project: 'drupal'
-datestamp: 1515021228
+datestamp: 1520457826
@@ -2,6 +2,7 @@

 namespace Drupal\Tests\config\Functional;

+use Drupal\Core\Routing\RedirectDestinationTrait;
 use Drupal\config_test\Entity\ConfigTest;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Tests\BrowserTestBase;
@@ -13,6 +14,8 @@ use Drupal\Tests\BrowserTestBase;
 */
 class ConfigEntityListTest extends BrowserTestBase {

+  use RedirectDestinationTrait;
+
  /**
   * Modules to enable.
   *
@@ -54,17 +57,17 @@ class ConfigEntityListTest extends BrowserTestBase {
      'edit' => [
        'title' => t('Edit'),
        'weight' => 10,
-        'url' => $entity->urlInfo(),
+        'url' => $entity->toUrl()->setOption('query', $this->getRedirectDestination()->getAsArray()),
      ],
      'disable' => [
        'title' => t('Disable'),
        'weight' => 40,
-        'url' => $entity->urlInfo('disable'),
+        'url' => $entity->toUrl('disable')->setOption('query', $this->getRedirectDestination()->getAsArray()),
      ],
      'delete' => [
        'title' => t('Delete'),
        'weight' => 100,
-        'url' => $entity->urlInfo('delete-form'),
+        'url' => $entity->toUrl('delete-form')->setOption('query', $this->getRedirectDestination()->getAsArray()),
      ],
    ];

@@ -129,12 +132,12 @@ class ConfigEntityListTest extends BrowserTestBase {
      'edit' => [
        'title' => t('Edit'),
        'weight' => 10,
-        'url' => $entity->urlInfo(),
+        'url' => $entity->toUrl()->setOption('query', $this->getRedirectDestination()->getAsArray()),
      ],
      'delete' => [
        'title' => t('Delete'),
        'weight' => 100,
-        'url' => $entity->urlInfo('delete-form'),
+        'url' => $entity->toUrl('delete-form')->setOption('query', $this->getRedirectDestination()->getAsArray()),
      ],
    ];

@@ -45,7 +45,7 @@ class ConfigImportUploadTest extends BrowserTestBase {

    // Attempt to upload a non-tar file.
    $text_file = $this->getTestFiles('text')[0];
-    $edit = ['files[import_tarball]' => drupal_realpath($text_file->uri)];
+    $edit = ['files[import_tarball]' => \Drupal::service('file_system')->realpath($text_file->uri)];
    $this->drupalPostForm('admin/config/development/configuration/full/import', $edit, t('Upload'));
    $this->assertText(t('Could not extract the contents of the tar file'));

@@ -172,12 +172,24 @@ EOD;
      'import' => $import,
    ];
    $this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
-    $this->assertRaw(t('Are you sure you want to update the %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
-    $this->drupalPostForm(NULL, [], t('Confirm'));
-    $entity = $storage->load('second');
-    $this->assertRaw(t('The configuration was imported successfully.'));
-    $this->assertTrue(is_string($entity->label()), 'Entity label is a string');
-    $this->assertTrue(strpos($entity->label(), 'ObjectSerialization') > 0, 'Label contains serialized object');
+    if (extension_loaded('yaml')) {
+      // If the yaml extension is loaded it will work but not create the PHP
+      // object.
+      $this->assertRaw(t('Are you sure you want to update the %name @type?', [
+        '%name' => 'second',
+        '@type' => 'test configuration'
+      ]));
+      $this->drupalPostForm(NULL, [], t('Confirm'));
+      $entity = $storage->load('second');
+      $this->assertRaw(t('The configuration was imported successfully.'));
+      $this->assertTrue(is_string($entity->label()), 'Entity label is a string');
+      $this->assertTrue(strpos($entity->label(), 'ObjectSerialization') > 0, 'Label contains serialized object');
+    }
+    else {
+      // If the Symfony parser is used there will be an error.
+      $this->assertSession()->responseContains('The import failed with the following message:');
+      $this->assertSession()->responseContains('Object support when parsing a YAML file has been disabled');
+    }
  }

  /**