Merge branch '8.6RC'8.6

3 files changed, 4 insertions, 250 deletions

diff --git a/vendor/pear/text_languagedetect/Text/LanguageDetect.php b/vendor/pear/text_languagedetect/Text/LanguageDetect.php
index c4e0216be..d5e321d1e 100644
--- a/vendor/pear/text_languagedetect/Text/LanguageDetect.php
+++ b/vendor/pear/text_languagedetect/Text/LanguageDetect.php
@@ -12,9 +12,9 @@
  * @link      http://pear.php.net/package/Text_LanguageDetect/
  */
 
-//require_once 'Text/LanguageDetect/Exception.php';
-//require_once 'Text/LanguageDetect/Parser.php';
-//require_once 'Text/LanguageDetect/ISO639.php';
+require_once 'LanguageDetect/Exception.php';
+require_once 'LanguageDetect/Parser.php';
+require_once 'LanguageDetect/ISO639.php';
 
 /**
  * Detects the language of a given piece of text.
diff --git a/vendor/pear/text_languagedetect/Text/LanguageDetect/Parser.php b/vendor/pear/text_languagedetect/Text/LanguageDetect/Parser.php
index 3ec177640..50674e22f 100644
--- a/vendor/pear/text_languagedetect/Text/LanguageDetect/Parser.php
+++ b/vendor/pear/text_languagedetect/Text/LanguageDetect/Parser.php
@@ -44,7 +44,7 @@ class Text_LanguageDetect_Parser extends Text_LanguageDetect
      *
      * @var string
      */
-    protected $_trigrams = array();
+    protected $_trigram = array();
 
     /**
      * Stores the trigram ranks of the sample
diff --git a/vendor/pear/text_languagedetect/package.xml b/vendor/pear/text_languagedetect/package.xml
deleted file mode 100644
index 4fac0051d..000000000
--- a/vendor/pear/text_languagedetect/package.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.7.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-http://pear.php.net/dtd/tasks-1.0.xsd
-http://pear.php.net/dtd/package-2.0
-http://pear.php.net/dtd/package-2.0.xsd">
- <name>Text_LanguageDetect</name>
- <channel>pear.php.net</channel>
- <summary>Language detection class</summary>
- <description>Text_LanguageDetect can identify 52 human languages from text samples and return confidence scores for each.
- </description>
-
- <lead>
-  <name>Nicholas Pisarro</name>
-  <user>taak</user>
-  <email>taak@php.net</email>
-  <active>no</active>
- </lead>
-
- <date>2017-03-02</date>
- <time>18:00:42</time>
- <version>
-  <release>1.0.0</release>
-  <api>1.0.0</api>
- </version>
-
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
-
- <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-
- <notes>
-  - Add PHP5 constructors
-  - Fix bug #21189: Language detection on PHP7 broken
-  - Fix coding style problems
-  - BC break: Add real visibility to properties and methods
- </notes>
-
- <contents>
-  <dir name="/">
-   <file name="README.rst" role="doc" />
-   <dir name="data">
-    <file name="lang.dat" role="data" />
-    <file name="unicode_blocks.dat" role="data" />
-   </dir> <!-- /data -->
-   <dir name="docs">
-    <file name="confidence.php" role="doc" />
-    <file name="example_clui.php" role="doc" />
-    <file name="example_web.php" role="doc" />
-    <file name="iso.php" role="doc" />
-    <file name="languages.php" role="doc" />
-    <file name="simple.php" role="doc" />
-   </dir> <!-- /docs -->
-   <dir name="tests">
-    <file name="PrivProxy.php" role="test" />
-    <file name="Text_LanguageDetectTest.php" role="test" />
-    <file name="Text_LanguageDetect_ISO639Test.php" role="test" />
-   </dir> <!-- /tests -->
-   <dir name="Text">
-    <dir name="LanguageDetect">
-     <file name="Exception.php" role="php">
-      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     </file>
-     <file name="ISO639.php" role="php">
-      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     </file>
-     <file name="Parser.php" role="php">
-      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     </file>
-    </dir> <!-- /Text/LanguageDetect -->
-    <file name="LanguageDetect.php" role="php">
-     <tasks:replace from="@package_version@" to="version" type="package-info" />
-     <tasks:replace from="@data_dir@" to="data_dir" type="pear-config" />
-    </file>
-   </dir> <!-- /Text -->
-  </dir> <!-- / -->
- </contents>
-
- <dependencies>
-  <required>
-   <php>
-    <min>5.4</min>
-   </php>
-   <pearinstaller>
-    <min>1.9.0</min>
-   </pearinstaller>
-   <extension>
-    <name>pcre</name>
-   </extension>
-  </required>
-  <optional>
-   <extension>
-    <name>mbstring</name>
-   </extension>
-  </optional>
- </dependencies>
-
- <phprelease>
-  <filelist>
-   <install as="lang.dat" name="data/lang.dat" />
-   <install as="unicode_blocks.dat" name="data/unicode_blocks.dat" />
-  </filelist>
- </phprelease>
-
- <changelog>
-
-  <release>
-   <version>
-    <release>1.0.0</release>
-    <api>1.0.0</api>
-   </version>
-   <stability>
-    <release>stable</release>
-    <api>stable</api>
-   </stability>
-   <date>2017-03-02</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>
-    - Add PHP5 constructors
-    - Fix bug #21189: Language detection on PHP7 broken
-    - Fix coding style problems
-    - BC break: Add real visibility to properties and methods
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.3.0</release>
-    <api>0.3.0</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2012-01-16</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>
-- BC break: Return lowercase language names
-- BC break: Use exceptions instead of PEAR_Error
-- Implement request #19221: Return ISO 639-1 or ISO 639-2 language codes
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.2.3</release>
-    <api>0.2.3</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2008-07-30</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>updated package requirements
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.2.2</release>
-    <api>0.2.2</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2008-07-30</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>* Fixed Bug #13385    
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.2.1</release>
-    <api>0.2.1</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2006-12-03</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>* Fix: Now uses conventionalized include path
-* Fix: Won&apos;t cause error if input is purely symbol-range characters
-* Better error reporting if error in unicode db loading
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.2.0</release>
-    <api>0.2.0</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2006-01-18</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>* Added unicode block range identification
-* unicode block ranges used to optimize language detection by pre-selecting which known language trigram profiles in the database to attempt comparison with
-* Added several utf8/unicode utility functions
-* new Parser class for building data profiles from text samples
-* Fix: mb_convert_encoding() now used correctly
-* Fix: basic case-folding for Cyrillic alphabet implemented
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.1.1</release>
-    <api>0.1.1</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2006-01-06</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>* Output of clustering now cached
-* Fix: better error checking in clustering functions
-* Fix: clusteredSearch() now handles null strings gracefully
-* Compare order is preserved in clusteredSearch() results
-* Slight speed improvement to utf8 iterator
-   </notes>
-  </release>
-
-  <release>
-   <version>
-    <release>0.1.0</release>
-    <api>0.1.0</api>
-   </version>
-   <stability>
-    <release>alpha</release>
-    <api>alpha</api>
-   </stability>
-   <date>2006-01-04</date>
-   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
-   <notes>Initial PEAR release
-   </notes>
-  </release>
- </changelog>
-</package>