Merge pull request #51 from maximehuran/feature/use-patch

Author: maximehuran

.php-cs-fixer.dist.php

@@ -36,9 +36,9 @@
     ->setRiskyAllowed(true)
     ->setRules([
         '@DoctrineAnnotation' => true,
-        '@PHP71Migration' => true,
-        '@PHP71Migration:risky' => true,
-        '@PHPUnit60Migration:risky' => true,
+        '@PHP7x1Migration' => true,
+        '@PHP7x1Migration:risky' => true,
+        '@PHPUnit6x0Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'align_multiline_comment' => [
@@ -256,7 +256,7 @@
         'trim_array_spaces' => true,
         'type_declaration_spaces' => true,
         'unary_operator_spaces' => true,
-        'visibility_required' => [
+        'modifier_keywords' => [
             'elements' => [
                 'const',
                 'property',

Makefile

@@ -73,6 +73,8 @@ setup_application:
 	(cd ${APP_DIR} && ${COMPOSER} config minimum-stability dev)
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
 	(cd ${APP_DIR} && ${COMPOSER} config --no-plugins --json extra.symfony.endpoint '["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master","flex://defaults"]')
+	cp -R ./patches ${APP_DIR}/patches
+	(cd ${APP_DIR} && ${COMPOSER} config --json extra.patches "{\"huluti/altcha-bundle\":{\"Fix assets error with dist/altcha.i18n.js\":\"patches/fix-i18n-altcha.patch\"}}")
 	(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
 	$(MAKE) ${APP_DIR}/.php-version
 	$(MAKE) ${APP_DIR}/php.ini

composer.json

@@ -5,6 +5,7 @@
     "description": "This plugins adds captcha and allows you to manage your spams.",
     "license": "MIT",
     "require": {
+        "cweagans/composer-patches": "^1.7",
         "karser/karser-recaptcha3-bundle": "~0.2.0",
         "php": "^8.2",
         "sylius/sylius": "~2.0",
@@ -43,6 +44,11 @@
         "symfony": {
             "docker": false,
             "endpoint": ["https://api.github.com/repos/monsieurbiz/symfony-recipes/contents/index.json?ref=flex/master", "flex://defaults"]
+        },
+        "patches": {
+            "huluti/altcha-bundle": {
+                "Fix assets error with dist/altcha.i18n.js": "patches/fix-i18n-altcha.patch"
+            }
         }
     },
     "config": {
@@ -51,7 +57,8 @@
             "symfony/flex": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "ergebnis/composer-normalize": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "cweagans/composer-patches": true
         }
     }
 }

patches/fix-i18n-altcha.patch

@@ -0,0 +1,24 @@
+diff --git a/assets/controllers/altcha_controller.js b/assets/controllers/altcha_controller.js
+index 4811795..102a3d9 100644
+--- a/assets/controllers/altcha_controller.js
++++ b/assets/controllers/altcha_controller.js
+@@ -1,5 +1,4 @@
+ import {Controller} from '@hotwired/stimulus';
+-import 'altcha/dist/altcha.i18n.js';
+
+ export default class extends Controller {
+
+diff --git a/assets/package.json b/assets/package.json
+index 2f994b8..8bf1b00 100644
+--- a/assets/package.json
++++ b/assets/package.json
+@@ -13,8 +13,7 @@
+       }
+     },
+     "importmap": {
+-      "@hotwired/stimulus": "^3.0.0",
+-      "altcha/dist/altcha.i18n.js": "^2.0.0"
++      "@hotwired/stimulus": "^3.0.0"
+     }
+   },
+   "peerDependencies": {

src/DependencyInjection/Configuration.php

@@ -35,7 +35,6 @@ public function getConfigTreeBuilder(): TreeBuilder
 
     private function addExpirationPeriodsSection(ArrayNodeDefinition $node): void
     {
-        /** @phpstan-ignore-next-line */
         $node
             ->children()
                 ->arrayNode('exceeded')

src/DependencyInjection/MonsieurBizSyliusAntiSpamExtension.php

@@ -13,7 +13,6 @@
 
 namespace MonsieurBiz\SyliusAntiSpamPlugin\DependencyInjection;
 
-use MonsieurBiz\SyliusAntiSpamPlugin\Validator\ValidatorInterface;
 use Sylius\Bundle\CoreBundle\DependencyInjection\PrependDoctrineMigrationsTrait;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -30,11 +29,6 @@ final class MonsieurBizSyliusAntiSpamExtension extends Extension implements Prep
      */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $container
-            ->registerForAutoconfiguration(ValidatorInterface::class)
-            ->addTag('monsieurbiz_anti_spam.validator')
-        ;
-
         $config = $this->processConfiguration($this->getConfiguration([], $container), $configs);
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yaml');

src/Validator/CustomerValidator.php

@@ -15,7 +15,9 @@
 
 use MonsieurBiz\SyliusAntiSpamPlugin\Helper\StringHelper;
 use Sylius\Component\Core\Model\CustomerInterface;
+use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 
+#[AutoconfigureTag('monsieurbiz_anti_spam.validator')]
 final class CustomerValidator implements ValidatorInterface
 {
     public const STRING_MINIMUM_SCORE = '0.2';

src/Validator/ReCaptcha3Validator.php

@@ -15,8 +15,10 @@
 
 use Karser\Recaptcha3Bundle\ReCaptcha\Response as RecaptchaResponse;
 use Karser\Recaptcha3Bundle\Validator\Constraints\Recaptcha3Validator as Recaptcha3ValidatorConstraints;
+use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 use Symfony\Component\HttpFoundation\RequestStack;
 
+#[AutoconfigureTag('monsieurbiz_anti_spam.validator')]
 final class ReCaptcha3Validator implements ValidatorInterface
 {
     public const CAPTCHA_MINIMUM_SCORE = 0.8;