Merge remote-tracking branch 'origin/master' into php8

lib/Data/Filesystem.php

@@ -229,11 +229,10 @@ class Filesystem extends AbstractData
 
                     // Store in array
                     $key            = $this->getOpenSlot(
-                        $comments, (
-                            (int) array_key_exists('created', $comment['meta']) ?
-                            $comment['meta']['created'] : // v2 comments
-                            $comment['meta']['postdate'] // v1 comments
-                        )
+                        $comments,
+                        (int) array_key_exists('created', $comment['meta']) ?
+                        $comment['meta']['created'] : // v2 comments
+                        $comment['meta']['postdate']  // v1 comments
                     );
                     $comments[$key] = $comment;
                 }

lib/Filter.php

@@ -66,6 +66,6 @@ class Filter
             $size = $size / 1024;
             ++$i;
         }
-        return number_format($size, ($i ? 2 : 0), '.', ' ') . ' ' . I18n::_($iec[$i]);
+        return number_format($size, $i ? 2 : 0, '.', ' ') . ' ' . I18n::_($iec[$i]);
     }
 }

lib/I18n.php

@@ -339,8 +339,8 @@ class I18n
                 return $n % 10 === 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
             case 'sl':
                 return $n % 100 === 1 ? 1 : ($n % 100 === 2 ? 2 : ($n % 100 === 3 || $n % 100 === 4 ? 3 : 0));
-            // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt
             default:
+                // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt
                 return $n !== 1 ? 1 : 0;
         }
     }

lib/Request.php

@@ -225,7 +225,7 @@ class Request
         return array_key_exists('REQUEST_URI', $_SERVER) ?
         htmlspecialchars(
             parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-            ) : '/';
+        ) : '/';
     }
 
     /**

lib/Vizhash16x16.php

@@ -185,9 +185,9 @@ class Vizhash16x16
             $sizeinv = imagesx($img);
         }
         $diffs = array(
-            (($color2[0] - $color1[0]) / $size),
-            (($color2[1] - $color1[1]) / $size),
-            (($color2[2] - $color1[2]) / $size),
+            ($color2[0] - $color1[0]) / $size,
+            ($color2[1] - $color1[1]) / $size,
+            ($color2[2] - $color1[2]) / $size,
         );
         for ($i = 0; $i < $size; ++$i) {
             $r = $color1[0] + ($diffs[0] * $i);

tst/Bootstrap.php

@@ -196,10 +196,10 @@ class BucketStub extends Bucket
         $prefix = key_exists('prefix', $options) ? $options['prefix'] : '';
 
         return new CallbackFilterIterator(
-                new ArrayIterator($this->_objects),
-                function ($current, $key, $iterator) use ($prefix) {
-                    return substr($key, 0, strlen($prefix)) == $prefix;
-                }
+            new ArrayIterator($this->_objects),
+            function ($current, $key, $iterator) use ($prefix) {
+                return substr($key, 0, strlen($prefix)) == $prefix;
+            }
         );
     }
 

tst/JsonApiTest.php

@@ -196,10 +196,10 @@ class JsonApiTest extends TestCase
         $content = ob_get_contents();
         ob_end_clean();
         $this->assertEquals(str_replace(
-                '?jsonld=',
-                '/?jsonld=',
-                file_get_contents(PUBLIC_PATH . '/js/paste.jsonld')
-            ), $content, 'outputs data correctly');
+            '?jsonld=',
+            '/?jsonld=',
+            file_get_contents(PUBLIC_PATH . '/js/paste.jsonld')
+        ), $content, 'outputs data correctly');
     }
 
     /**
@@ -213,10 +213,10 @@ class JsonApiTest extends TestCase
         $content = ob_get_contents();
         ob_end_clean();
         $this->assertEquals(str_replace(
-                '?jsonld=',
-                '/?jsonld=',
-                file_get_contents(PUBLIC_PATH . '/js/comment.jsonld')
-            ), $content, 'outputs data correctly');
+            '?jsonld=',
+            '/?jsonld=',
+            file_get_contents(PUBLIC_PATH . '/js/comment.jsonld')
+        ), $content, 'outputs data correctly');
     }
 
     /**
@@ -230,10 +230,10 @@ class JsonApiTest extends TestCase
         $content = ob_get_contents();
         ob_end_clean();
         $this->assertEquals(str_replace(
-                '?jsonld=',
-                '/?jsonld=',
-                file_get_contents(PUBLIC_PATH . '/js/pastemeta.jsonld')
-            ), $content, 'outputs data correctly');
+            '?jsonld=',
+            '/?jsonld=',
+            file_get_contents(PUBLIC_PATH . '/js/pastemeta.jsonld')
+        ), $content, 'outputs data correctly');
     }
 
     /**
@@ -247,10 +247,10 @@ class JsonApiTest extends TestCase
         $content = ob_get_contents();
         ob_end_clean();
         $this->assertEquals(str_replace(
-                '?jsonld=',
-                '/?jsonld=',
-                file_get_contents(PUBLIC_PATH . '/js/commentmeta.jsonld')
-            ), $content, 'outputs data correctly');
+            '?jsonld=',
+            '/?jsonld=',
+            file_get_contents(PUBLIC_PATH . '/js/commentmeta.jsonld')
+        ), $content, 'outputs data correctly');
     }
 
     /**
@@ -264,10 +264,10 @@ class JsonApiTest extends TestCase
         $content = ob_get_contents();
         ob_end_clean();
         $this->assertEquals(str_replace(
-                '?jsonld=',
-                '/?jsonld=',
-                file_get_contents(PUBLIC_PATH . '/js/types.jsonld')
-            ), $content, 'outputs data correctly');
+            '?jsonld=',
+            '/?jsonld=',
+            file_get_contents(PUBLIC_PATH . '/js/types.jsonld')
+        ), $content, 'outputs data correctly');
     }
 
     /**