code modernized

Author: sdebacker

.github/workflows/pint.yml

@@ -0,0 +1,23 @@
+name: Pint
+
+on: [ push, pull_request ]
+
+jobs:
+    pint:
+        runs-on: ubuntu-latest
+        name: Pint
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.5
+
+            - name: Install dependencies
+              run: composer install --no-interaction --no-progress
+
+            - name: Run Pint
+              run: vendor/bin/pint --test

.github/workflows/rector.yml

@@ -0,0 +1,23 @@
+name: Rector
+
+on: [ push, pull_request ]
+
+jobs:
+    rector:
+        runs-on: ubuntu-latest
+        name: Rector
+
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.5
+
+            - name: Install dependencies
+              run: composer install --no-interaction --no-progress
+
+            - name: Run Rector
+              run: vendor/bin/rector --dry-run

.github/workflows/run-tests.yml .github/workflows/tests.yml.github/workflows/run-tests.yml renamed to .github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: run-tests
+name: tests
 
 on: [push, pull_request]
 
@@ -9,25 +9,31 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.1]
-        laravel: [9.*]
-        dependency-version: [prefer-stable]
+        php: [8.5, 8.4, 8.3, 8.2]
+        laravel: [13.*, 12.*, 11.*]
+        exclude:
+            -   laravel: 13.*
+                php: 8.3
+            -   laravel: 13.*
+                php: 8.2
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          extensions: dom, curl, libxml, mbstring, zip
           coverage: none
 
       - name: Install dependencies
-        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress
+        run: |
+          composer require "illuminate/support:${{ matrix.laravel }}" --no-interaction --no-update
+          composer install --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit

.phpunit.cache/test-results

@@ -13,15 +13,14 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.0.2",
+        "php": "^8.2",
         "typicms/form": "^3.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
-        "mockery/mockery": "^1.4.4",
-        "php-coveralls/php-coveralls": "~2.5.2",
-        "nunomaduro/larastan": "^2.0",
-        "orchestra/testbench": "^7.4"
+        "laravel/pint": "^1.0",
+        "mockery/mockery": "^1.6",
+        "phpunit/phpunit": "^11.0",
+        "rector/rector": "^2.0"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -1,17 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+    cacheDirectory=".phpunit.cache"
+    failOnRisky="true"
+    failOnWarning="true"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
+>
+    <source>
         <include>
             <directory suffix=".php">./src</directory>
         </include>
         <exclude>
             <file>./src/BootFormsServiceProvider.php</file>
             <file>./src/Facades/BootForm.php</file>
         </exclude>
-    </coverage>
+    </source>
     <testsuites>
         <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>

phpstan.neon

@@ -1,8 +1,9 @@
 # BootForms
 
-[![Actions Status](https://github.com/TypiCMS/bootforms/workflows/run-tests/badge.svg)](https://github.com/TypiCMS/bootforms/actions)
-[![Coverage Status](https://coveralls.io/repos/github/TypiCMS/bootforms/badge.svg?branch=master)](https://coveralls.io/github/TypiCMS/bootforms?branch=master)
-[![StyleCI](https://styleci.io/repos/132662795/shield?branch=master)](https://styleci.io/repos/132662795)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/typicms/bootforms.svg)](https://packagist.org/packages/typicms/bootforms)
+[![tests](https://github.com/typicms/bootforms/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/typicms/bootforms/actions/workflows/tests.yml)
+[![Rector](https://github.com/typicms/bootforms/actions/workflows/rector.yml/badge.svg?branch=main)](https://github.com/typicms/bootforms/actions/workflows/rector.yml)
+[![Pint](https://github.com/typicms/bootforms/actions/workflows/pint.yml/badge.svg?branch=main)](https://github.com/typicms/bootforms/actions/workflows/pint.yml)
 
 BootForms was originally created by [Adam Wathan](https://github.com/adamwathan). It is build on top of the more general [Form](https://github.com/adamwathan/form) package by adding another layer of abstraction to rapidly generate markup for standard Bootstrap 5 forms. Probably not perfect for your super custom branded ready-for-release apps, but a _huge_ time saver when you are still in the prototyping stage!
 

phpunit.xml

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__.'/src',
+        __DIR__.'/tests',
+    ])
+    ->withPhpSets()
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        earlyReturn: true,
+    );

readme.md

@@ -13,12 +13,7 @@
 
 class BasicFormBuilder
 {
-    protected FormBuilder $builder;
-
-    public function __construct(FormBuilder $builder)
-    {
-        $this->builder = $builder;
-    }
+    public function __construct(protected FormBuilder $builder) {}
 
     protected function formGroup(string $label, string $name, mixed $control): GroupWrapper
     {
@@ -130,7 +125,7 @@ protected function radioGroup(string $label, string $name, mixed $control): Grou
 
     protected function buildRadioGroup(string $label, string $name, mixed $control): CheckGroup
     {
-        $id = $name . '_' . mb_strtolower(trim(preg_replace('/[^A-Za-z0-9-]+/', '_', $control->getAttribute('value'))));
+        $id = $name.'_'.mb_strtolower(trim((string) preg_replace('/[^A-Za-z0-9-]+/', '_', (string) $control->getAttribute('value'))));
         $label = $this->builder->label($label)->addClass('form-check-label')->forId($id);
         $control->id($id)->addClass('form-check-input');
 
@@ -191,9 +186,10 @@ public function file(string $label, string $name, ?string $value = null): GroupW
     public function inputGroup(string $label, string $name, ?string $value = null): GroupWrapper
     {
         $control = new InputGroup($name);
-        if (!is_null($value) || !is_null($value = $this->getValueFor($name))) {
+        if (! is_null($value) || ! is_null($value = $this->getValueFor($name))) {
             $control->value($value);
         }
+
         $control->addClass('form-control');
 
         return $this->formGroup($label, $name, $control);
@@ -206,7 +202,7 @@ public function number(string $label, string $name, ?string $value = null): Grou
         return $this->formGroup($label, $name, $control);
     }
 
-    public function __call($method, $parameters)
+    public function __call(string $method, array $parameters)
     {
         return call_user_func_array([$this->builder, $method], $parameters);
     }