Merge pull request #1 from mlocati/use-isset-instead-of-strlen-fixes

Correct replacement of strlen with isset
punic · Jan 18, 2015 · dca5f5b · dca5f5b
2 parents af84c0a + f1c7dea
commit dca5f5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/code/Data.php b/code/Data.php
@@ -254,7 +254,7 @@ public static function guessFullLocale($language = '', $script = '')
         foreach ($keys as $key) {
             if (isset($data[$key])) {
                 $result = $data[$key];
-                if (isset($script[1]) && (stripos($result, "$language-$script-") !== 0)) {
+                if (isset($script[0]) && (stripos($result, "$language-$script-") !== 0)) {
                     $parts = static::explodeLocale($result);
                     if (!is_null($parts)) {
                         $result = "{$parts['language']}-$script-{$parts['territory']}";
@@ -407,13 +407,13 @@ public static function explodeLocale($locale)
                     $chunkCount = count($chunks);
                     for ($i = 1; $ok && ($i < $chunkCount); $i++) {
                         if (preg_match('/^[a-z]{4}$/', $chunks[$i])) {
-                            if (isset($script[1])) {
+                            if (isset($script[0])) {
                                 $ok = false;
                             } else {
                                 $script = ucfirst($chunks[$i]);
                             }
                         } elseif (preg_match('/^([a-z]{2})|([0-9]{3})$/', $chunks[$i])) {
-                            if (isset($territory[1])) {
+                            if (isset($territory[0])) {
                                 $ok = false;
                             } else {
                                 $territory = strtoupper($chunks[$i]);
@@ -495,7 +495,7 @@ protected static function getLocaleAlternatives($locale, $addFallback = true)
             }
         }
         $territories = array();
-        while (isset($territory[1])) {
+        while (isset($territory[0])) {
             $territories[] = $territory;
             $territory = \Punic\Territory::getParentTerritoryCode($territory);
         }

diff --git a/code/Misc.php b/code/Misc.php
@@ -169,7 +169,7 @@ public static function getBrowserLocales($ignoreCache = false)
     public static function parseHttpAcceptLanguage($httpAcceptLanguages)
     {
         $result = array();
-        if (is_string($httpAcceptLanguages) && (isset($httpAcceptLanguages[1]))) {
+        if (is_string($httpAcceptLanguages) && (isset($httpAcceptLanguages[0]))) {
             foreach (explode(',', $httpAcceptLanguages) as $httpAcceptLanguage) {
                 if (preg_match('/^([a-z]{2,3}(?:[_\\-][a-z]+)*)(?:\\s*;(?:\\s*q(?:\\s*=(?:\\s*([\\d.]+))?)?)?)?$/', strtolower(trim($httpAcceptLanguage, " \t")), $m)) {
                     if (count($m) > 2) {

diff --git a/code/Unit.php b/code/Unit.php
@@ -131,7 +131,7 @@ public static function getMeasurementSystemFor($territoryCode)
     public static function getCountriesWithMeasurementSystem($measurementSystem)
     {
         $result = array();
-        if (is_string($measurementSystem) && (isset($measurementSystem[1]))) {
+        if (is_string($measurementSystem) && (isset($measurementSystem[0]))) {
             $someGroup = false;
             $data = \Punic\Data::getGeneric('measurementData');
             foreach ($data['measurementSystem'] as $territory => $ms) {
@@ -195,7 +195,7 @@ public static function getPaperSizeFor($territoryCode)
     public static function getCountriesWithPaperSize($paperSize)
     {
         $result = array();
-        if (is_string($paperSize) && (isset($paperSize[1]))) {
+        if (is_string($paperSize) && (isset($paperSize[0]))) {
             $someGroup = false;
             $data = \Punic\Data::getGeneric('measurementData');
             foreach ($data['paperSize'] as $territory => $ms) {