Fix some bugs that occur when setting up a new Craft 6 project

Author: riasvdv

routes/actions.php

@@ -140,7 +140,7 @@
 
         // Entry Types
         Route::get('entry-types/table-data', [EntryTypesController::class, 'tableData']);
-        Route::get('entry-types/edit/{entryType}', [EntryTypesController::class, 'edit']);
+        Route::get('entry-types/edit/{entryType?}', [EntryTypesController::class, 'edit']);
         Route::middleware([
             RequireAdminChanges::class,
         ])->group(function () {

src/Http/Controllers/FieldsController.php

@@ -73,7 +73,9 @@ public function edit(Request $request, ?FieldInterface $field = null, ?int $fiel
     {
         $fieldId ??= $field->id ?? $request->input('fieldId');
 
-        abort_if(is_null($fieldId), 404, 'Field not found');
+        if (is_null($fieldId)) {
+            return $this->create();
+        }
 
         abort_if(is_null($found = $this->fieldsService->getFieldById((int) $fieldId)), 404, 'Field not found');
 

src/Http/Controllers/Settings/EntryTypesController.php

@@ -88,8 +88,12 @@ public function create(): CpScreenResponse
             ]);
     }
 
-    public function edit(EntryTypeModel $entryType): CpScreenResponse
+    public function edit(Request $request, ?EntryTypeModel $entryType = null): CpScreenResponse
     {
+        $entryType ??= EntryTypeModel::find($request->input('entryTypeId'));
+
+        abort_if(is_null($entryType), 404, 'Entry type not found');
+
         $entryTypeData = $this->entryTypes->getEntryTypeById($entryType->id);
 
         abort_if(is_null($entryTypeData), 404, 'Entry type not found');

yii2-adapter/legacy/services/Categories.php

@@ -28,6 +28,7 @@
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\Support\Facades\Structures;
 use CraftCms\Cms\Support\Str;
+use CraftCms\Yii2Adapter\Yii2ServiceProvider;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -122,6 +123,12 @@ public function getEditableGroupIds(): array
     private function _groups(): MemoizableArray
     {
         if (!isset($this->_groups)) {
+            if (!Yii2ServiceProvider::supportsCategories()) {
+                $this->_groups = new MemoizableArray([]);
+
+                return $this->_groups;
+            }
+
             $groupRecords = CategoryGroupRecord::find()
                 ->orderBy(['name' => SORT_ASC])
                 ->with('structure')

yii2-adapter/src/Yii2ServiceProvider.php

@@ -357,7 +357,7 @@ public function boot(): void
          * Load Craft when necessary
          */
         spl_autoload_register(function($class) {
-            if ($class === 'Craft') {
+            if ($class === 'Craft' || $class === 'Yii') {
                 app('Craft');
             }
         });