Merge pull request #266 from nicolas-grekas/mbstring-relax

replace extension_exists() by function_exists() for mbstring

Author: willdurand

src/Geocoder/Result/AbstractResult.php

@@ -60,7 +60,7 @@ public function offsetUnset($offset)
      */
     protected function formatString($str)
     {
-        if (extension_loaded('mbstring')) {
+        if (function_exists('mb_convert_case')) {
             $str = mb_convert_case($str, MB_CASE_TITLE, 'UTF-8');
         } else {
             $str = $this->lowerize($str);
@@ -82,7 +82,7 @@ protected function formatString($str)
      */
     protected function lowerize($str)
     {
-        return extension_loaded('mbstring') ? mb_strtolower($str, 'UTF-8') : strtolower($str);
+        return function_exists('mb_strtolower') ? mb_strtolower($str, 'UTF-8') : strtolower($str);
     }
 
     /**
@@ -94,6 +94,6 @@ protected function lowerize($str)
      */
     protected function upperize($str)
     {
-        return extension_loaded('mbstring') ? mb_strtoupper($str, 'UTF-8') : strtoupper($str);
+        return function_exists('mb_strtoupper') ? mb_strtoupper($str, 'UTF-8') : strtoupper($str);
     }
 }

tests/bootstrap.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!extension_loaded('curl') || !function_exists('curl_init')) {
+if (!function_exists('curl_init')) {
     die(<<<EOT
 cURL has to be enabled!
 EOT