Make Mbstring extension required

atomiix · May 28, 2020 · 2b715ba · 2b715ba
1 parent 6cd77a5
commit 2b715ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/classes/ConfigurationTest.php b/classes/ConfigurationTest.php
@@ -91,6 +91,7 @@ public static function getDefaultTests()
                 'fileinfo' => false,
                 'intl' => false,
                 'memory_limit' => false,
+                'mbstring' => false,
             ]);
         }
 
@@ -394,7 +395,7 @@ public static function test_virtual_products_dir($dir)
 
     public static function test_mbstring()
     {
-        return function_exists('mb_strtolower');
+        return extension_loaded('mbstring');
     }
 
     public static function test_openssl()

diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
         "ext-curl": "*",
         "ext-fileinfo": "*",
         "ext-intl": "*",
+        "ext-mbstring": "*",
         "ext-zip": "*",
         "ext-iconv": "*",
         "ext-json": "*",
@@ -113,7 +114,6 @@
         "swiftmailer/swiftmailer": "~6.2",
         "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
-        "symfony/polyfill-mbstring": "^1.12",
         "symfony/polyfill-php73": "^1.10",
         "symfony/swiftmailer-bundle": "^3.1",
         "symfony/symfony": ">=3.4.37",

diff --git a/composer.lock b/composer.lock