Skip to content

Commit

Permalink
removing echos and READMEing
Browse files Browse the repository at this point in the history
ronanguilloux committed Jan 9, 2021
1 parent 53b7f12 commit eba932c
Showing 2 changed files with 1 addition and 24 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -61,6 +61,7 @@ $isISIN = Isin::validate('US0378331005'); // Apple Inc. (AAPL)
* Spain: NIF, NIE (Número de Identificación Fiscal/Extranjero) & CIF (Código de identificación fiscal)
* Netherlands: Burgerservicenummer / Citizen Service Number (BSN)
* Finland: HETU, Henkilötunnus (Finnish personal identity code)
* Switzerland: Business Orgs UID (VAT) Number / Unternehmens-Identifikationsnummer

### GS1 specific numbers/identifiers

24 changes: 0 additions & 24 deletions src/IsoCodes/Utils.php
Original file line number Diff line number Diff line change
@@ -27,10 +27,6 @@ public static function Luhn(string $value, int $length, int $weight, int $divide
$value = self::unDecorate($value, $hyphens);
$digits = substr($value, 0, $length - 1);
$check = substr($value, $length - 1, 1);
echo "\n ------------------------------------------";
echo "\n val=$value";
echo "\n digit=$digits";
echo "\n check=$check";
$expr = sprintf('/\\d{%d}/i', $length);
if (!preg_match($expr, $value)) {
return false;
@@ -39,26 +35,17 @@ public static function Luhn(string $value, int $length, int $weight, int $divide
$sum = 0;
for ($i = 0; $i < strlen($digits); ++$i) {
if (0 === $i % 2) {
echo "\n %2 : add = ".(int) substr($digits, $i, 1);
$add = (int) substr($digits, $i, 1);
} else {
$add = $weight * (int) substr($digits, $i, 1);
echo "\n weighted: $weight * ".(int) substr($digits, $i, 1).' = '.$weight * (int) substr($digits, $i, 1);
if (10 <= $add) { // '18' = 1+8 = 9, etc.
$strAdd = strval($add);
$add = intval($strAdd[0]) + intval($strAdd[1]);
"\n double digit, add = ".intval($strAdd[0]).' + '.intval($strAdd[1]).' = '.$add;
}
}
echo "\n old sum = $sum";
echo "\n add = $add";
$sum += $add;
echo "\n new sum = $sum";
echo "\n ----";
}

echo "\n ($sum + $check) % $divider= ".($sum + $check) % $divider;

return 0 === ($sum + $check) % $divider;
}

@@ -101,35 +88,24 @@ public static function LuhnWithWeights(string $value, int $length, array $weight
$digits = substr($value, 0, $length - 1);
$check = substr($value, $length - 1, 1);
$expr = sprintf('/\\d{%d}/i', $length);
// echo "\n ------------------------------------------";
// echo "\n val=$value";
// echo "\n digit=$digits";
// echo "\n check=$check";
if (!preg_match($expr, $value)) {
return false;
}

$sum = 0;
for ($i = 0; $i < strlen($digits); ++$i) {
if (!is_numeric($digits[$i])) {
// echo "\n" . $digits[$i] . " is not an int";
return false;
}
// echo "\n" . $weights[$i] . " * " . intval($digits[$i]) . " = " . $weights[$i] * intval($digits[$i]);
$sum += $weights[$i] * intval($digits[$i]);
// echo "\n new sum is $sum";
}

$rest = $sum % $divider;

if (0 === $rest) {
// echo "\n rest is zero";
$check = $divider;
}

// echo "\n for value $value, rest = " . $rest;
// echo "\n IF check $check === divider $divider - rest $rest, all good";

return intval($check) === $divider - $rest;
}
}

0 comments on commit eba932c

Please sign in to comment.