Upgrade to Filament 4/5, Laravel 12/13 and PHP 8.3+

.github/workflows/ISSUE_TEMPLATE/config.yml

@@ -1,14 +1,14 @@
 blank_issues_enabled: false
 contact_links:
   - name: Feature request
-    url: https://github.com/codedor/filament-form-architect/discussions/new?category=ideas
+    url: https://github.com/wotz/filament-form-architect/discussions/new?category=ideas
     about: Share ideas for new features
   - name: Support question
-    url: https://github.com/codedor/filament-form-architect/discussions/new?category=q-a
+    url: https://github.com/wotz/filament-form-architect/discussions/new?category=q-a
     about: Ask the community for help
   - name: Report a security issue
-    url: https://github.com/codedor/filament-form-architect/README.md#security
+    url: https://github.com/wotz/filament-form-architect/README.md#security
     about: Learn how to notify us for sensitive bugs
   - name: Report a bug
-    url: https://github.com/codedor/filament-form-architect/issues/new
+    url: https://github.com/wotz/filament-form-architect/issues/new
     about: Report a reproducable bug

.github/workflows/phpstan.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.4"
           coverage: none
 
       - name: Install composer dependencies

.github/workflows/run-tests.yml

@@ -13,8 +13,8 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.2, 8.3]
-        laravel: [10.*]
+        php: [8.3, 8.4, 8.5]
+        laravel: [12.*, 13.*]
         stability: [prefer-stable]
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-info@codedor.be.
+info@whoownsthezebra.be.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

CONTRIBUTING.md

@@ -45,7 +45,7 @@ Some things to consider before submitting an issue
 
 ## Coding style
 
