Rely on iconv and symfony/polyfill-*

symfony · Oct 28, 2015 · 303f05b · 303f05b
1 parent aa2673b
commit 303f05b
Show file tree

Hide file tree

Showing 91 changed files with 159 additions and 767 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,13 @@
         "twig/twig": "~1.20|~2.0",
         "psr/log": "~1.0",
         "symfony/security-acl": "~2.7",
-        "paragonie/random_compat": "~1.0"
+        "symfony/polyfill-intl-icu": "~1.0",
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/polyfill-php54": "~1.0",
+        "symfony/polyfill-php55": "~1.0",
+        "symfony/polyfill-php56": "~1.0",
+        "symfony/polyfill-php70": "~1.0",
+        "symfony/polyfill-util": "~1.0"
     },
     "replace": {
         "symfony/asset": "self.version",
@@ -77,7 +83,6 @@
         "doctrine/orm": "~2.4,>=2.4.5",
         "doctrine/doctrine-bundle": "~1.2",
         "monolog/monolog": "~1.11",
-        "ircmaxell/password-compat": "~1.0",
         "ocramius/proxy-manager": "~0.4|~1.0",
         "egulias/email-validator": "~1.2",
         "phpdocumentor/reflection": "^1.0.7"
@@ -96,10 +101,8 @@
             "Symfony\\Component\\": "src/Symfony/Component/"
         },
         "classmap": [
-            "src/Symfony/Component/HttpFoundation/Resources/stubs",
             "src/Symfony/Component/Intl/Resources/stubs"
-        ],
-        "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ]
+        ]
     },
     "minimum-stability": "dev",
     "extra": {

diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
@@ -99,16 +99,9 @@ private function normalizeParams(array $params)
             }
 
             // detect if the too long string must be shorten
