From 8e89cc3616af6dd0bd0fcf4cc6d7c44b56a476be Mon Sep 17 00:00:00 2001 From: David Molineus Date: Wed, 5 Oct 2016 14:48:57 +0200 Subject: [PATCH] Fix the alias generator. Do not use -. --- module/config/services.php | 5 +-- .../Contao/Leaflet/Alias/UnderscoreFilter.php | 37 ------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 src/Netzmacht/Contao/Leaflet/Alias/UnderscoreFilter.php diff --git a/module/config/services.php b/module/config/services.php index ac1f32f..a648fac 100644 --- a/module/config/services.php +++ b/module/config/services.php @@ -135,8 +135,7 @@ $container['leaflet.alias-generator'] = $container->share( $filters = [ new ExistingAliasFilter(), new SlugifyFilter($fields), - new SuffixFilter(), - new UnderscoreFilter(false) + new SuffixFilter(false), ]; $validator = new UniqueDatabaseValueValidator( @@ -145,7 +144,7 @@ $container['leaflet.alias-generator'] = $container->share( $aliasField ); - return new FilterBasedAliasGenerator($filters, $validator, $dataContainerName, $aliasField); + return new FilterBasedAliasGenerator($filters, $validator, $dataContainerName, $aliasField, '_'); }; } ); diff --git a/src/Netzmacht/Contao/Leaflet/Alias/UnderscoreFilter.php b/src/Netzmacht/Contao/Leaflet/Alias/UnderscoreFilter.php deleted file mode 100644 index 9738c1d..0000000 --- a/src/Netzmacht/Contao/Leaflet/Alias/UnderscoreFilter.php +++ /dev/null @@ -1,37 +0,0 @@ - - * @copyright 2016 netzmacht David Molineus. All rights reserved. - * @filesource - * - */ - -namespace Netzmacht\Contao\Leaflet\Alias; - -use Netzmacht\Contao\Toolkit\Data\Alias\Filter; - -/** - * Class UnderscoreFilter - * - * @package Netzmacht\Contao\Leaflet\Alias - */ -class UnderscoreFilter extends Filter\AbstractFilter -{ - /** - * {@inheritDoc} - */ - public function repeatUntilValid() - { - return false; - } - - /** - * {@inheritDoc} - */ - public function apply($model, $value, $separator) - { - return str_replace('-', '_', $value); - } -}