Merge remote-tracking branch 'upstream/develop' into 4.4

Author: kenjis

.php-cs-fixer.user-guide.php

@@ -37,7 +37,7 @@
 ];
 
 $options = [
-    'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
+    'cacheFile' => 'build/.php-cs-fixer.user-guide.cache',
     'finder'    => $finder,
 ];
 

system/Common.php

@@ -1008,10 +1008,8 @@ function session(?string $val = null)
      *  - $timer = \CodeIgniter\Config\Services::timer();
      *
      * @param array|bool|float|int|object|string|null ...$params
-     *
-     * @return object
      */
-    function service(string $name, ...$params)
+    function service(string $name, ...$params): ?object
     {
         return Services::$name(...$params);
     }
@@ -1022,10 +1020,8 @@ function service(string $name, ...$params)
      * Always returns a new instance of the class.
      *
      * @param array|bool|float|int|object|string|null ...$params
-     *
-     * @return object|null
      */
-    function single_service(string $name, ...$params)
+    function single_service(string $name, ...$params): ?object
     {
         $service = Services::serviceExists($name);