Upgrade

daniel-de-wit · daniel-de-wit · commit fbb7460d2b40 · 2025-01-24T18:48:01.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -2,10 +2,15 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
+/.github            export-ignore
+/docker             export-ignore
+/tests              export-ignore
+/.coveralls.yml     export-ignore
+/.editorconfig      export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/.travis.yml        export-ignore
+/docker-compose.yml export-ignore
+/Makefile           export-ignore
+/phpstan.neon       export-ignore
 /phpunit.xml.dist   export-ignore
-/.scrutinizer.yml   export-ignore
-/tests              export-ignore
-/.editorconfig      export-ignore
+/pint.json          export-ignore
diff --git a/.github/workflows/run-fix-code-style.yml b/.github/workflows/run-fix-code-style.yml
@@ -35,4 +35,4 @@ jobs:
 
             - uses: stefanzweifel/git-auto-commit-action@v4
               with:
-                  commit_message: composer fix-style
+                  commit_message: composer pint
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 composer.lock
 vendor
 build
-.phpunit.cache
-.php_cs.cache
-.php_cs.tests.cache
+.phpunit.result.cache
+phpunit.xml
diff --git a/.php_cs.common.php b/.php_cs.common.php
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/.php_cs.tests.php b/.php_cs.tests.php
diff --git a/Makefile b/Makefile
@@ -0,0 +1,12 @@
+setup:
+	@test -s phpunit.xml || cp phpunit.xml.dist phpunit.xml
+	@docker-compose  run --rm app composer install
+
+destroy:
+	@docker-compose down --remove-orphans --volumes
+
+app:
+	@docker-compose run --rm app sh
+
+test:
+	@docker-compose run --rm app sh -c "php ./vendor/bin/phpunit"
diff --git a/composer.json b/composer.json
@@ -23,13 +23,14 @@
         "illuminate/database": "^9.0 || ^10.0 || ^11.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.18",
-        "nunomaduro/larastan": "^0.7.2",
-        "orchestra/testbench": "^6.7",
-        "phpstan/phpstan-mockery": "^0.12.13",
-        "phpstan/phpstan-phpunit": "^0.12.18",
+        "larastan/larastan": "^2.9",
+        "laravel/pint": "^1.20",
+        "orchestra/testbench": "^7.11",
+        "phpstan/phpstan-mockery": "^1.1",
+        "phpstan/phpstan-phpunit": "^1.2",
         "phpunit/phpunit": "^9.5",
-        "thecodingmachine/phpstan-safe-rule": "^1.0"
+        "thecodingmachine/phpstan-safe-rule": "^1.0",
+        "rector/rector": "^0.14.8"
     },
     "autoload": {
         "psr-4": {
@@ -52,16 +53,13 @@
         }
     },
     "scripts": {
-        "analyze": "vendor/phpstan/phpstan/phpstan analyse",
-        "check-style": [
-            "php-cs-fixer fix --diff --diff-format=udiff --dry-run",
-            "php-cs-fixer fix --diff --diff-format=udiff --dry-run --config=.php_cs.tests.php"
+        "post-autoload-dump": [
+            "@php ./vendor/bin/testbench package:discover --ansi"
         ],
         "coverage": "vendor/bin/phpunit",
-        "fix-style": [
-            "php-cs-fixer fix",
-            "php-cs-fixer fix --config=.php_cs.tests.php"
-        ],
+        "phpstan": "vendor/bin/phpstan analyse",
+        "pint": "vendor/bin/pint",
+        "rector": "vendor/bin/rector",
         "test": "vendor/bin/phpunit --no-coverage"
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,5 @@
+services:
+  app:
+    build: docker
+    volumes:
+      - .:/var/www/html
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -0,0 +1,20 @@
+FROM php:8.1-cli-alpine
+
+WORKDIR /var/www/html
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+RUN apk add --no-cache \
+        icu-libs \
+    && apk add --no-cache --virtual .build-deps \
+        $PHPIZE_DEPS \
+        icu-dev \
+    && docker-php-ext-configure intl \
+    && docker-php-ext-install intl \
+    && pecl install \
+        pcov \
+    && docker-php-ext-enable \
+        pcov \
+    && apk del .build-deps
+
+COPY conf.d /usr/local/etc/php/conf.d
diff --git a/docker/conf.d/memory-limit.ini b/docker/conf.d/memory-limit.ini
@@ -0,0 +1 @@
+memory_limit = -1
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,11 +1,11 @@
 includes:
-- vendor/nunomaduro/larastan/extension.neon
-- vendor/phpstan/phpstan-mockery/extension.neon
-- vendor/phpstan/phpstan-phpunit/extension.neon
-- vendor/phpstan/phpstan-phpunit/rules.neon
-- vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
+    - vendor/larastan/larastan/extension.neon
+    - vendor/phpstan/phpstan-mockery/extension.neon
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon
 parameters:
-  level: max
-  paths:
-  - src
-  - tests
+    level: max
+    paths:
+        - src
+        - tests
diff --git a/pint.json b/pint.json
@@ -0,0 +1,9 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "declare_strict_types": true,
+        "binary_operator_spaces": {
+            "default": "align_single_space_minimal"
+        }
+    }
+}
diff --git a/src/Providers/LaravelIdeHelperHookTranslatableServiceProvider.php b/src/Providers/LaravelIdeHelperHookTranslatableServiceProvider.php
@@ -1,19 +1,49 @@
 <?php
 
+declare(strict_types=1);
+
 namespace DanielDeWit\LaravelIdeHelperHookTranslatable\Providers;
 
+use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;
 use DanielDeWit\LaravelIdeHelperHookTranslatable\Hooks\TranslatableHook;
+use Illuminate\Console\Command;
 use Illuminate\Contracts\Config\Repository as Config;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Support\ServiceProvider;
 
-class LaravelIdeHelperHookTranslatableServiceProvider extends ServiceProvider
+class LaravelIdeHelperHookTranslatableServiceProvider extends ServiceProvider implements DeferrableProvider
 {
+    /**
+     * @var string
+     */
+    const ModelsCommandAlias = 'laravel-ide-helper-hook-translatable-command-alias';
+
+    /**
+     * @return list<class-string<Command>|string>
+     */
+    public function provides(): array
+    {
+        return [
+            static::ModelsCommandAlias,
+        ];
+    }
+
+    public function boot(): void
+    {
+        // Laravel only allows a single deferred service provider to claim
+        // responsibility for a given class, interface, or service in the
+        // provides() method. To ensure this provider is properly loaded
+        // when running the ModelsCommand we bind an alias and use that instead.
+        $this->app->alias(ModelsCommand::class, static::ModelsCommandAlias);
+    }
+
     public function register(): void
     {
-        if ($this->app->isProduction()) {
-            return;
-        }
+        $this->registerIdeHelperHook();
+    }
 
+    protected function registerIdeHelperHook(): void
+    {
         /** @var Config $config */
         $config = $this->app->get('config');
 
