Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix calculator name normalization #60

Merged
merged 1 commit into from Mar 19, 2022
Merged

Fix calculator name normalization #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/Calculator.php
View file
Open in desktop
Expand Up @@ -11,6 +11,16 @@
*/
class Calculator extends AbstractCalculator
{
/**
* Supported diacritics for fiscal code.
*
* À Á È É Ì Í Ò Ó Ù Ú Â Ä Æ Ç Č Ê Ë Î Ï Ô Ö Œ Û Ü Š Ž ẞ ß
*
* @see https://dait.interno.gov.it/documenti/circolare-n-1-2008-0.pdf
*/
private const DIACRITICS = array("\u{c0}", "\u{c1}", "\u{c8}", "\u{c9}", "\u{cc}", "\u{cd}", "\u{d2}", "\u{d3}", "\u{d9}", "\u{da}", "\u{c2}", "\u{c4}", "\u{c6}", "\u{c7}", "\u{10c}", "\u{ca}", "\u{cb}", "\u{ce}", "\u{cf}", "\u{d4}", "\u{d6}", "\u{152}", "\u{db}", "\u{dc}", "\u{160}", "\u{17d}", "\u{1e9e}", "\u{df}");
private const DIACRITICS_TRANSLITERATED = array('A', 'A', 'E', 'E', 'I', 'I', 'O', 'O', 'U', 'U', 'A', 'AE', 'AE', 'C', 'C', 'E', 'E', 'I', 'I', 'O', 'OE', 'OE', 'U', 'UE', 'S', 'Z', 'SS', 'SS');

private $subject;
private $omocodiaLevel = 0;

Expand Down Expand Up @@ -71,8 +81,8 @@ public function calculateAllPossibilities()
*/
private function calculateSurname()
{
$surname = $this->cleanString($this->subject->getSurname());
$consonants = str_replace($this->vowels, '', strtoupper($surname));
$surname = $this->normalizeNamePart($this->subject->getSurname());
$consonants = str_replace($this->vowels, '', $surname);
if (strlen($consonants) > 2) {
$result = substr($consonants, 0, 3);
} else {
Expand All @@ -89,8 +99,8 @@ private function calculateSurname()
*/
private function calculateName()
{
$name = $this->cleanString($this->subject->getName());
$consonants = str_replace($this->vowels, '', strtoupper($name));
$name = $this->normalizeNamePart($this->subject->getName());
$consonants = str_replace($this->vowels, '', $name);
if (strlen($consonants) > 3) {
$result = $consonants[0] . $consonants[2] . $consonants[3];
} elseif (strlen($consonants) == 3) {
Expand All @@ -111,8 +121,7 @@ private function calculateName()
*/
private function calculateSmallString($consonants, $string)
{
$string = $this->cleanString($string);
$vowels = str_replace(str_split($consonants), '', strtoupper($string));
$vowels = str_replace(str_split($consonants), '', $string);
$result = substr($consonants . $vowels . 'XXX', 0, 3);

return $result;
Expand Down Expand Up @@ -237,10 +246,13 @@ private function replaceOmocodiaSection(

/**
* @param $string string The string to clean.
* @return string Cleaned string
* @return string Normalized string
*/
private function cleanString($string)
private function normalizeNamePart($string)
{
return preg_replace(array('/\pM*/u', '/[\s\'"`]+/'), '', Normalizer::normalize($string, Normalizer::FORM_D));
$string = mb_strtoupper(Normalizer::normalize($string));
$string = str_replace(self::DIACRITICS, self::DIACRITICS_TRANSLITERATED, $string);

return preg_replace(array('/[^a-z]/iu'), '', $string);
}
}
39 changes: 39 additions & 0 deletions test/CalculatorTest.php
View file
Open in desktop
Expand Up @@ -275,6 +275,45 @@ public function calculateProvider()
-1,
'LSINLS80D44H501F',
),
array(
new Subject(
array(
'name' => "Marco—Antonio",
'surname' => "D’Andrea",
'birthDate' => '1990-01-01',
'gender' => 'M',
'belfioreCode' => 'F839',
)
),
-1,
'DNDMCN90A01F839X',
),
array(
new Subject(
array(
'name' => "Anna",
'surname' => "Betaña",
'birthDate' => '1972-04-02',
'gender' => 'F',
'belfioreCode' => 'H501',
)
),
-1,
'BTENNA72D42H501M',
),
array(
new Subject(
array(
'name' => "Žáç",
'surname' => "Öß",
'birthDate' => '1954-07-01',
'gender' => 'M',
'belfioreCode' => 'A794',
)
),
-1,
'SSOZCA54L01A794X',
),
);
}

Expand Down