Some fixes

Author: Eldario

Dockerfile

@@ -2,7 +2,7 @@ FROM php:8.3-alpine
 
 ENV COMPOSER_HOME="/tmp/composer"
 
-COPY --from=composer:2.8.9 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.8 /usr/bin/composer /usr/bin/composer
 
 RUN set -x \
     && apk add --no-cache binutils git \

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.2'
-
 volumes:
   composer-data:
 

src/Extensions/BodyCodeValidatorExtension.php

@@ -42,16 +42,11 @@ public function passes(string $attribute, $value): bool
 
         $length = \mb_strlen($value, 'UTF-8');
 
-        if ($length >= self::LENGTH_MIN && $length <= self::LENGTH_MAX &&
-            Strings::hasOnlyUppercaseLetters($value) &&
-            Strings::hasOnlyLettersAndDigits($value) &&
-            Strings::hasAtLeastOneNotZeroDigit($value) &&
-            !$this->hasBothAlphabets($value)
-        ) {
-            return true;
-        }
-
-        return false;
+        return $length >= self::LENGTH_MIN && $length <= self::LENGTH_MAX
+            && Strings::hasOnlyUppercaseLetters($value)
+            && Strings::hasOnlyLettersAndDigits($value)
+            && Strings::hasAtLeastOneNotZeroDigit($value)
+            && !$this->hasBothAlphabets($value);
     }
 
     /**

src/Extensions/VinCodeValidatorExtension.php

@@ -34,18 +34,10 @@ public function name(): string
      */
     public function passes(string $attribute, $value): bool
     {
-        if (!\is_string($value)) {
-            return false;
-        }
-
-        if ($this->hasVinCodeFormat($value) &&
-            Strings::hasAtLeastOneLatinLetter($value) &&
-            Strings::hasAtLeastOneNotZeroDigit($value)
-        ) {
-            return true;
-        }
-
-        return false;
+        return \is_string($value)
+            && $this->hasVinCodeFormat($value)
+            && Strings::hasAtLeastOneLatinLetter($value)
+            && Strings::hasAtLeastOneNotZeroDigit($value);
     }
 
     /**