Merge remote-tracking branch 'origin/master' into cake5-recover

# Conflicts:
#	src/Utility/DateTime.php
#	src/Utility/Time.php
#	src/View/Helper/TimelineHelper.php

.github/workflows/ci.yml

@@ -56,7 +56,7 @@ jobs:
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
         restore-keys: ${{ runner.os }}-composer-
 
-    - name: Composer install --no-progress --prefer-dist --optimize-autoloader
+    - name: Composer install
       run: |
         composer --version
         if ${{ matrix.prefer-lowest == 'prefer-lowest' }}

docs/Helper/Icon.md

@@ -24,7 +24,7 @@ E.g.
 ```php
 'Icon' => [
     'sets' => [
-        'bs' => \Tools\View\Icon\BoostrapIcon::class,
+        'bs' => \Tools\View\Icon\BootstrapIcon::class,
         ...
     ],
 ],

src/Utility/DateTime.php

@@ -4,6 +4,9 @@ namespace Tools\Utility;
 
 use Cake\Core\Configure;
 use Cake\I18n\Date as CakeDate;
+
+use Cake\Core\Configure;
+use Cake\I18n\Date as CakeDate;
 use Cake\I18n\DateTime as CakeDateTime;
 use DateInterval;
 use DateTime as NativeDateTime;
@@ -1294,8 +1297,8 @@ class DateTime extends CakeDateTime {
 	 */
 	public static function duration($duration, $format = '%h:%I:%S') {
 		if (!$duration instanceof DateInterval) {
-			$d1 = new self();
-			$d2 = new self();
+			$d1 = new CakeDateTime();
+			$d2 = new CakeDateTime();
 			$d2 = $d2->add(new DateInterval('PT' . $duration . 'S'));
 
 			$duration = $d2->diff($d1);