Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 26 additions & 32 deletions Naming/DefaultNamer.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,56 +17,41 @@ class DefaultNamer
*/
public function translitRename(PropertyMapping $propertyMapping, $name)
{




if (function_exists('transliterator_transliterate')) {
$name = transliterator_transliterate("Any-Latin; Latin-ASCII; [\u0100-\u7fff] remove", $name);
$name = transliterator_transliterate("Any-Latin; Latin-ASCII; [\u0100-\u7fff] remove", $name);
$name = preg_replace('/[^\\pL\d.]+/u', '-', $name);
$name = preg_replace('/[-\s]+/', '-', $name);
$name = preg_replace('/[\(\)\[\]]+/', '', $name);
} else {


$iso = array(
"Є" => "YE", "І" => "I", "Ѓ" => "G", "і" => "i", "№" => "N", "є" => "ye", "ѓ" => "g",
"А" => "A", "Б" => "B", "В" => "V", "Г" => "G", "Д" => "D",
"Е" => "E", "Ё" => "e", "Ж" => "z",
"З" => "Z", "И" => "I", "Й" => "J", "К" => "K", "Л" => "L",
"М" => "M", "Н" => "N", "О" => "O", "П" => "P", "Р" => "R",
"С" => "S", "Т" => "T", "У" => "U", "Ф" => "F", "Х" => "H",
"Ц" => "C", "Ч" => "C", "Ш" => "S", "Щ" => "s", "Ъ" => "",
"Ы" => "Y", "Ь" => "", "Э" => "E", "Ю" => "U", "Я" => "a",
"а" => "a", "б" => "b", "в" => "v", "г" => "g", "д" => "d",
"е" => "e", "ё" => "e", "ж" => "z",
"з" => "z", "и" => "i", "й" => "j", "к" => "k", "л" => "l",
"м" => "m", "н" => "n", "о" => "o", "п" => "p", "р" => "r",
"с" => "s", "т" => "t", "у" => "u", "ф" => "f", "х" => "h",
"ц" => "c", "ч" => "c", "ш" => "s", "щ" => "s", "ъ" => "",
"ы" => "y", "ь" => "", "э" => "e", "ю" => "u", "я" => "a", "«" => "", "»" => "", "—" => "-"
"Є" => "YE", "І" => "I", "Ѓ" => "G", "і" => "i", "№" => "N", "є" => "ye", "ѓ" => "g", "А" => "A",
"Б" => "B", "В" => "V", "Г" => "G", "Д" => "D", "Е" => "E", "Ё" => "e", "Ж" => "z", "З" => "Z",
"И" => "I", "Й" => "J", "К" => "K", "Л" => "L", "М" => "M", "Н" => "N", "О" => "O", "П" => "P",
"Р" => "R", "С" => "S", "Т" => "T", "У" => "U", "Ф" => "F", "Х" => "H", "Ц" => "C", "Ч" => "C",
"Ш" => "S", "Щ" => "s", "Ъ" => "", "Ы" => "Y", "Ь" => "", "Э" => "E", "Ю" => "U", "Я" => "a",
"а" => "a", "б" => "b", "в" => "v", "г" => "g", "д" => "d", "е" => "e", "ё" => "e", "ж" => "z",
"з" => "z", "и" => "i", "й" => "j", "к" => "k", "л" => "l", "м" => "m", "н" => "n", "о" => "o",
"п" => "p", "р" => "r", "с" => "s", "т" => "t", "у" => "u", "ф" => "f", "х" => "h", "ц" => "c",
"ч" => "c", "ш" => "s", "щ" => "s", "ъ" => "", "ы" => "y", "ь" => "", "э" => "e", "ю" => "u",
"я" => "a", "«" => "", "»" => "", "—" => "-",
);
$name = strtr($name, $iso);


$name = preg_replace('/[^\\pL\d.]+/u', '-', $name);
$name = preg_replace('/[-\s]+/', '-', $name);
$name = preg_replace('/[\(\)\[\]]+/', '', $name);

// transliterate
if (function_exists('iconv')) {
$name = iconv('utf-8', 'ASCII//TRANSLIT//IGNORE', $name);
}

$name = preg_replace("/[^0-9A-Za-z-_ .]/", "", $name);



}

$name = trim($name, '-');
$name = strtolower($name);



return $name;
}

Expand All@@ -80,23 +65,30 @@ public function translitRename(PropertyMapping $propertyMapping, $name)
public function propertyRename(PropertyMapping $propertyMapping, $name, $params)
{
$fieldValue = $this->getFieldValueByParam($propertyMapping, $params);
if ($fieldValue) $name = $fieldValue . substr($name, strrpos($name, '.'));
if ($fieldValue) {
$name = $fieldValue . substr($name, strrpos($name, '.'));
}
return $name;
}

protected function getFieldValueByParam(PropertyMapping $propertyMapping, $params)
{
$obj = $propertyMapping->getObj();

$fieldValue = '';
if (isset($params['use_field_name']) && $params['use_field_name']) {
$fieldValue = $propertyMapping->getFileDataPropertyName();
} else {
$field = isset($params['field']) && $params['field'] ? $params['field'] : 'id';
$fieldValue = $obj->{'get' . ucfirst($field)}();
}

if (!$fieldValue) $fieldValue = $obj->getId();
if ($fieldValue instanceof \DateTime) {
$fieldValue = $fieldValue->format('Y_m_d_H_i_s');
}

if (!$fieldValue) {
$fieldValue = $obj->getId();
}
return $fieldValue;
}

Expand DownExpand Up@@ -133,7 +125,9 @@ public function replaceRename(PropertyMapping $propertyMapping, $name, $params)
public function resolveCollision($name, $attempt = 1)
{
$addition = $attempt;
if ($attempt > 10) $addition = date('Y_m_d_H_i_s');
if ($attempt > 10) {
$addition = date('Y_m_d_H_i_s');
}

$ppos = strrpos($name, '.');

Expand Down