dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Normalize

Browse Source
This commit is contained in:
rMalie
2012-01-25 14:40:12 +00:00
parent 8db038f0e8
commit ccbf3acc8d
21 changed files with 202 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+15 -16
View File
@@ -117,7 +117,7 @@ class AddressFormatCore extends ObjectModel
// Check if the property is accessible
$publicProperties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
foreach($publicProperties as $property)
foreach ($publicProperties as $property)
{
$propertyName = $property->getName();
if (($propertyName == $fieldName) && ($isIdField ||
@@ -195,12 +195,12 @@ class AddressFormatCore extends ObjectModel
$multipleLineFields = explode("\n", $this->format);
if ($multipleLineFields && is_array($multipleLineFields))
foreach($multipleLineFields as $lineField)
foreach ($multipleLineFields as $lineField)
{
if (($patternsName = preg_split(self::_CLEANING_REGEX_, $lineField, -1, PREG_SPLIT_NO_EMPTY)))
if (is_array($patternsName))
{
foreach($patternsName as $patternName)
foreach ($patternsName as $patternName)
{
if (!in_array($patternName, $usedKeyList))
{
@@ -234,13 +234,13 @@ class AddressFormatCore extends ObjectModel
if ($currentKeyList && is_array($currentKeyList))
if ($originalFormattedPatternList = explode(' ', $currentLine))
// Foreach the available pattern
foreach($originalFormattedPatternList as $patternNum => $pattern)
foreach ($originalFormattedPatternList as $patternNum => $pattern)
{
// Var allows to modify the good formatted key value when multiple key exist into the same pattern
$mainFormattedKey = '';
// Multiple key can be found in the same pattern
foreach($currentKeyList as $key)
foreach ($currentKeyList as $key)
{
// Check if we need to use an older modified pattern if a key has already be matched before
$replacedValue = empty($mainFormattedKey) ? $pattern : $formattedValueList[$mainFormattedKey];
@@ -266,12 +266,12 @@ class AddressFormatCore extends ObjectModel
*/
public static function cleanOrderedAddress(&$orderedAddressField)
{
foreach($orderedAddressField as &$line)
foreach ($orderedAddressField as &$line)
{
$cleanedLine = '';
if (($keyList = preg_split(self::_CLEANING_REGEX_, $line, -1, PREG_SPLIT_NO_EMPTY)))
{
foreach($keyList as $key)
foreach ($keyList as $key)
$cleanedLine .= $key.' ';
$cleanedLine = trim($cleanedLine);
$line = $cleanedLine;
@@ -295,11 +295,11 @@ class AddressFormatCore extends ObjectModel
// Check if $address exist and it's an instanciate object of Address
if ($address && ($address instanceof Address))
foreach($addressFormat as $line)
foreach ($addressFormat as $line)
{
if (($keyList = preg_split(self::_CLEANING_REGEX_, $line, -1, PREG_SPLIT_NO_EMPTY)) && is_array($keyList))
{
foreach($keyList as $pattern)
foreach ($keyList as $pattern)
if ($associateName = explode(':', $pattern))
{
$totalName = count($associateName);
@@ -331,7 +331,7 @@ class AddressFormatCore extends ObjectModel
}
AddressFormat::cleanOrderedAddress($addressFormat);
// Free the instanciate objects
foreach($temporyObject as &$object)
foreach ($temporyObject as &$object)
unset($object);
return $tab;
}
@@ -354,7 +354,7 @@ class AddressFormatCore extends ObjectModel
if (($patternsList = preg_split(self::_CLEANING_REGEX_, $line, -1, PREG_SPLIT_NO_EMPTY)))
{
$tmpText = '';
foreach($patternsList as $pattern)
foreach ($patternsList as $pattern)
if ((!array_key_exists('avoid', $patternRules)) ||
(array_key_exists('avoid', $patternRules) && !in_array($pattern, $patternRules['avoid'])))
$tmpText .= (isset($addressFormatedValues[$pattern]) && !empty($addressFormatedValues[$pattern])) ?
@@ -397,7 +397,7 @@ class AddressFormatCore extends ObjectModel
// Check if the property is accessible
$publicProperties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
foreach($publicProperties as $property)
foreach ($publicProperties as $property)
{
$propertyName = $property->getName();
if ((!in_array($propertyName, AddressFormat::$forbiddenPropertyList)) &&
@@ -424,7 +424,7 @@ class AddressFormatCore extends ObjectModel
// Get all the name object liable to the Address class
$publicProperties = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
foreach($publicProperties as $property)
foreach ($publicProperties as $property)
{
$propertyName = $property->getName();
if (preg_match('#id_\w#', $propertyName) && strlen($propertyName) > 3)
@@ -457,7 +457,7 @@ class AddressFormatCore extends ObjectModel
if ($cleaned)
$keyList = ($cleaned) ? preg_split(self::_CLEANING_REGEX_, $field_item, -1, PREG_SPLIT_NO_EMPTY) :
explode(' ', $field_item);
foreach($keyList as $word_item)
foreach ($keyList as $word_item)
$out[] = trim($word_item);
}
else
@@ -490,8 +490,7 @@ class AddressFormatCore extends ObjectModel
*/
public static function getAddressCountryFormat($id_country = 0)
{
$out = '';
$id_country = (int) $id_country;
$id_country = (int)$id_country;
$tmp_obj = new AddressFormat();
$tmp_obj->id_country = $id_country;