From d76576247da3f248443fcae24b14273413eae6db Mon Sep 17 00:00:00 2001
From: Patrik Fuhrmann <github@pinglf.com>
Date: Thu, 4 Jul 2024 14:03:27 +0200
Subject: [PATCH] DEV: Using modern PHP features + fix README to v4 version

---
 README.md                              | 31 +++++++++-----------------
 src/Normalizers/AbstractNormalizer.php |  1 -
 src/Result.php                         |  8 ++-----
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 90eb14d..0ca5d59 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,9 @@ The `Factory` class provides a simple wrapper for the validation functionality,
 
 ```php
 use Dealroom\SocialsHelpers\Factory;
-use Dealroom\SocialsHelpers\Parser;
+use Dealroom\SocialsHelpers\Normalizers\TwitterNormalizer;
 
-$data = Factory::parseUrl('http://twitter.com/Dealroom', [Parser::PLATFORM_TWITTER])->getNormalizedUrl();
+$data = Factory::parseUrl('http://twitter.com/Dealroom', [TwitterNormalizer::getPlatform()])->getNormalizedUrl();
 
 echo $data;
 
@@ -38,9 +38,9 @@ Or if you want to extract social network ID (handle):
 
 ```php
 use Dealroom\SocialsHelpers\Factory;
-use Dealroom\SocialsHelpers\Parser;
+use Dealroom\SocialsHelpers\Normalizers\TwitterNormalizer;
 
-$data = Factory::parseUrl('https://twitter.com/dealroom', [Parser::PLATFORM_TWITTER])->getId();
+$data = Factory::parseUrl('https://twitter.com/dealroom', [TwitterNormalizer::getPlatform()])->getId();
 
 echo $data;
 
@@ -65,31 +65,22 @@ The following platforms are supported by default:
 ### Registering new platforms
 
 To register a new normalizer, you need to create a new class that implements
-the `NormalizerInterface` interface and add it to the `Factory` class.
+the `NormalizerInterface` interface (for example, by extending the `AbstractNormalizer` class).
+After that, you need to register the new normalizer in the `Factory` class.
 
 ```php
-use Dealroom\SocialsHelpers\Normalizers\NormalizerInterface;
+use Dealroom\SocialsHelpers\Normalizers\AbstractNormalizer;
+use Dealroom\SocialsHelpers\Normalizers\Factory;
+use Dealroom\SocialsHelpers\Factory;
 
-class CustomNormalizer implements NormalizerInterface
+class CustomNormalizer extends AbstractNormalizer
 {
     // Implement the interface methods
 }
-```
-
-Then add it to the `Factory` class
-
-```php
-use Dealroom\SocialsHelpers\Normalizers\Factory;
 
 Factory::addNormalizer(CustomNormalizer::class);
-```
-
-And now, you can use it
-
-```php
-use Dealroom\SocialsHelpers\Factory;
 
-$data = Factory::parseUrl('https://custom.com/Dealroom', [Parser::PLATFORM_CUSTOM])->getNormalizedUrl();
+$data = Factory::parseUrl('https://custom.com/Dealroom', [CustomNormalizer::getPlatform()])->getNormalizedUrl();
 ```
 
 ## Testing
diff --git a/src/Normalizers/AbstractNormalizer.php b/src/Normalizers/AbstractNormalizer.php
index 6f2fab9..c456cc8 100644
--- a/src/Normalizers/AbstractNormalizer.php
+++ b/src/Normalizers/AbstractNormalizer.php
@@ -12,7 +12,6 @@ abstract class AbstractNormalizer implements NormalizerInterface
     protected string $pattern;
     protected string $normalizedUrl;
     protected int|array $idPosition;
-
     protected array $cleanUrlSettings = ['forceHTTPS' => true, 'forceLowerCase' => true];
 
     public function normalize(string $url): string
diff --git a/src/Result.php b/src/Result.php
index 05c7514..2955786 100644
--- a/src/Result.php
+++ b/src/Result.php
@@ -7,18 +7,14 @@
 use Dealroom\SocialsHelpers\Normalizers\Factory as NormalizerFactory;
 use Dealroom\SocialsHelpers\Normalizers\NormalizerInterface;
 
-class Result
+readonly class Result
 {
-    private string $platform;
-    private string $url;
     private string $normalizedUrl;
     private string $id;
     private NormalizerInterface $normalizer;
 
-    public function __construct(string $platform, string $url)
+    public function __construct(private string $platform, private string $url)
     {
-        $this->platform = $platform;
-        $this->url = $url;
         $this->normalizer = $this->getNormalizer();
         $this->normalizedUrl = $this->normalizer->normalize($this->url);
         $this->id = $this->normalizer->normalizeToId($this->url);