-            if (function_exists('mb_strlen')) {
-                if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {
-                    $params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
-                    continue;
-                }
-            } else {
-                if (self::MAX_STRING_LENGTH < strlen($params[$index])) {
-                    $params[$index] = substr($params[$index], 0, self::MAX_STRING_LENGTH - 6).' [...]';
-                    continue;
-                }
+            if (self::MAX_STRING_LENGTH < iconv_strlen($params[$index], 'UTF-8')) {
+                $params[$index] = iconv_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
+                continue;
             }
         }
 

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php b/src/Symfony/Bridge/Doctrine/Tests/Logger/DbalLoggerTest.php
@@ -132,9 +132,6 @@ public function testLogLongString()
         ));
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testLogUTF8LongString()
     {
         $logger = $this->getMock('Psr\\Log\\LoggerInterface');
@@ -160,7 +157,7 @@ public function testLogUTF8LongString()
         $dbalLogger
             ->expects($this->once())
             ->method('log')
-            ->with('SQL', array('short' => $shortString, 'long' => mb_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, mb_detect_encoding($longString)).' [...]'))
+            ->with('SQL', array('short' => $shortString, 'long' => iconv_substr($longString, 0, DbalLogger::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]'))
         ;
 
         $dbalLogger->startQuery('SQL', array(

diff --git a/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php b/src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
@@ -24,7 +24,6 @@ class SymfonyTestsListener extends \PHPUnit_Framework_BaseTestListener
     private $skippedFile = false;
     private $wasSkipped = array();
     private $isSkipped = array();
-    private $testsStack = array();
 
     public function __destruct()
     {

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -24,7 +24,7 @@
         "symfony/finder": "~2.3|~3.0.0",
         "symfony/form": "~2.8",
         "symfony/http-kernel": "~2.8|~3.0.0",
-        "symfony/intl": "~2.3|~3.0.0",
+        "symfony/polyfill-intl-icu": "~1.0",
         "symfony/routing": "~2.2|~3.0.0",
         "symfony/templating": "~2.1|~3.0.0",
         "symfony/translation": "~2.7|~3.0.0",

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -240,7 +240,7 @@ private function sanitizeString($string, $length = 40)
     {
         $string = trim(preg_replace('/\s+/', ' ', $string));
 
-        if (function_exists('mb_strlen') && false !== $encoding = mb_detect_encoding($string)) {
+        if (false !== $encoding = mb_detect_encoding($string, null, true)) {
             if (mb_strlen($string, $encoding) > $length) {
                 return mb_substr($string, 0, $length - 3, $encoding).'...';
             }

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -24,6 +24,7 @@
         "symfony/event-dispatcher": "~2.8|~3.0.0",
         "symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
         "symfony/http-kernel": "~2.8",
+        "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~2.3|~3.0.0",
         "symfony/routing": "~2.8|~3.0.0",
         "symfony/security-core": "~2.6|~3.0.0",
@@ -40,7 +41,7 @@
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
         "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
         "symfony/finder": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/intl": "~2.3|~3.0.0",
+        "symfony/polyfill-intl-icu": "~1.0",
         "symfony/security": "~2.6|~3.0.0",
         "symfony/form": "~2.8",
         "symfony/expression-language": "~2.6|~3.0.0",

diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -23,7 +23,6 @@
     },
     "require-dev": {
         "symfony/browser-kit": "~2.4|~3.0.0",
-        "symfony/config": "~2.8|~3.0.0",
         "symfony/console": "~2.7|~3.0.0",
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
         "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
@@ -37,8 +36,7 @@
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "doctrine/doctrine-bundle": "~1.2",
-        "twig/twig": "~1.20|~2.0",
-        "ircmaxell/password-compat": "~1.0"
+        "twig/twig": "~1.20|~2.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" }

diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -1077,11 +1077,7 @@ public function setDefaultCommand($commandName)
 
     private function stringWidth($string)
     {
-        if (!function_exists('mb_strwidth')) {
-            return strlen($string);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string)) {
+        if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return strlen($string);
         }
 
@@ -1094,11 +1090,7 @@ private function splitStringByWidth($string, $width)
         // additionally, array_slice() is not enough as some character has doubled width.
         // we need a function to split string not by character count but by string width
 
-        if (!function_exists('mb_strwidth')) {
-            return str_split($string, $width);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string)) {
+        if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return str_split($string, $width);
         }
 

diff --git a/src/Symfony/Component/Console/Helper/Helper.php b/src/Symfony/Component/Console/Helper/Helper.php
@@ -51,11 +51,7 @@ public function getHelperSet()
      */
     public static function strlen($string)
     {
-        if (!function_exists('mb_strwidth')) {
-            return strlen($string);
-        }
-
-        if (false === $encoding = mb_detect_encoding($string)) {
+        if (false === $encoding = mb_detect_encoding($string, null, true)) {
             return strlen($string);
         }
 

diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -351,7 +351,7 @@ private function renderCell(array $row, $column, $cellFormat)
         }
 
         // str_pad won't work properly with multi-byte strings, we need to fix the padding
-        if (function_exists('mb_strwidth') && false !== $encoding = mb_detect_encoding($cell)) {
+        if (false !== $encoding = mb_detect_encoding($cell, null, true)) {
             $width += strlen($cell) - mb_strwidth($cell, $encoding);
         }
 

diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -558,9 +558,6 @@ public function testRenderException()
         $this->assertStringEqualsFile(self::$fixturesPath.'/application_renderexception4.txt', $tester->getDisplay(true), '->renderException() wraps messages when they are bigger than the terminal');
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testRenderExceptionWithDoubleWidthCharacters()
     {
         $application = $this->getMock('Symfony\Component\Console\Application', array('getTerminalWidth'));

diff --git a/src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/FormatterHelperTest.php
@@ -52,9 +52,6 @@ public function testFormatBlock()
         );
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testFormatBlockWithDiacriticLetters()
     {
         $formatter = new FormatterHelper();
@@ -68,9 +65,6 @@ public function testFormatBlockWithDiacriticLetters()
         );
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testFormatBlockWithDoubleWidthDiacriticLetters()
     {
         $formatter = new FormatterHelper();

diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
@@ -155,9 +155,6 @@ public function testRedrawFrequency()
         $progress->advance(1);
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testMultiByteSupport()
     {
         $progress = new ProgressHelper();

diff --git a/src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
@@ -256,9 +256,6 @@ public function testRenderProvider()
         );
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testRenderMultiByte()
     {
         $table = new TableHelper();
@@ -282,9 +279,6 @@ public function testRenderMultiByte()
         $this->assertEquals($expected, $this->getOutputContent($output));
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testRenderFullWidthCharacters()
     {
         $table = new TableHelper();

diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
@@ -307,9 +307,6 @@ public function testRedrawFrequency()
         $bar->advance(1);
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testMultiByteSupport()
     {
         $bar = new ProgressBar($output = $this->getOutputStream());
@@ -541,9 +538,6 @@ public function testMultilineFormat()
         );
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testAnsiColorsAndEmojis()
     {
         $bar = new ProgressBar($output = $this->getOutputStream(), 15);

diff --git a/src/Symfony/Component/Console/Tests/Helper/TableTest.php b/src/Symfony/Component/Console/Tests/Helper/TableTest.php
@@ -464,9 +464,6 @@ public function testRenderProvider()
         );
     }
 
-    /**
-     * @requires extension mbstring
-     */
     public function testRenderMultiByte()
     {
         $table = new Table($output = $this->getOutputStream());

diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
         "symfony/event-dispatcher": "~2.1|~3.0.0",

diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -173,34 +173,7 @@ public function addHtmlContent($content, $charset = 'UTF-8')
 
         try {
             // Convert charset to HTML-entities to work around bugs in DOMDocument::loadHTML()
-
-            if (function_exists('mb_convert_encoding')) {
-                $content = mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
-            } elseif (function_exists('iconv')) {
-                $content = preg_replace_callback(
-                    '/[\x80-\xFF]+/',
-                    function ($m) {
-                        $m = unpack('C*', $m[0]);
-                        $i = 1;
-                        $entities = '';
-
-                        while (isset($m[$i])) {
-                            if (0xF0 <= $m[$i]) {
-                                $c = (($m[$i++] - 0xF0) << 18) + (($m[$i++] - 0x80) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++] - 0x80;
-                            } elseif (0xE0 <= $m[$i]) {
-                                $c = (($m[$i++] - 0xE0) << 12) + (($m[$i++] - 0x80) << 6) + $m[$i++]  - 0x80;
-                            } else {
-                                $c = (($m[$i++] - 0xC0) << 6) + $m[$i++] - 0x80;
-                            }
-
-                            $entities .= '&#'.$c.';';
-                        }
-
-                        return $entities;
-                    },
-                    iconv($charset, 'UTF-8', $content)
-                );
-            }
+            $content = mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
         } catch (\Exception $e) {
         }
 

diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -102,7 +102,6 @@ public function testAddHtmlContentWithBaseTag()
 
     /**
      * @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
-     * @requires extension mbstring
      */
     public function testAddHtmlContentCharset()
     {
@@ -137,7 +136,6 @@ public function testAddHtmlContentUnsupportedCharset()
 
     /**
      * @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
-     * @requires extension mbstring
      */
     public function testAddHtmlContentCharsetGbk()
     {

diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.9"
+        "php": ">=5.3.9",
+        "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
         "symfony/css-selector": "~2.8|~3.0.0"

diff --git a/...fony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/...fony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -197,7 +197,7 @@ public function reverseTransform($value)
             throw new TransformationFailedException('I don\'t have a clear idea what infinity looks like');
         }
 
-        if (function_exists('mb_detect_encoding') && false !== $encoding = mb_detect_encoding($value)) {
+        if (false !== $encoding = mb_detect_encoding($value, null, true)) {
             $length = mb_strlen($value, $encoding);
             $remainder = mb_substr($value, $position, $length, $encoding);
         } else {

diff --git a/...nent/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/...nent/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -238,8 +238,6 @@ public function testReverseTransformWithGrouping($to, $from, $locale)
 
     /**
      * @see https://github.com/symfony/symfony/issues/7609
-     *
-     * @requires extension mbstring
      */
     public function testReverseTransformWithGroupingAndFixedSpaces()
     {
@@ -583,7 +581,6 @@ public function testReverseTransformDisallowsCenteredExtraCharacters()
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
-     * @requires extension mbstring
      */
     public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
     {
@@ -600,7 +597,6 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
-     * @requires extension mbstring
      */
     public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage()
     {
@@ -628,7 +624,6 @@ public function testReverseTransformDisallowsTrailingExtraCharacters()
     /**
      * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
      * @expectedExceptionMessage The number contains unrecognized characters: "foo"
-     * @requires extension mbstring
      */
     public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
     {

diff --git a/src/Symfony/Component/Form/Tests/Util/StringUtilTest.php b/src/Symfony/Component/Form/Tests/Util/StringUtilTest.php
@@ -24,7 +24,6 @@ public function testTrim()
 
     /**
      * @dataProvider spaceProvider
-     * @requires extension mbstring
      */
     public function testTrimUtf8Separators($hex)
     {