v2

.github/workflows/tests.yml

@@ -0,0 +1,87 @@
+name: Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.1, 8.2, 8.3, 8.4]
+        laravel: [10.*, 11.*, 12.*]
+        exclude:
+          - php: 8.1
+            laravel: 11.*
+          - php: 8.1
+            laravel: 12.*
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    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, json
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
+
+      - name: Run tests
+        run: composer test
+
+  static-analysis:
+    runs-on: ubuntu-latest
+
+    name: Static Analysis
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          extensions: dom, curl, libxml, mbstring, zip, json
+          coverage: none
+
+      - name: Install dependencies
+        run: composer update --prefer-dist --no-interaction
+
+      - name: Run PHPStan
+        run: composer analyse
+
+  code-style:
+    runs-on: ubuntu-latest
+
+    name: Code Style
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          extensions: dom, curl, libxml, mbstring, zip, json
+          coverage: none
+
+      - name: Install dependencies
+        run: composer update --prefer-dist --no-interaction
+
+      - name: Check code style
+        run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --allow-risky=yes

.gitignore

@@ -6,7 +6,7 @@ build
 coverage
 .env
 .env.backup
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 .phpunit.cache
 .phpstorm.meta.php

.php-cs-fixer.dist.php

@@ -0,0 +1,39 @@
+<?php
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->exclude([
+        '__snapshots__',
+        '.pest',
+    ])
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PSR12' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
+        'no_unused_imports' => true,
+        'not_operator_with_successor_space' => true,
+        'trailing_comma_in_multiline' => true,
+        'phpdoc_scalar' => true,
+        'unary_operator_spaces' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_before_statement' => [
+            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+        ],
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_var_without_name' => true,
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => true,
+        ],
+        'single_trait_insert_per_statement' => true,
+    ])
+    ->setFinder($finder);

composer.json

@@ -1,10 +1,10 @@
 {
     "name": "laraneat/modules",
     "description": "Laraneat modules.",
-    "homepage": "https://github.com/laraneat/core/",
+    "homepage": "https://github.com/laraneat/modules/",
     "support": {
-        "issues": "https://github.com/laraneat/core/issues",
-        "source": "https://github.com/laraneat/core"
+        "issues": "https://github.com/laraneat/modules/issues",
+        "source": "https://github.com/laraneat/modules"
     },
     "authors": [
         {
@@ -24,59 +24,63 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "laravel/framework": "^10.0"
+        "composer/composer": "^2.1",
+        "laravel/framework": "^10.0 || ^11.0 || ^12.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.48",
-        "mockery/mockery": "~1.0",
-        "orchestra/testbench": "^8.2",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.5",
+        "larastan/larastan": "^2.0 || ^3.0",
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
+        "pestphp/pest": "^2.31 || ^3.0",
+        "pestphp/pest-plugin-laravel": "^2.0 || ^3.0",
+        "phpstan/phpstan": "^1.10.58 || ^2.0",
         "roave/security-advisories": "dev-latest",
-        "spatie/phpunit-snapshot-assertions": "^5.1"
+        "spatie/pest-plugin-snapshots": "^2.1"
     },
     "autoload": {
         "psr-4": {
             "Laraneat\\Modules\\": "src"
-        },
-        "files": [
-            "src/helpers.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "Laraneat\\Modules\\Tests\\": "tests",
-            "App\\": "tests/laravel/app",
-            "App\\Modules\\Article\\": "tests/fixtures/stubs/valid/Article"
+            "App\\": "tests/fixtures/laravel/app",
+            "Modules\\": "tests/fixtures/laravel/modules"
         }
     },
     "suggest": {
-        "wikimedia/composer-merge-plugin": "Allows the ability to create and merge composer.json files for your individual modules for module-specific dependency management."
+        "lorisleiva/laravel-actions": "Laravel components that take care of one specific task",
+        "jackardios/laravel-query-wizard": "Easily build Eloquent queries from API requests",
+        "spatie/laravel-data": "Powerful data objects for Laravel"
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Laraneat\\Modules\\ModulesServiceProvider"
+                "Laraneat\\Modules\\Providers\\ComposerServiceProvider",
+                "Laraneat\\Modules\\Providers\\ConsoleServiceProvider",
+                "Laraneat\\Modules\\Providers\\ModulesRepositoryServiceProvider",
+                "Laraneat\\Modules\\Providers\\ModulesServiceProvider"
             ],
             "aliases": {
                 "Modules": "Laraneat\\Modules\\Facades\\Modules"
             }
         }
     },
     "scripts": {
-        "update-snapshots": "./vendor/bin/phpunit --no-coverage -d --update-snapshots",
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --debug --coverage-html coverage",
-        "pcf": "vendor/bin/php-cs-fixer fix --verbose",
+        "analyse" : "./vendor/bin/phpstan analyse --memory-limit=256M",
+        "test" : "./vendor/bin/pest --no-coverage",
+        "test-coverage" : "./vendor/bin/pest --coverage-html coverage",
+        "update-snapshots": "./vendor/bin/pest --no-coverage --update-snapshots",
+        "format": "./vendor/bin/php-cs-fixer fix --allow-risky=yes",
         "post-autoload-dump": [
             "@php ./vendor/bin/testbench package:discover --ansi"
         ]
     },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
+    "config" : {
         "sort-packages": true,
         "allow-plugins": {
             "pestphp/pest-plugin": true