Merge branch '5.1'

CHANGELOG.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+## 5.1.24
+
+Released: 2023-02-19
+
+### 🐛 Bug fixes
+
+ - Fixed thumbnail sizes, which did not fit because of a incomplete RegEx replace #3411
+ - Fix default thumbnail crop config #3403
+ - Update `UserFixtures.php`
+ - Strict use of strings as keys in TaxonomyFixtures #3415
+
+
 ## 5.1.23
 
 Released: 2023-02-03

assets/js/version.js

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '5.1.99.12';
+export const version = '5.1.99.13';

package.json

@@ -1,6 +1,6 @@
 {
     "name": "bolt",
-    "version": "5.1.99.12",
+    "version": "5.1.99.13",
     "homepage": "https://boltcms.io",
     "author": "Bob den Otter <[email protected]> (https://boltcms.io)",
     "license": "MIT",

src/DataFixtures/TaxonomyFixtures.php

@@ -51,13 +51,13 @@ private function loadTaxonomies(ObjectManager $manager): void
             foreach ($options as $key => $value) {
                 $taxonomy = $this->taxonomyRepository->factory(
                     $taxonomyDefinition['slug'],
-                    $key,
+                    (string) $key,
                     $value,
                     $taxonomyDefinition['has_sortorder'] ? $order++ : 0
                 );
 
                 $manager->persist($taxonomy);
-                $reference = 'taxonomy_' . $taxonomyDefinition['slug'] . '_' . Str::slug($key);
+                $reference = 'taxonomy_' . $taxonomyDefinition['slug'] . '_' . Str::slug((string) $key);
                 $this->addReference($reference, $taxonomy);
             }
         }

src/DataFixtures/UserFixtures.php

@@ -92,48 +92,50 @@ private function getUserData(): array
             [
                 'displayname' => 'Admin',
                 'username' => 'admin',
-                'password' => $this->append ? Str::generatePassword(10) : 'admin%1',
+                'password' => $this->append ? Str::generatePassword(12) : 'admin%1',
                 'email' => '[email protected]',
                 'roles' => ['ROLE_DEVELOPER', 'ROLE_WEBSERVICE'],
                 'status' => UserStatus::ENABLED,
             ],
             [
                 'displayname' => 'Crazy Steve',
                 'username' => 'steve',
-                'password' => $this->append ? Str::generatePassword(10) : 'steve%1',
+                'password' => Str::generatePassword(12),
                 'email' => '[email protected]',
                 'roles' => ['ROLE_EDITOR', 'ROLE_EXTRA_1', 'ROLE_EXTRA_2', 'ROLE_USER_FRONTEND_GROUP1'],
+                'status' => UserStatus::DISABLED,
             ],
             [
                 'displayname' => 'Jane Doe',
                 'username' => 'jane_chief',
-                'password' => $this->append ? Str::generatePassword(10) : 'jane%1',
+                'password' => Str::generatePassword(12),
                 'email' => '[email protected]',
                 'roles' => ['ROLE_CHIEF_EDITOR'],
-                'status' => UserStatus::ENABLED,
+                'status' => UserStatus::DISABLED,
             ],
             [
                 'displayname' => 'Tom Doe',
                 'username' => 'tom_admin',
-                'password' => $this->append ? Str::generatePassword(10) : 'tom%1',
+                'password' => Str::generatePassword(12),
                 'email' => '[email protected]',
                 'roles' => ['ROLE_ADMIN'],
+                'status' => UserStatus::DISABLED,
             ],
             [
                 'displayname' => 'John Doe',
                 'username' => 'john_editor',
-                'password' => $this->append ? Str::generatePassword(10) : 'john%1',
+                'password' => Str::generatePassword(12),
                 'email' => '[email protected]',
                 'roles' => ['ROLE_EDITOR'],
-                'status' => UserStatus::ENABLED,
+                'status' => UserStatus::DISABLED,
             ],
             [
                 'displayname' => 'Eddie Enduser',
                 'username' => 'eddie',
-                'password' => $this->append ? Str::generatePassword(10) : 'eddie%1',
+                'password' => Str::generatePassword(12),
                 'email' => '[email protected]',
                 'roles' => ['ROLE_USER'],
-                'status' => UserStatus::ENABLED,
+                'status' => UserStatus::DISABLED,
             ],
         ];
     }

src/Version.php

@@ -23,7 +23,7 @@ final class Version
      *   Stable — 3.0.0
      *   Development — 3.1.0 alpha 1
      */
-    public const VERSION = '5.2.0 beta 12';
+    public const VERSION = '5.2.0 beta 13';
     public const CODENAME = '';
 
     /**