fix regex capturing phone number in html

Pushword · Jan 26, 2024 · af760dc · af760dc
1 parent 5c3988f
commit af760dc
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 20 deletions.
diff --git a/packages/admin/src/Menu/PageMenuProvider.php b/packages/admin/src/Menu/PageMenuProvider.php
@@ -21,13 +21,13 @@ final class PageMenuProvider
     #[Required]
     public \Pushword\Core\Component\App\AppPool $apps;
 
-    #[\Symfony\Contracts\Service\Attribute\Required]
+    #[Required]
     public ManagerRegistry $doctrine;
 
-    #[\Symfony\Contracts\Service\Attribute\Required]
+    #[Required]
     public TranslatorInterface $translator;
 
-    #[\Symfony\Contracts\Service\Attribute\Required]
+    #[Required]
     public RequestStack $requestStack;
 
     public function __construct(private readonly FactoryInterface $factory)

diff --git a/packages/admin/src/PageAbstractAdmin.php b/packages/admin/src/PageAbstractAdmin.php
@@ -217,7 +217,7 @@ protected function configureDatagridFilters(DatagridMapper $filter): void
 
         $filter
             ->add('h1', CallbackFilter::class, [
-                'callback' => fn (\Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery $queryBuilder, string $alias, string $field, \Sonata\AdminBundle\Filter\Model\FilterData $filterData): ?bool => $this->getSearchFilterForTitle($queryBuilder, $alias, $field, $filterData),
+                'callback' => fn (ProxyQuery $queryBuilder, string $alias, string $field, FilterData $filterData): ?bool => $this->getSearchFilterForTitle($queryBuilder, $alias, $field, $filterData),
                 'label' => 'admin.page.h1.label',
             ]);
 

diff --git a/packages/conversation/src/Entity/Message.php b/packages/conversation/src/Entity/Message.php
@@ -152,7 +152,7 @@ public function setAuthorIp(?int $authorIp): self
 
     public function setAuthorIpRaw(string $authorIp): self
     {
-        return $this->setAuthorIp((int) ip2long(IPUtils::anonymize($authorIp)));
+        return $this->setAuthorIp((int) ip2long(IpUtils::anonymize($authorIp)));
     }
 
     public function getAuthorIpRaw(): bool|string

diff --git a/packages/conversation/src/Form/FormTrait.php b/packages/conversation/src/Form/FormTrait.php
@@ -39,9 +39,9 @@ trait FormTrait
     /** @var string */
     protected $successMessage = 'conversation.send.success';
 
-    protected \Symfony\Component\HttpFoundation\Request $request;
+    protected Request $request;
 
-    protected \Doctrine\Bundle\DoctrineBundle\Registry $doctrine;
+    protected Registry $doctrine;
 
     protected Twig $twig;
 

diff --git a/packages/core/src/Component/App/AppPool.php b/packages/core/src/Component/App/AppPool.php
@@ -15,7 +15,7 @@ final class AppPool
 
     /**
      * Why there ? Because often, need to check current page don't override App Config. */
-    private ?\Pushword\Core\Entity\PageInterface $currentPage = null;
+    private ?PageInterface $currentPage = null;
 
     /** @param array<string, array<string, mixed>> $rawApps */
     public function __construct(array $rawApps, Twig $twig, ParameterBagInterface $parameterBag)

