Update to use PHP 8.1 syntax

Signed-off-by: Abdul Malik Ikhsan <[email protected]>
laminas · Nov 3, 2024 · 5c21c32 · 5c21c32
1 parent 1c3fa63
commit 5c21c32
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 61 deletions.
diff --git a/src/CountryCode.php b/src/CountryCode.php
@@ -17,7 +17,7 @@
 final class CountryCode
 {
     /** @param non-empty-string $code */
-    private function __construct(private string $code)
+    private function __construct(private readonly string $code)
     {
     }
 

diff --git a/src/Geography/DefaultCountryCodeList.php b/src/Geography/DefaultCountryCodeList.php
@@ -291,9 +291,7 @@ public function count(): int
     public function toArray(): array
     {
         return array_map(
-            static function (string $code): CountryCode {
-                return CountryCode::fromString($code);
-            },
+            static fn(string $code): CountryCode => CountryCode::fromString($code),
             self::LIST
         );
     }

diff --git a/src/Translator/Loader/PhpMemoryArray.php b/src/Translator/Loader/PhpMemoryArray.php
@@ -15,13 +15,9 @@
  */
 class PhpMemoryArray implements RemoteLoaderInterface
 {
-    /** @var array */
-    protected $messages;
-
     /** @param array $messages */
-    public function __construct($messages)
+    public function __construct(protected $messages)
     {
-        $this->messages = $messages;
     }
 
     /**

diff --git a/src/Translator/LoaderPluginManager.php b/src/Translator/LoaderPluginManager.php
@@ -9,8 +9,7 @@
 use Laminas\ServiceManager\Exception\InvalidServiceException;
 use Laminas\ServiceManager\Factory\InvokableFactory;
 
-use function gettype;
-use function is_object;
+use function get_debug_type;
 use function sprintf;
 
 /**
@@ -112,7 +111,7 @@ public function validate($plugin)
 
         throw new InvalidServiceException(sprintf(
             'Plugin of type %s is invalid; must implement %s or %s',
-            is_object($plugin) ? $plugin::class : gettype($plugin),
+            get_debug_type($plugin),
             FileLoaderInterface::class,
             RemoteLoaderInterface::class
         ));
@@ -134,10 +133,10 @@ public function validatePlugin($plugin)
     {
         try {
             $this->validate($plugin);
-        } catch (InvalidServiceException $e) {
+        } catch (InvalidServiceException) {
             throw new Exception\RuntimeException(sprintf(
                 'Plugin of type %s is invalid; must implement %s or %s',
-                is_object($plugin) ? $plugin::class : gettype($plugin),
+                get_debug_type($plugin),
                 FileLoaderInterface::class,
                 RemoteLoaderInterface::class
             ));

diff --git a/src/Translator/LoaderPluginManagerFactory.php b/src/Translator/LoaderPluginManagerFactory.php
@@ -32,7 +32,7 @@ class LoaderPluginManagerFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $name, ?array $options = null)
     {
-        $options       = $options ?? [];
+        $options     ??= [];
         $pluginManager = new LoaderPluginManager($container, $options);
 
         // If this is in a laminas-mvc application, the ServiceListener will inject

diff --git a/src/Translator/Plural/Rule.php b/src/Translator/Plural/Rule.php
@@ -28,23 +28,20 @@ class Rule
      */
     protected $ast;
 
-    /**
-     * Number of plurals in this rule.
-     *
-     * @var int
-     */
-    protected $numPlurals;
-
     /**
      * Create a new plural rule.
      *
      * @param int   $numPlurals
      * @param array $ast
      */
-    protected function __construct($numPlurals, array $ast)
-    {
-        $this->numPlurals = $numPlurals;
-        $this->ast        = $ast;
+    protected function __construct(
+        /**
+         * Number of plurals in this rule.
+         */
+        protected $numPlurals,
+        array $ast
+    ) {
+        $this->ast = $ast;
     }
 
     /**

diff --git a/src/Translator/Plural/Symbol.php b/src/Translator/Plural/Symbol.php
@@ -24,20 +24,6 @@ class Symbol
      */
     public $parser;
 
-    /**
-     * Node or token type name.
-     *
-     * @var string
-     */
-    public $id;
-
-    /**
-     * Left binding power (precedence).
-     *
-     * @var int
-     */
-    public $leftBindingPower;
-
     /**
      * Getter for null denotation.
      *
@@ -86,11 +72,18 @@ class Symbol
      * @param  string  $id
      * @param  int $leftBindingPower
      */
-    public function __construct(Parser $parser, $id, $leftBindingPower)
-    {
-        $this->parser           = $parser;
-        $this->id               = $id;
-        $this->leftBindingPower = $leftBindingPower;
+    public function __construct(
+        Parser $parser,
+        /**
+         * Node or token type name.
+         */
+        public $id,
+        /**
+         * Left binding power (precedence).
+         */
+        public $leftBindingPower
+    ) {
+        $this->parser = $parser;
     }
 
     /**

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -346,7 +346,7 @@ public function getPluginManager()
     public function translate($message, $textDomain = 'default', $locale = null)
     {
         $locale      = $locale === '' ? null : $locale;
-        $locale      = $locale ?? $this->getLocale();
+        $locale    ??= $this->getLocale();
         $translation = $this->getTranslatedMessage($message, $locale, $textDomain);
 
         if ($translation !== null && $translation !== '') {
@@ -381,7 +381,7 @@ public function translatePlural(
         $textDomain = 'default',
         $locale = null
     ) {
-        $locale      = $locale ?? $this->getLocale();
+        $locale    ??= $this->getLocale();
         $translation = $this->getTranslatedMessage($singular, $locale, $textDomain);
 
         if (is_string($translation)) {
@@ -493,7 +493,7 @@ public function addTranslationFile(
         $textDomain = 'default',
         $locale = null
     ) {
-        $locale = $locale ?? '*';
+        $locale ??= '*';
 
         if (! isset($this->files[$textDomain])) {
             $this->files[$textDomain] = [];
@@ -754,7 +754,7 @@ protected function loadMessagesFromFiles($textDomain, $locale)
      */
     public function getAllMessages($textDomain = 'default', $locale = null)
     {
-        $locale = $locale ?? $this->getLocale();
+        $locale ??= $this->getLocale();
 
         if (! isset($this->messages[$textDomain][$locale])) {
             $this->loadMessages($textDomain, $locale);

diff --git a/src/Validator/DateTime.php b/src/Validator/DateTime.php
@@ -299,7 +299,7 @@ public function isValid($value)
                 $this->invalidateFormatter = true;
                 return false;
             }
-        } catch (IntlException $intlException) {
+        } catch (IntlException) {
             $this->error(self::INVALID_DATETIME);
             $this->invalidateFormatter = true;
             return false;

diff --git a/src/Validator/IsInt.php b/src/Validator/IsInt.php
@@ -174,7 +174,7 @@ public function isValid($value)
                 $this->error(self::NOT_INT);
                 return false;
             }
-        } catch (IntlException $intlException) {
+        } catch (IntlException) {
             $this->error(self::NOT_INT);
             return false;
         }

diff --git a/src/Validator/PhoneNumber.php b/src/Validator/PhoneNumber.php
@@ -14,8 +14,8 @@
 use function is_scalar;
 use function is_string;
 use function preg_match;
+use function str_starts_with;
 use function strlen;
-use function strpos;
 use function strtoupper;
 use function substr;
 
@@ -233,11 +233,11 @@ public function isValid($value = null, $context = null)
          *   3) Bare country prefix
          */
         $valueNoCountry = null;
-        if (0 === strpos((string) $value, '+' . $countryPattern['code'])) {
+        if (str_starts_with((string) $value, '+' . $countryPattern['code'])) {
             $valueNoCountry = substr((string) $value, $codeLength + 1);
-        } elseif (0 === strpos((string) $value, '00' . $countryPattern['code'])) {
+        } elseif (str_starts_with((string) $value, '00' . $countryPattern['code'])) {
             $valueNoCountry = substr((string) $value, $codeLength + 2);
-        } elseif (0 === strpos((string) $value, $countryPattern['code'])) {
+        } elseif (str_starts_with((string) $value, $countryPattern['code'])) {
             $valueNoCountry = substr((string) $value, $codeLength);
         }
 

diff --git a/src/Validator/PostCode.php b/src/Validator/PostCode.php
@@ -389,7 +389,7 @@ public function isValid($value)
                     $this->error(self::SERVICE, $value);
                     return false;
                 }
-            } catch (\Exception $e) {
+            } catch (\Exception) {
                 $this->error(self::SERVICEFAILURE, $value);
                 return false;
             }

diff --git a/src/View/Helper/CountryCodeDataList.php b/src/View/Helper/CountryCodeDataList.php
@@ -23,9 +23,9 @@
 final class CountryCodeDataList
 {
     public function __construct(
-        private CountryCodeListInterface $codeList,
-        private Escaper $escaper,
-        private string $defaultLocale
+        private readonly CountryCodeListInterface $codeList,
+        private readonly Escaper $escaper,
+        private readonly string $defaultLocale
     ) {
     }
 
@@ -35,8 +35,8 @@ public function __construct(
      */
     public function __invoke(?string $locale = null, array $dataListAttributes = []): string
     {
-        $locale = $locale ?? $this->defaultLocale;
-        $list   = array_map(function (CountryCode $code) use ($locale): string {
+        $locale ??= $this->defaultLocale;
+        $list     = array_map(function (CountryCode $code) use ($locale): string {
             $name = Locale::getDisplayRegion('-' . $code->toString(), $locale);
             return sprintf(
                 '<option value="%s" label="%s">',