From 04eaaa97a4a92cf90d43e02872c25c54e40872e4 Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Sat, 31 Jan 2026 17:27:22 -0500 Subject: [PATCH 1/5] Replace modular with modularize package and update imports --- composer.json | 3 ++- src/Commands/MakeVerbEventCommand.php | 6 ++---- src/Commands/MakeVerbStateCommand.php | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 940b4a8e..ecada674 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "php": ">=8.1", "glhd/bits": ">=0.3.0", "illuminate/contracts": "^10.34|^11.0|^12.0", - "internachi/modular": "^2.0", + "internachi/modularize": "^1.0", "laravel/prompts": "^0.1.15|^0.2|^0.3", "spatie/laravel-package-tools": "^1.14.0", "symfony/property-access": "^6.2|^7.0", @@ -28,6 +28,7 @@ }, "require-dev": { "brick/money": "^0.8.1|^0.10", + "internachi/modular": "^2.3", "laravel/pint": "^1.13", "mockery/mockery": "^1.6", "nunomaduro/collision": "^7.10|^8.1", diff --git a/src/Commands/MakeVerbEventCommand.php b/src/Commands/MakeVerbEventCommand.php index 9a170c8f..e9859a66 100644 --- a/src/Commands/MakeVerbEventCommand.php +++ b/src/Commands/MakeVerbEventCommand.php @@ -2,15 +2,13 @@ namespace Thunk\Verbs\Commands; -use InterNACHI\Modular\Console\Commands\Make\Modularize; +use InterNACHI\Modularize\Modularize; use Symfony\Component\Console\Attribute\AsCommand; #[AsCommand(name: 'verbs:event')] class MakeVerbEventCommand extends VerbGeneratorCommand { - use Modularize { - getDefaultNamespace as getModularizedNamespace; - } + use Modularize; protected $name = 'verbs:event'; diff --git a/src/Commands/MakeVerbStateCommand.php b/src/Commands/MakeVerbStateCommand.php index 400e9b45..e54c05ac 100644 --- a/src/Commands/MakeVerbStateCommand.php +++ b/src/Commands/MakeVerbStateCommand.php @@ -2,7 +2,7 @@ namespace Thunk\Verbs\Commands; -use InterNACHI\Modular\Console\Commands\Make\Modularize; +use InterNACHI\Modularize\Modularize; use Symfony\Component\Console\Attribute\AsCommand; #[AsCommand(name: 'verbs:state')] From eaad548065cf98f4e9e63322057b53cb899dfcd8 Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Sat, 31 Jan 2026 17:53:25 -0500 Subject: [PATCH 2/5] Bump internachi/modularize from ^1.0 to ^1.1.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ecada674..3b5fca96 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "php": ">=8.1", "glhd/bits": ">=0.3.0", "illuminate/contracts": "^10.34|^11.0|^12.0", - "internachi/modularize": "^1.0", + "internachi/modularize": "^1.1.0", "laravel/prompts": "^0.1.15|^0.2|^0.3", "spatie/laravel-package-tools": "^1.14.0", "symfony/property-access": "^6.2|^7.0", From 596263caa80167a83019923df0a1671074ef1144 Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Sat, 31 Jan 2026 19:32:39 -0500 Subject: [PATCH 3/5] Update ModularizeGeneratorCommand trait usage in command classes --- src/Commands/MakeVerbEventCommand.php | 6 ++++-- src/Commands/MakeVerbStateCommand.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Commands/MakeVerbEventCommand.php b/src/Commands/MakeVerbEventCommand.php index e9859a66..3d3afa39 100644 --- a/src/Commands/MakeVerbEventCommand.php +++ b/src/Commands/MakeVerbEventCommand.php @@ -2,13 +2,15 @@ namespace Thunk\Verbs\Commands; -use InterNACHI\Modularize\Modularize; +use InterNACHI\Modularize\ModularizeGeneratorCommand; use Symfony\Component\Console\Attribute\AsCommand; #[AsCommand(name: 'verbs:event')] class MakeVerbEventCommand extends VerbGeneratorCommand { - use Modularize; + use ModularizeGeneratorCommand { + getDefaultNamespace as getModularizedNamespace; + } protected $name = 'verbs:event'; diff --git a/src/Commands/MakeVerbStateCommand.php b/src/Commands/MakeVerbStateCommand.php index e54c05ac..bbcbb468 100644 --- a/src/Commands/MakeVerbStateCommand.php +++ b/src/Commands/MakeVerbStateCommand.php @@ -2,13 +2,13 @@ namespace Thunk\Verbs\Commands; -use InterNACHI\Modularize\Modularize; +use InterNACHI\Modularize\ModularizeGeneratorCommand; use Symfony\Component\Console\Attribute\AsCommand; #[AsCommand(name: 'verbs:state')] class MakeVerbStateCommand extends VerbGeneratorCommand { - use Modularize { + use ModularizeGeneratorCommand { getDefaultNamespace as getModularizedNamespace; } From 8d94b52ec4a795c6349211bc93a3e19dfb5ca18e Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Sat, 31 Jan 2026 19:44:06 -0500 Subject: [PATCH 4/5] Drop PHP 8.1 from CI --- .github/workflows/run-tests.yml | 83 +++++---------------------------- 1 file changed, 12 insertions(+), 71 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f02a318e..4e250590 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,33 +12,20 @@ jobs: sqlite: runs-on: ${{ matrix.os }}-latest - - strategy: fail-fast: true matrix: - os: [ubuntu, windows] - php: [8.3, 8.2, 8.1] - laravel: ['10.*', '11.*', '12.*'] - stability: [stable, lowest] - exclude: - - php: 8.1 - laravel: 11.* - - laravel: 12.* - php: 8.1 - - + os: [ ubuntu, windows ] + php: [ 8.4, 8.3, 8.2 ] + laravel: [ 12.*, 11.*, 10.* ] + stability: [ stable, lowest ] name: ${{ matrix.os }}/sqlite P${{ matrix.php }}:L${{ matrix.laravel }} (${{ matrix.stability }}) - - steps: - name: Checkout code uses: actions/checkout@v4 - - - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -46,22 +33,16 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :php-psr coverage: none - - - name: Setup problem matchers run: | echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --prefer-${{ matrix.stability }} --prefer-dist --no-interaction - - - name: Execute tests run: vendor/bin/pest env: @@ -70,26 +51,16 @@ jobs: mysql: runs-on: ${{ matrix.os }}-latest - - strategy: fail-fast: true matrix: - os: [ubuntu] - php: [8.3, 8.2, 8.1] - laravel: ['10.*', '11.*', '12.*'] - stability: [lowest, stable] - exclude: - - php: 8.1 - laravel: 11.* - - laravel: 12.* - php: 8.1 - - + os: [ ubuntu, windows ] + php: [ 8.4, 8.3, 8.2 ] + laravel: [ 12.*, 11.*, 10.* ] + stability: [ stable, lowest ] name: ${{ matrix.os }}/mysql P${{ matrix.php }}:L${{ matrix.laravel }} (${{ matrix.stability }}) - services: mysql: image: mysql:8 @@ -100,14 +71,10 @@ jobs: - 3306:3306 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - - steps: - name: Checkout code uses: actions/checkout@v4 - - - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -115,22 +82,16 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :php-psr coverage: none - - - name: Setup problem matchers run: | echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --prefer-${{ matrix.stability }} --prefer-dist --no-interaction - - - name: Execute tests run: vendor/bin/pest env: @@ -142,26 +103,16 @@ jobs: pgsql: runs-on: ${{ matrix.os }}-latest - - strategy: fail-fast: true matrix: - os: [ubuntu] - php: [8.3, 8.2, 8.1] - laravel: ['10.*', '11.*', '12.*'] - stability: [lowest, stable] - exclude: - - php: 8.1 - laravel: 11.* - - laravel: 12.* - php: 8.1 - - + os: [ ubuntu, windows ] + php: [ 8.4, 8.3, 8.2 ] + laravel: [ 12.*, 11.*, 10.* ] + stability: [ stable, lowest ] name: ${{ matrix.os }}/pgsql P${{ matrix.php }}:L${{ matrix.laravel }} (${{ matrix.stability }}) - services: postgresql: image: postgres:14 @@ -173,14 +124,10 @@ jobs: - 5432:5432 options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3 - - steps: - name: Checkout code uses: actions/checkout@v4 - - - name: Setup PHP uses: shivammathur/setup-php@v2 with: @@ -188,22 +135,16 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :php-psr coverage: none - - - name: Setup problem matchers run: | echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --prefer-${{ matrix.stability }} --prefer-dist --no-interaction - - - name: Execute tests run: vendor/bin/pest env: From e526b4372c84d0dd59ada0dcceb8f0a3554ec338 Mon Sep 17 00:00:00 2001 From: Chris Morrell Date: Sat, 31 Jan 2026 19:50:42 -0500 Subject: [PATCH 5/5] Update CHANGELOG to reference GitHub Releases and reformat changelog entries --- CHANGELOG.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e87d2e75..388f8b87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -All notable changes to `:package_name` will be documented in this file. +See [Releases](https://github.com/hirethunk/verbs/releases) for an up-to-date changelog. ## 0.0.9 - 2024-02-15 @@ -8,7 +8,8 @@ All notable changes to `:package_name` will be documented in this file. * make pending event macroable by @jdiddydave in https://github.com/hirethunk/verbs/pull/55 * Add `for` method to factory by @joshhanley in https://github.com/hirethunk/verbs/pull/56 -* Change state factory to not require an array to be passed in by @joshhanley in https://github.com/hirethunk/verbs/pull/57 +* Change state factory to not require an array to be passed in by @joshhanley + in https://github.com/hirethunk/verbs/pull/57 * adding missing inheritance from docs by @da-mask in https://github.com/hirethunk/verbs/pull/58 * Fix the stupidest type check ever. by @DanielCoulbourne in https://github.com/hirethunk/verbs/pull/59 * Use "historical" `now()` when replaying events by @inxilpro in https://github.com/hirethunk/verbs/pull/29 @@ -34,19 +35,22 @@ All notable changes to `:package_name` will be documented in this file. ### What's Changed -* Refactor event/pending event, and add a way to immediately commit an event by @inxilpro in https://github.com/hirethunk/verbs/pull/27 +* Refactor event/pending event, and add a way to immediately commit an event by @inxilpro + in https://github.com/hirethunk/verbs/pull/27 * Add ability to include metadata on every event by @skylerkatz in https://github.com/hirethunk/verbs/pull/14 * Make `fire` do nothing while replaying by @jdiddydave in https://github.com/hirethunk/verbs/pull/35 * Fix typo in ids.md by @morpheus7CS in https://github.com/hirethunk/verbs/pull/39 * Clean up serialization by @inxilpro in https://github.com/hirethunk/verbs/pull/45 * Add id_type config by @jdiddydave in https://github.com/hirethunk/verbs/pull/44 * Prevent model serialization by @inxilpro in https://github.com/hirethunk/verbs/pull/47 -* When deserializing, skip deserializing if source is already the destination type. by @DanielCoulbourne in https://github.com/hirethunk/verbs/pull/50 +* When deserializing, skip deserializing if source is already the destination type. by @DanielCoulbourne + in https://github.com/hirethunk/verbs/pull/50 * Test Affordances by @DanielCoulbourne in https://github.com/hirethunk/verbs/pull/41 * State aliases by @inxilpro in https://github.com/hirethunk/verbs/pull/48 * Fix auto-discovery exception messages by @matthewpaulking in https://github.com/hirethunk/verbs/pull/49 * Bump aglipanci/laravel-pint-action from 2.3.0 to 2.3.1 by @dependabot in https://github.com/hirethunk/verbs/pull/51 -* Add isAllowed() and isValid() methods for PendingEvent by @DanielCoulbourne in https://github.com/hirethunk/verbs/pull/52 +* Add isAllowed() and isValid() methods for PendingEvent by @DanielCoulbourne + in https://github.com/hirethunk/verbs/pull/52 ### New Contributors @@ -61,7 +65,8 @@ All notable changes to `:package_name` will be documented in this file. ### What's Changed * fix typo by @gpibarra in https://github.com/hirethunk/verbs/pull/18 -* Stop examples and workbench dirs being in the packagist repo by @morrislaptop in https://github.com/hirethunk/verbs/pull/23 +* Stop examples and workbench dirs being in the packagist repo by @morrislaptop + in https://github.com/hirethunk/verbs/pull/23 * Add Livewire support to commit Verbs just before render by @joshhanley in https://github.com/hirethunk/verbs/pull/20 * Remove redundant "it it" from unit tests by @markjaquith in https://github.com/hirethunk/verbs/pull/30 * Remove phases from events by @inxilpro in https://github.com/hirethunk/verbs/pull/33 @@ -82,7 +87,8 @@ All notable changes to `:package_name` will be documented in this file. ### What's Changed -- Add support for interfaces in the expectsParameters check on MethodFi… by @DanielCoulbourne in https://github.com/hirethunk/verbs/pull/19 +- Add support for interfaces in the expectsParameters check on MethodFi… by @DanielCoulbourne + in https://github.com/hirethunk/verbs/pull/19 **Full Changelog**: https://github.com/hirethunk/verbs/compare/0.0.5...v0.0.6