diff --git a/packages/core/src/Component/EntityFilter/Filter/PhoneNumber.php b/packages/core/src/Component/EntityFilter/Filter/PhoneNumber.php
@@ -19,7 +19,7 @@ public function apply(mixed $propertyValue): string
 
     private function convertPhoneNumber(string $body): string
     {
-        $rgx = '/ (?:(?:\+|00)33|0)\s*[1-9](?:[\s.-]*\d{2}){4}(?P<after> |\.<\/|\. |$)/iU';
+        $rgx = '/ (?:(?:\+|00)33|0)(\s|\xC2\xA0|&nbsp;)*[1-9](?:([\s.-\xC2\xA0]|&nbsp;)*\d{2}){4}(?P<after>( |&nbsp;)|\.<\/|\. |$)/iU';
         \Safe\preg_match_all($rgx, $body, $matches);
 
         if (! isset($matches[0])) {

diff --git a/packages/core/src/EventListener/MediaListener.php b/packages/core/src/EventListener/MediaListener.php
@@ -35,7 +35,7 @@ final class MediaListener
     public function __construct(
         private readonly string $projectDir,
         private readonly EntityManagerInterface $em,
-        private readonly FileSystem $filesystem,
+        private readonly Filesystem $filesystem,
         private readonly ImageManager $imageManager,
         private readonly RequestStack $requestStack,
         private readonly RouterInterface $router,

diff --git a/packages/core/src/Service/ImageManager.php b/packages/core/src/Service/ImageManager.php
@@ -20,7 +20,7 @@ final class ImageManager
 
     private ?ImageInterface $lastThumb = null;
 
-    private readonly FileSystem $fileSystem;
+    private readonly Filesystem $fileSystem;
 
     /**
      * @param array<string, array<string, mixed>> $filterSets
@@ -32,7 +32,7 @@ public function __construct(
         private readonly string $publicMediaDir,
         private readonly string $mediaDir
     ) {
-        $this->fileSystem = new FileSystem();
+        $this->fileSystem = new Filesystem();
         $this->optimizer = OptimizerChainFactory::create(); // t o d o make optimizer bin path configurable
     }
 

diff --git a/packages/core/src/Service/TailwindGenerator.php b/packages/core/src/Service/TailwindGenerator.php
@@ -30,7 +30,7 @@ public function run(PageInterface $page): void
             return;
         }
 
-        $fs = new FileSystem();
+        $fs = new Filesystem();
         $fs->dumpFile(
             $this->projectDir.'/var/TailwindGeneratorCache/'.$page->getId(),
             serialize($page)

diff --git a/packages/flat/src/Importer/PageImporter.php b/packages/flat/src/Importer/PageImporter.php
@@ -28,7 +28,7 @@ class PageImporter extends AbstractImporter
      */
     protected array $toAddAtTheEnd = [];
 
-    protected ?\Pushword\Flat\FlatFileContentDirFinder $contentDirFinder = null;
+    protected ?FlatFileContentDirFinder $contentDirFinder = null;
 
     /**
      * @var class-string<MediaInterface>

diff --git a/packages/flat/tests/FlatFileImporterTest.php b/packages/flat/tests/FlatFileImporterTest.php
@@ -81,9 +81,9 @@ private function prepare()
         self::bootKernel();
         $newName = 'logo-test'.uniqid().rand().'.png';
 
-        (new FileSystem())->copy(__DIR__.'/content/test-content.md', $this->getContentDir().'/test-content.md');
-        (new FileSystem())->copy(__DIR__.'/content/media/logo-test.png', $this->getContentDir().'/media/logo-test.png');
-        (new FileSystem())->copy(__DIR__.'/content/media/logo-test.png', $this->getContentDir().'/media/'.$newName);
+        (new Filesystem())->copy(__DIR__.'/content/test-content.md', $this->getContentDir().'/test-content.md');
+        (new Filesystem())->copy(__DIR__.'/content/media/logo-test.png', $this->getContentDir().'/media/logo-test.png');
+        (new Filesystem())->copy(__DIR__.'/content/media/logo-test.png', $this->getContentDir().'/media/'.$newName);
 
         return $newName;
     }

diff --git a/packages/page-scanner/src/Scanner/ParentPageScanner.php b/packages/page-scanner/src/Scanner/ParentPageScanner.php
@@ -14,7 +14,7 @@ protected function run(): void
         $this->checkParentPageHost($this->page);
     }
 
-    private function checkParentPageHost(Pageinterface $pageinterface): void
+    private function checkParentPageHost(PageInterface $pageinterface): void
     {
         $parent = $pageinterface->getParentPage();
         if (! $parent instanceof PageInterface) {

diff --git a/packages/template-editor/src/ElementAdmin.php b/packages/template-editor/src/ElementAdmin.php
@@ -24,7 +24,7 @@ final class ElementAdmin extends AbstractController
 {
     private KernelInterface $kernel;
 
-    private twig $twig;
+    private Twig $twig;
 
     /** @param string[] $canBeEditedList */
     public function __construct(

diff --git a/packages/version/src/VersionController.php b/packages/version/src/VersionController.php
@@ -52,7 +52,7 @@ public function setTranslator(TranslatorInterface $translator): void
      * @psalm-suppress PossiblyInvalidArgument
      * @psalm-suppress InvalidPropertyAssignmentValue
      */
-    #[\Symfony\Contracts\Service\Attribute\Required]
+    #[Required]
     public function setParams(ParameterBagInterface $parameterBag): void
     {
         $this->pageClass = $parameterBag->get('pw.entity_page'); // @phpstan-ignore-line