Merge pull request #41 from bitExpert/feature/attribute_config

Introduce attribute for url matching strategy

README.md

@@ -97,8 +97,8 @@ Based on the RegEx strategy, but negates the result. Helpful if only a few pages
 ### Add custom strategy
 
 The strategy configuration is meant to be extensible. You can create an own strategy by creating a new class that
-implements the `\BitExpert\SyliusForceCustomerLoginPlugin\Model\StrategyInterface` interface and is tagged with 
-`force_customer_login.url_strategy` in your service configuration.
+implements the `\BitExpert\SyliusForceCustomerLoginPlugin\Model\StrategyInterface` interface. Your custom class needs
+to be registered as a service and be annotated with `#[AsUrlStrategy]`.
 
 ## Tests
 

src/Attribute/AsUrlStrategy.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Sylius Force Customer Login package.
+ *
+ * (c) bitExpert AG
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace BitExpert\SyliusForceCustomerLoginPlugin\Attribute;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final class AsUrlStrategy
+{
+    public const SERVICE_TAG = 'force_customer_login.url_strategy';
+}

src/DependencyInjection/BitExpertSyliusForceCustomerLoginExtension.php

@@ -12,8 +12,10 @@
 
 namespace BitExpert\SyliusForceCustomerLoginPlugin\DependencyInjection;
 
+use BitExpert\SyliusForceCustomerLoginPlugin\Attribute\AsUrlStrategy;
 use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 
@@ -27,5 +29,17 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('services.xml');
 
         $this->registerResources('bitexpert_sylius_forcelogin', $config['driver'], $config['resources'], $container);
+
+        $this->registerAutoconfiguration($container);
+    }
+
+    private function registerAutoconfiguration(ContainerBuilder $container): void
+    {
+        $container->registerAttributeForAutoconfiguration(
+            AsUrlStrategy::class,
+            static function (ChildDefinition $definition): void {
+                $definition->addTag(AsUrlStrategy::SERVICE_TAG);
+            },
+        );
     }
 }

src/DependencyInjection/Configuration.php

@@ -61,7 +61,6 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
                                         ->scalarNode('form')->defaultValue(WhitelistEntryType::class)->cannotBeEmpty()->end()
                                     ->end()
                                 ->end()
-
                             ->end()
                         ->end()
                     ->end()

src/Doctrine/ORM/WhitelistEntryRepositoryInterface.php

@@ -12,14 +12,10 @@
 
 namespace BitExpert\SyliusForceCustomerLoginPlugin\Doctrine\ORM;
 
-use BitExpert\SyliusForceCustomerLoginPlugin\Model\WhitelistEntry;
 use BitExpert\SyliusForceCustomerLoginPlugin\Model\WhitelistEntryInterface;
 use Sylius\Component\Channel\Model\ChannelInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
 
-/**
- * @extends RepositoryInterface<WhitelistEntry>
- */
 interface WhitelistEntryRepositoryInterface extends RepositoryInterface
 {
     /**

src/Model/NegatedRegexMatcher.php

@@ -12,6 +12,9 @@
 
 namespace BitExpert\SyliusForceCustomerLoginPlugin\Model;
 
+use BitExpert\SyliusForceCustomerLoginPlugin\Attribute\AsUrlStrategy;
+
+#[AsUrlStrategy]
 class NegatedRegexMatcher extends RegexMatcher
 {
     public function getType(): string

src/Model/RegexMatcher.php

@@ -12,6 +12,9 @@
 
 namespace BitExpert\SyliusForceCustomerLoginPlugin\Model;
 
+use BitExpert\SyliusForceCustomerLoginPlugin\Attribute\AsUrlStrategy;
+
+#[AsUrlStrategy]
 class RegexMatcher implements StrategyInterface
 {
     public function getType(): string

src/Model/StaticMatcher.php

@@ -12,6 +12,9 @@
 
 namespace BitExpert\SyliusForceCustomerLoginPlugin\Model;
 
+use BitExpert\SyliusForceCustomerLoginPlugin\Attribute\AsUrlStrategy;
+
+#[AsUrlStrategy]
 class StaticMatcher implements StrategyInterface
 {
     public function getType(): string

src/Resources/config/services/strategies.xml

@@ -4,16 +4,12 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="BitExpert\SyliusForceCustomerLoginPlugin\Model\NegatedRegexMatcher">
-            <tag name="force_customer_login.url_strategy" />
-        </service>
+        <defaults autoconfigure="true"/>
 
-        <service id="BitExpert\SyliusForceCustomerLoginPlugin\Model\RegexMatcher">
-            <tag name="force_customer_login.url_strategy" />
-        </service>
+        <service id="BitExpert\SyliusForceCustomerLoginPlugin\Model\NegatedRegexMatcher" />
 
-        <service id="BitExpert\SyliusForceCustomerLoginPlugin\Model\StaticMatcher">
-            <tag name="force_customer_login.url_strategy" />
-        </service>
+        <service id="BitExpert\SyliusForceCustomerLoginPlugin\Model\RegexMatcher" />
+
+        <service id="BitExpert\SyliusForceCustomerLoginPlugin\Model\StaticMatcher" />
     </services>
 </container>