-See our [guidelines](https://guidelines.codedor.be/coding-standards/php).
+See our [guidelines](https://guidelines.whoownsthezebra.be/coding-standards/php).
 
 ### Laravel Pint
 

README.md

@@ -9,7 +9,7 @@ This is where your description should go. Limit it to a paragraph or two. Consid
 You can install the package via composer:
 
 ```bash
-composer require codedor/filament-form-architect
+composer require wotz/filament-form-architect
 ```
 
 You can publish and run the migrations with:
@@ -30,8 +30,8 @@ This is the contents of the published config file:
 ```php
 return [
     'default-blocks' => [
-        \Codedor\FormArchitect\Architect\RadioButtonBlock::class,
-        \Codedor\FormArchitect\Architect\TextInputBlock::class,
+        \Wotz\FormArchitect\Architect\RadioButtonBlock::class,
+        \Wotz\FormArchitect\Architect\TextInputBlock::class,
     ],
 ];
 ```
@@ -66,7 +66,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ## Security Vulnerabilities
 
-If you discover any security-related issues, please email info@codedor.be instead of using the issue tracker.
+If you discover any security-related issues, please email info@whoownsthezebra.be instead of using the issue tracker.
 
 ## License
 

UPGRADING.md

@@ -1,3 +1,23 @@
 # Upgrading
 
-## From vx to vy
+## From v1 to v2
+
+v2 moves the package to the wotzebra organisation, targets Filament 4/5,
+Laravel 12/13 and PHP 8.3+, and swaps the `codedor/*` dependencies for their
+`wotz/*` successors.
+
+- Install `wotz/filament-form-architect` instead of `codedor/filament-form-architect`.
+- Replace all occurrences of the `Codedor\FormArchitect` namespace with the new
+  `Wotz\FormArchitect` namespace.
+- If your project references classes of the underlying `codedor/*` packages
+  directly, replace their `Codedor\` namespace prefix with `Wotz\` as well
+  (e.g. `Codedor\LivewireForms\...` becomes `Wotz\LivewireForms\...`).
+- `awcodes/filament-tiptap-editor` has been replaced by Filament's native
+  `RichEditor`. The `checkbox-tiptap-profile` config key has been renamed to
+  `checkbox-toolbar-buttons` and now takes an array of RichEditor toolbar buttons
+  (default: `['bold', 'italic', 'link']`).
+- `guava/filament-drafts` was an unused dependency and has been dropped.
+- The `Wotz\TranslatableTabs\Resources\Traits\HasTranslations` page trait no longer
+  exists; wotz/filament-translatable-tabs v3 handles translations through the schema
+  lifecycle. If your project used it on custom Create/Edit pages, delete the `use`
+  statement.

composer.json

@@ -1,54 +1,54 @@
 {
-    "name": "codedor/filament-form-architect",
+    "name": "wotz/filament-form-architect",
     "description": "Build beautiful forms together with our Architect package",
     "keywords": [
-        "codedor",
+        "who owns the zebra",
         "laravel",
         "filament-form-architect"
     ],
-    "homepage": "https://github.com/codedor/filament-form-architect",
+    "homepage": "https://github.com/wotz/filament-form-architect",
     "license": "MIT",
     "require": {
-        "php": "^8.2",
-        "awcodes/filament-tiptap-editor": "^3.2",
-        "codedor/filament-architect": "^1.0|^2.0",
-        "codedor/filament-mail-templates": "^1.1",
-        "codedor/filament-translatable-strings": "^1.0",
-        "codedor/laravel-livewire-forms": "^4.0",
-        "codedor/laravel-locale-collection": "^1.1",
-        "filament/filament": "^3.1",
-        "guava/filament-drafts": "^2.1",
-        "maatwebsite/excel": "^3.1",
-        "illuminate/contracts": "^10.0|^11.0",
-        "spatie/laravel-package-tools": "^1.12"
+        "php": "^8.3",
+        "filament/filament": "^4.0|^5.0",
+        "illuminate/contracts": "^12.0|^13.0",
+        "maatwebsite/excel": "^4.0",
+        "spatie/laravel-package-tools": "^1.12",
+        "wotz/filament-architect": "^3.0",
+        "wotz/filament-mail-templates": "^2.0",
+        "wotz/filament-media-library": "^4.0",
+        "wotz/filament-translatable-strings": "^3.0",
+        "wotz/filament-translatable-tabs": "^3.0",
+        "wotz/laravel-livewire-forms": "^5.0",
+        "wotz/laravel-locale-collection": "^2.0"
     },
     "require-dev": {
+        "larastan/larastan": "^3.0",
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.0|^8.0",
-        "larastan/larastan": "^2.0",
-        "orchestra/testbench": "^8.0|^9.0",
-        "pestphp/pest": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
-        "pestphp/pest-plugin-livewire": "^2.1",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0"
+        "nunomaduro/collision": "^8.0",
+        "orchestra/testbench": "^10.0|^11.0",
+        "pestphp/pest": "^4.0",
+        "pestphp/pest-plugin-laravel": "^4.0",
+        "pestphp/pest-plugin-livewire": "^4.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {
-            "Codedor\\FormArchitect\\": "src",
-            "Codedor\\FormArchitect\\Database\\Factories\\": "database/factories"
+            "Wotz\\FormArchitect\\": "src",
+            "Wotz\\FormArchitect\\Database\\Factories\\": "database/factories"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Codedor\\FormArchitect\\Tests\\": "tests"
+            "Wotz\\FormArchitect\\Tests\\": "tests"
         }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Codedor\\FormArchitect\\Providers\\FormArchitectServiceProvider"
+                "Wotz\\FormArchitect\\Providers\\FormArchitectServiceProvider"
             ]
         }
     },

config/filament-form-architect.php

@@ -1,6 +1,6 @@
 <?php
 
-use Codedor\FormArchitect\Architect;
+use Wotz\FormArchitect\Architect;
 
 return [
     'enable-submission-field' => false,
@@ -18,5 +18,5 @@
         Architect\TextInputBlock::class => [],
         Architect\TitleBlock::class => [],
     ],
-    'checkbox-tiptap-profile' => 'minimal',
+    'checkbox-toolbar-buttons' => ['bold', 'italic', 'link'],
 ];

database/factories/FormFactory.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Codedor\FormArchitect\Database\Factories;
+namespace Wotz\FormArchitect\Database\Factories;
 
-use Codedor\FormArchitect\Models\Form;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Wotz\FormArchitect\Models\Form;
 
 class FormFactory extends Factory
 {

database/seeders/FormSeeder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Codedor\FormArchitect\Database\Seeders;
+namespace Wotz\FormArchitect\Database\Seeders;
 
 use Illuminate\Database\Seeder;
 

docs/index.md

@@ -2,14 +2,14 @@
 
 ## Introduction
 
-Form Architect allows you to build forms in your Filament panel using the [codedor/filament-architect](https://github.com/codedor/filament-architect) package.
+Form Architect allows you to build forms in your Filament panel using the [codedor/filament-architect](https://github.com/wotzebra/filament-architect) package.
 
 ## Installation
 
 You can install the package via composer:
 
 ```bash
-composer require codedor/filament-form-architect
+composer require wotz/filament-form-architect
 ```
 
 You can publish (optional) and run the migrations with:
@@ -40,15 +40,15 @@ public function panel(Panel $panel): Panel
 {
     return $panel
         ->plugins([
-            \Codedor\FormArchitect\Filament\FormArchitectPlugin::make(),
+            \Wotz\FormArchitect\Filament\FormArchitectPlugin::make(),
         ]);
     }
 
 ```
 
 ## Creating a block/field
 
-See our [Architect](https://github.com/codedor/filament-architect) package for how to create new blocks.
+See our [Architect](https://github.com/wotzebra/filament-architect) package for how to create new blocks.
 
 The only difference here is that we have a `toLivewireForm` function instead of a `render` function, which returns the Livewire form component.
 
@@ -87,7 +87,7 @@ public static function toExcelExport(mixed $value): string
 This package has a couple of config values:
 
 ```php
-use Codedor\FormArchitect\Architect;
+use Wotz\FormArchitect\Architect;
 
 return [
     'enable-submission-field' => false,
@@ -118,7 +118,7 @@ This configures the default attributes for the row block. For example the `divCl
 
 ### default-blocks
 
-This configures which blocks will be used in the form builder, see our [Architect](https://github.com/codedor/filament-architect) package for more information about blocks.
+This configures which blocks will be used in the form builder, see our [Architect](https://github.com/wotzebra/filament-architect) package for more information about blocks.
 
 A slight difference with the normal Architect blocks is that we can pass an array per block, which will be used as the default attributes for that block. For example:
 
@@ -132,7 +132,7 @@ A slight difference with the normal Architect blocks is that we can pass an arra
 ],
 ```
 
-See our [Livewire Forms](https://github.com/codedor/laravel-livewire-forms) package for an overview of available attributes.
+See our [Livewire Forms](https://github.com/wotzebra/laravel-livewire-forms) package for an overview of available attributes.
 
 ### checkbox-tiptap-profile
 

phpstan.neon.dist

@@ -8,7 +8,5 @@ parameters:
         - config
         - database
     tmpDir: build/phpstan
-    checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
 

phpunit.xml.dist

@@ -1,26 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
-  <testsuites>
-    <testsuite name="Codedor Test Suite">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
-  <coverage>
-    <report>
-      <html outputDirectory="build/coverage"/>
-      <text outputFile="build/coverage.txt"/>
-      <clover outputFile="build/logs/clover.xml"/>
-    </report>
-  </coverage>
-  <logging>
-    <junit outputFile="build/report.junit.xml"/>
-  </logging>
-  <php>
-    <server name="APP_KEY" value="base64:llrAPMQL0x08EHCBwf/UkOqptL7p/SXkcTnY2znWurE="/>
-  </php>
-  <source>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-  </source>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         executionOrder="random"
+         failOnWarning="true"
+         failOnRisky="true"
+         failOnEmptyTestSuite="true"
+         beStrictAboutOutputDuringTests="true"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+>
+    <testsuites>
+        <testsuite name="Wotz Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <server name="APP_KEY" value="base64:llrAPMQL0x08EHCBwf/UkOqptL7p/SXkcTnY2znWurE="/>
+    </php>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>

resources/views/livewire/rendered-form.blade.php

@@ -1,7 +1,7 @@
 <div>
-    @if ($formModel->allowSubmissions())
+    @if ($formModel?->allowSubmissions())
         @include('livewire-forms::form')
     @else
-        {!! $formModel->getMaxSubmissionMessage() !!}
+        {!! $formModel?->getMaxSubmissionMessage() !!}
     @endif
 </div>

src/Architect/BaseFormBlock.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Codedor\FormArchitect\Architect;
+namespace Wotz\FormArchitect\Architect;
 
-use Codedor\FilamentArchitect\Filament\Architect\BaseBlock;
+use Wotz\FilamentArchitect\Filament\Architect\BaseBlock;
 
 class BaseFormBlock extends BaseBlock
 {