Sanatize.php: rewrote normalizeArray() to normalize() to support any type array and type string.

Store.php: Update function name
SanatizeTest.php: Update function name, extend tests to more situations.

extension/qfq/qfq/helper/Sanitize.php

@@ -185,23 +185,24 @@ class Sanitize {
      * It's important to normalize the user input: e.g. someone is searching for a record and input the search string
      * with composed characters.
      *
-     * @param array $arr
-     * @return array
-     * @throws \qfq\CodeException
+     * @param array|string $item
+     * @return array|string
+     * @throws CodeException
      */
-    public static function normalizeArray(array $arr) {
-
-        foreach ($arr as $key => $value) {
-            if (is_string($value)) {
-                $value = \normalizer::normalize($value);
-            } elseif (is_array($value)) {
-                $value = self::normalizeArray($value);
-            } elseif (!is_numeric($value)) {
+    public static function normalize($item) {
+
+        if (is_array($item)) {
+            foreach ($item as $key => $value) {
+                $value = self::normalize($value);
+                $item[$key] = $value;
+            }
+        } else {
+            if (is_string($item)) {
+                $item = \normalizer::normalize($item, \Normalizer::FORM_C);
+            } elseif (!is_numeric($item)) {
                 throw new qfq\CodeException ("Expect type 'string / numeric / array' - but there is something else.", ERROR_UNEXPECTED_TYPE);
             }
-            $arr[$key] = $value;
         }
-
-        return $arr;
+        return $item;
     }
 }
\ No newline at end of file

extension/qfq/qfq/store/Store.php

@@ -386,9 +386,10 @@ class Store {
         if (isset($_SERVER))
             $arr = array_merge($arr, $_SERVER);
 
-        $arr = \qfq\Sanitize::normalizeArray($arr);
+        $arr = \qfq\Sanitize::normalize($arr);
 
         self::setVarArray($arr, STORE_CLIENT, true);
+
     }
 
     /**

extension/qfq/tests/phpunit/SanitizeTest.php

@@ -271,32 +271,57 @@ class SanitizeTest extends \PHPUnit_Framework_TestCase {
      *
      * @throws CodeException
      */
-    public function testNormalizeArray() {
+    public function testNormalize() {
 
-        $arr = ['key a' => 'value a',
-            'key b' => 'value b',
-            'key c' => 'value c',
-            'key d' => 123.4567,
-        ];
+        // Nothing changed
+        $char_A_ring = "\xC3\x85"; // 'LATIN CAPITAL LETTER 'A' WITH RING ABOVE' (U+00C5)
+        $this->assertEquals($char_A_ring, Sanitize::normalize($char_A_ring), "'A' with ring above");
 
-        // create a subarray
-        $arr['sub'] = $arr;
+        // Convert "\xCC\x8A" to  "\xC3\x85"
+        $char_combining_ring_above = 'A' . "\xCC\x8A";  // 'COMBINING RING ABOVE' (U+030A)
+        $this->assertEquals($char_A_ring, Sanitize::normalize($char_combining_ring_above), "Combined 'A' with ring above");
 
-        // create a sub subarray
-        $arr['subsub'] = $arr;
+        $in = [$char_A_ring, $char_combining_ring_above, $char_A_ring];
+        $out = [$char_A_ring, $char_A_ring, $char_A_ring];
+        $this->assertEquals($out, Sanitize::normalize($in), "Combined 'A' with ring above");
 
-        $this->assertEquals($arr, Sanitize::normalizeArray($arr), 'Check string, numeric, array, subarray');
+        $value = 0;
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
 
-        // Nothing changed
-        $char_A_ring = "\xC3\x85"; // 'LATIN CAPITAL LETTER A WITH RING ABOVE' (U+00C5)
-        $this->assertEquals($char_A_ring, Sanitize::normalizeArray($char_A_ring), "'A' with ring above");
+        $value = '';
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
 
-        // Convert "\xCC\x8A" to  "\xC3\x85"
-        $char_combining_ring_above = "\xCC\x8A";  // 'COMBINING RING ABOVE' (U+030A)
-        $this->assertEquals($char_A_ring, Sanitize::normalizeArray($char_combining_ring_above), "Combined 'A' with ring above");
+        $value = 'string';
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
 
+        $value = 123.45;
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
 
-    }
+        $value = ['string', 'second'];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+
+        $value = ['string', 'second', 123.45];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
 
+        $value = ['string', 0, ''];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+
+        $value = ['a' => 'string', 'b' => 'second'];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+
+        $value = ['a' => 'string', 'b' => 'second', 'c' => 123.45];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+
+        $value = ['a' => 'string', 'b' => 0, 'c' => ''];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+
+        // subarray
+        $value = [$value, 'a' => 'string', 'b' => 0, 'c' => ''];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+
+        // sub sub array
+        $value = [$value, 'a' => 'string', 'b' => 0, 'c' => ''];
+        $this->assertEquals($value, Sanitize::normalize($value), 'Check simple string');
+    }
 
 }

less/qfq-bs.css.less

@@ -91,6 +91,12 @@ i.@{spinner_class} {
   margin-bottom: 0;
 }
 
+/* adjust BS padding: Filename (=Text) of the uploaded file should be on the same base line as the label text left of it. */
+.uploaded-file {
+  padding-top: 4px;
+}
+
+
 .qfq-color-white {
   background-color: #ffffff;
 }
@@ -116,10 +122,6 @@ i.@{spinner_class} {
   padding-right: 0;
 }
 
-.uploaded-file {
-  padding-top: 4px;
-}
-
 // Mit BB anschauen wie man die NOTE Felder formatiert
 //
 //.text-input {