Merge branch '2.6RC'2.6

1 files changed, 60 insertions, 0 deletions

diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php
new file mode 100644
index 000000000..2943383aa
--- /dev/null
+++ b/vendor/league/html-to-markdown/src/Configuration.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace League\HTMLToMarkdown;
+
+class Configuration
+{
+    protected $config;
+
+    /**
+     * @param array $config
+     */
+    public function __construct(array $config = array())
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * @param array $config
+     */
+    public function merge(array $config = array())
+    {
+        $this->config = array_replace_recursive($this->config, $config);
+    }
+
+    /**
+     * @param array $config
+     */
+    public function replace(array $config = array())
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed  $value
+     */
+    public function setOption($key, $value)
+    {
+        $this->config[$key] = $value;
+    }
+
+    /**
+     * @param string|null $key
+     * @param mixed|null  $default
+     *
+     * @return mixed|null
+     */
+    public function getOption($key = null, $default = null)
+    {
+        if ($key === null) {
+            return $this->config;
+        }
+
+        if (!isset($this->config[$key])) {
+            return $default;
+        }
+
+        return $this->config[$key];
+    }
+}