Merge pull request #33 from sprain/php-7.4

Add support for PHP 7.4

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 env:
   matrix:

composer.json

@@ -7,6 +7,7 @@
         "php": ">=7.1",
         "symfony/validator": "^3.4|^4.2",
         "symfony/intl": "^3.4|^4.2",
+        "khanamiryan/qrcode-detector-decoder": "^1.0.3",
         "kmukku/php-iso11649": "^1.4",
         "endroid/qr-code": "^3.5.3"
     },

phpunit.xml.dist

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" colors="true">
+<phpunit
+        bootstrap = "vendor/autoload.php"
+        colors = "true"
+        convertDeprecationsToExceptions = "false"
+>
+    <php>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+    </php>
+
     <testsuites>
         <testsuite name="Swiss Qr Bill Test Suite">
             <directory>tests</directory>

src/Constraint/ValidCreditorReferenceValidator.php

@@ -14,6 +14,16 @@ public function validate($value, Constraint $constraint)
             return;
         }
 
+        // Catch any invalid characters which are not allowed in ISO11649
+        // (but may not be caught by the underlying library)
+        if (!preg_match('/^[\w ]*$/', $value)) {
+            $this->context->buildViolation($constraint->message)
+                ->setParameter('{{ string }}', $value)
+                ->addViolation();
+
+            return;
+        }
+
         $referenceGenerator = new phpIso11649();
 
         if (false === $referenceGenerator->validateRfReference($value)) {

tests/Constraint/ValidCreditorReferenceTest.php

@@ -64,6 +64,7 @@ public function getInvalidCreditorReferences()
         return [
             ['RF43 1234 5123 45'],
             ['RF431234512345'],
+            ['RF431234512345Ä'],
             ['foo']
         ];
     }