Refactor configuration and dependencies (#4)

francoism90 · web-flow · commit 93b2dfb5e7a3 · 2025-04-23T20:52:26.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -8,8 +8,8 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2
diff --git a/.gitattributes b/.gitattributes
@@ -1,20 +1,11 @@
-# Path-based git attributes
-# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+* text=auto eol=lf
 
-# Ignore all test and documentation with "export-ignore".
-/.github            export-ignore
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/phpunit.xml.dist   export-ignore
-/art                export-ignore
-/docs               export-ignore
-/tests              export-ignore
-/workbench          export-ignore
-/.editorconfig      export-ignore
-/.php_cs.dist.php   export-ignore
-/psalm.xml          export-ignore
-/psalm.xml.dist     export-ignore
-/testbench.yaml     export-ignore
-/UPGRADING.md       export-ignore
-/phpstan.neon.dist  export-ignore
-/phpstan-baseline.neon  export-ignore
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
+CHANGELOG.md export-ignore
+.styleci.yml export-ignore
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,54 +1,52 @@
 name: run-tests
 
 on:
-  push:
-    paths:
-      - "**.php"
-      - ".github/workflows/run-tests.yml"
-      - "phpunit.xml.dist"
-      - "composer.json"
-      - "composer.lock"
+    push:
+        paths:
+            - "**.php"
+            - ".github/workflows/run-tests.yml"
+            - "phpunit.xml.dist"
+            - "composer.json"
+            - "composer.lock"
 
 jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 5
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-latest]
-        php: [8.3, 8.2]
-        stability: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 11.*
-            testbench: 9.*
-            carbon: ^3.1.1
-
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
-
-    steps:
-      - name: Checkout code
-        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, fileinfo
-          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 }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
-
-      - name: List Installed Dependencies
-        run: composer show -D
-
-      - name: Execute tests
-        run: vendor/bin/pest --ci
+    test:
+        runs-on: ${{ matrix.os }}
+        timeout-minutes: 5
+        strategy:
+            fail-fast: true
+            matrix:
+                os: [ubuntu-latest]
+                php: [8.4, 8.3]
+                include:
+                    - laravel: 12.*
+                      carbon: ^3.9.1
+
+        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }}
+
+        steps:
+            - name: Checkout code
+              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, fileinfo
+                  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 }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+                  composer update --prefer-dist --no-interaction
+
+            - name: List Installed Dependencies
+              run: composer show -D
+
+            - name: Execute tests
+              run: vendor/bin/pest --ci
diff --git a/.gitignore b/.gitignore
@@ -1,32 +1,31 @@
-# Composer Related
-composer.lock
-/vendor
-
-# Frontend Assets
-/node_modules
-
-# Logs
-npm-debug.log
-yarn-error.log
-
-# Caches
-.phpunit.cache
-.phpunit.result.cache
-/build
-
-# IDE Helper
-_ide_helper.php
 _ide_helper_models.php
+_ide_helper.php
+!.env.example
+.cache
+.data
+.DS_Store
+.env
+.env.*
+.fleet
+.idea
+.output
+.phpactor.json
 .phpstorm.meta.php
-
-# Editors
-/.idea
-/.fleet
-/.vscode
-
-# Misc
-phpunit.xml
-phpstan.neon
-testbench.yaml
-/docs
-/coverage
+.phpunit.cache
+.phpunit.result.cache
+.pnpm-store
+.vscode
+.zed
+*.log
+composer.lock
+/auth.json
+/bootstrap/ssr
+/dist
+/node_modules
+/public/build
+/public/hot
+/public/storage
+/public/vendor
+/storage/*.key
+/storage/pail
+/vendor
diff --git a/README.md b/README.md
@@ -15,12 +15,6 @@ You can install the package via composer:
 composer require foxws/laravel-algos
 ```
 
-You can publish the config file with:
-
-```bash
-php artisan vendor:publish --tag="algos-config"
-```
-
 ## Usage
 
 Generate an `Algo` class (you may also use `php artisan make:algo MyAlgo`):
diff --git a/composer.json b/composer.json
@@ -2,7 +2,6 @@
     "name": "foxws/laravel-algos",
     "description": "Create algos for your Laravel application",
     "keywords": [
-        "foxws",
         "laravel",
         "laravel-algos",
         "algo",
@@ -20,24 +19,24 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/console": "^10.0|^11.0",
-        "illuminate/container": "^10.0|^11.0",
-        "illuminate/contracts": "^10.0||^11.0",
-        "illuminate/support": "^10.0|^11.0",
-        "spatie/laravel-package-tools": "^1.16"
+        "illuminate/cache": "^11.0|^12.0",
+        "illuminate/console": "^11.0|^12.0",
+        "illuminate/container": "^11.0|^12.0",
+        "illuminate/contracts": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
+        "spatie/laravel-package-tools": "^1.9"
     },
     "require-dev": {
-        "laravel/pint": "^1.14",
-        "larastan/larastan": "^2.9",
-        "nunomaduro/collision": "^8.1.1||^7.10.0",
-        "orchestra/testbench": "^9.0.0||^8.22.0",
-        "pestphp/pest": "^2.34",
-        "pestphp/pest-plugin-arch": "^2.7",
-        "pestphp/pest-plugin-laravel": "^2.3",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "spatie/laravel-ray": "^1.35"
+        "larastan/larastan": "^3.4",
+        "laravel/pint": "^1.22",
+        "nunomaduro/collision": "^8.8",
+        "orchestra/testbench": "^10.0",
+        "pestphp/pest": "^3.7",
+        "pestphp/pest-plugin-arch": "^3.1",
+        "pestphp/pest-plugin-laravel": "^3.4",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/config/algos.php b/config/algos.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -5,7 +5,6 @@ parameters:
     level: 5
     paths:
         - src
-        - config
         - tests/database
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
diff --git a/src/AlgoServiceProvider.php b/src/AlgoServiceProvider.php
@@ -12,7 +12,6 @@ public function configurePackage(Package $package): void
     {
         $package
             ->name('laravel-algos')
-            ->hasConfigFile('algos')
             ->hasCommands([
                 MakeAlgo::class,
             ]);

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ public function configurePackage(Package $package): void`
`12`	`12`	`{`
`13`	`13`	`$package`
`14`	`14`	`->name('laravel-algos')`
`15`		`- ->hasConfigFile('algos')`
`16`	`15`	`->hasCommands([`
`17`	`16`	`MakeAlgo::class,`
`18`	`17`	`]);`