Core and composer updates

web/core/tests/Drupal/Tests/Component/Serialization/YamlPeclTest.php

@@ -26,6 +26,16 @@ class YamlPeclTest extends YamlTestBase {
     $this->assertEquals($data, YamlPecl::decode(YamlPecl::encode($data)));
   }
 
+  /**
+   * Ensures that php object support is disabled.
+   */
+  public function testObjectSupportDisabled() {
+    $object = new \stdClass();
+    $object->foo = 'bar';
+    $this->assertEquals(['O:8:"stdClass":1:{s:3:"foo";s:3:"bar";}'], YamlPecl::decode(YamlPecl::encode([$object])));
+    $this->assertEquals(0, ini_get('yaml.decode_php'));
+  }
+
   /**
    * Tests decoding YAML node anchors.
    *

web/core/tests/Drupal/Tests/Component/Serialization/YamlSymfonyTest.php

@@ -63,4 +63,16 @@ class YamlSymfonyTest extends YamlTestBase {
     YamlSymfony::decode('foo: [ads');
   }
 
+  /**
+   * Ensures that php object support is disabled.
+   *
+   * @covers ::encode
+   */
+  public function testObjectSupportDisabled() {
+    $this->setExpectedException(InvalidDataTypeException::class, 'Object support when dumping a YAML file has been disabled.');
+    $object = new \stdClass();
+    $object->foo = 'bar';
+    YamlSymfony::encode([$object]);
+  }
+
 }

web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php

@@ -76,6 +76,23 @@ class YamlTest extends UnitTestCase {
     }
   }
 
+  /**
+   * Ensures that decoding php objects is similar for PECL and Symfony.
+   *
+   * @requires extension yaml
+   */
+  public function testObjectSupportDisabled() {
+    $object = new \stdClass();
+    $object->foo = 'bar';
+    // In core all Yaml encoding is done via Symfony and it does not support
+    // objects so in order to encode an object we hace to use the PECL
+    // extension.
+    // @see \Drupal\Component\Serialization\Yaml::encode()
+    $yaml = YamlPecl::encode([$object]);
+    $this->assertEquals(['O:8:"stdClass":1:{s:3:"foo";s:3:"bar";}'], YamlPecl::decode($yaml));
+    $this->assertEquals(['!php/object "O:8:\"stdClass\":1:{s:3:\"foo\";s:3:\"bar\";}"'], YamlSymfony::decode($yaml));
+  }
+
   /**
    * Data provider that lists all YAML files in core.
    */

web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\Component\Utility;
 
+use Drupal\Component\Render\MarkupInterface;
+use Drupal\Component\Render\MarkupTrait;
 use Drupal\Component\Utility\Html;
 use Drupal\Tests\UnitTestCase;
 
@@ -87,7 +89,12 @@ class HtmlTest extends UnitTestCase {
    */
   public function testHtmlClass() {
     // Verify Drupal coding standards are enforced.
-    $this->assertSame(Html::getClass('CLASS NAME_[Ü]'), 'class-name--ü', 'Enforce Drupal coding standards.');
+    $this->assertSame('class-name--ü', Html::getClass('CLASS NAME_[Ü]'), 'Enforce Drupal coding standards.');
+
+    // Test Html::getClass() handles Drupal\Component\Render\MarkupInterface
+    // input.
+    $markup = HtmlTestMarkup::create('CLASS_FROM_OBJECT');
+    $this->assertSame('class-from-object', Html::getClass($markup), 'Markup object is converted to CSS class.');
   }
 
   /**
@@ -390,3 +397,11 @@ class HtmlTest extends UnitTestCase {
   }
 
 }
+
+/**
+ * Marks an object's __toString() method as returning markup.
+ */
+class HtmlTestMarkup implements MarkupInterface {
+  use MarkupTrait;
+
+}

web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php

@@ -22,7 +22,7 @@ class UrlHelperTest extends UnitTestCase {
       [['a' => ' &#//+%20@۞'], 'a=%20%26%23//%2B%2520%40%DB%9E', 'Value was properly encoded.'],
       [[' &#//+%20@۞' => 'a'], '%20%26%23%2F%2F%2B%2520%40%DB%9E=a', 'Key was properly encoded.'],
       [['a' => '1', 'b' => '2', 'c' => '3'], 'a=1&b=2&c=3', 'Multiple values were properly concatenated.'],
-      [['a' => ['b' => '2', 'c' => '3'], 'd' => 'foo'], 'a[b]=2&a[c]=3&d=foo', 'Nested array was properly encoded.'],
+      [['a' => ['b' => '2', 'c' => '3'], 'd' => 'foo'], 'a%5Bb%5D=2&a%5Bc%5D=3&d=foo', 'Nested array was properly encoded.'],
       [['foo' => NULL], 'foo', 'Simple parameters are properly added.'],
     ];
   }