Fixes execution of composer scripts and updates dependencies. (#10)

* fix: Fixes execution of composer scripts and updates dependencies.

Author: gustavofreze

.github/workflows/auto-assign.yml

@@ -1,9 +1,12 @@
-name: Auto assign issues
+name: Auto assign issues and pull requests
 
 on:
   issues:
     types:
       - opened
+  pull_request:
+    types:
+      - opened
 
 jobs:
   run:
@@ -12,11 +15,11 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - name: Assign issues
-        uses: gustavofreze/auto-assign@1.0.0
+      - name: Assign issues and pull requests
+        uses: gustavofreze/auto-assign@1.1.4
         with:
           assignees: '${{ secrets.ASSIGNEES }}'
           github_token: '${{ secrets.GITHUB_TOKEN }}'
           allow_self_assign: 'true'
           allow_no_assignees: 'true'
-          assignment_options: 'ISSUE'
+          assignment_options: 'ISSUE,PULL_REQUEST'

.github/workflows/ci.yml

@@ -1,7 +1,6 @@
 name: CI
 
 on:
-  push:
   pull_request:
 
 permissions:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2024 Tiny Blocks
+Copyright (c) 2022-2025 Tiny Blocks
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,4 +1,17 @@
-DOCKER_RUN = docker run --rm -it --net=host -v ${PWD}:/app -w /app gustavofreze/php:8.3
+ifeq ($(OS),Windows_NT)
+    PWD := $(shell cd)
+else
+    PWD := $(shell pwd -L)
+endif
+
+ARCH := $(shell uname -m)
+PLATFORM :=
+
+ifeq ($(ARCH),arm64)
+    PLATFORM := --platform=linux/amd64
+endif
+
+DOCKER_RUN = docker run ${PLATFORM} --rm -it --net=host -v ${PWD}:/app -w /app gustavofreze/php:8.3
 
 .PHONY: configure test test-file test-no-coverage review show-reports clean
 
@@ -9,7 +22,7 @@ test:
 	@${DOCKER_RUN} composer tests
 
 test-file:
-	@${DOCKER_RUN} composer tests-file-no-coverage ${FILE}
+	@${DOCKER_RUN} composer test-file ${FILE}
 
 test-no-coverage:
 	@${DOCKER_RUN} composer tests-no-coverage
@@ -22,4 +35,4 @@ show-reports:
 
 clean:
 	@sudo chown -R ${USER}:${USER} ${PWD}
-	@rm -rf report vendor .phpunit.cache
+	@rm -rf report vendor .phpunit.cache *.lock

composer.json

@@ -47,27 +47,28 @@
         "phpmd/phpmd": "^2.15",
         "phpunit/phpunit": "^11",
         "phpstan/phpstan": "^1",
-        "infection/infection": "^0.29",
+        "infection/infection": "^0",
         "squizlabs/php_codesniffer": "^3.11"
     },
     "suggest": {
         "ext-bcmath": "Enables the extension which is an interface to the GNU implementation as a Basic Calculator utility library."
     },
     "scripts": {
+        "test": "phpunit -d memory_limit=2G --configuration phpunit.xml tests",
         "phpcs": "phpcs --standard=PSR12 --extensions=php ./src",
         "phpmd": "phpmd ./src text phpmd.xml --suffixes php --ignore-violations-on-exit",
         "phpstan": "phpstan analyse -c phpstan.neon.dist --quiet --no-progress",
-        "test": "phpunit --log-junit=report/coverage/junit.xml --coverage-xml=report/coverage/coverage-xml --coverage-html=report/coverage/coverage-html tests",
-        "test-mutation": "infection --only-covered --logger-html=report/coverage/mutation-report.html --coverage=report/coverage --min-msi=100 --min-covered-msi=100 --threads=4",
-        "test-no-coverage": "phpunit --no-coverage",
+        "test-file": "phpunit --configuration phpunit.xml --no-coverage --filter",
+        "mutation-test": "infection --only-covered --threads=max --logger-html=report/coverage/mutation-report.html --coverage=report/coverage",
+        "test-no-coverage": "phpunit --configuration phpunit.xml --no-coverage tests",
         "review": [
             "@phpcs",
             "@phpmd",
             "@phpstan"
         ],
         "tests": [
             "@test",
-            "@test-mutation"
+            "@mutation-test"
         ],
         "tests-no-coverage": [
             "@test-no-coverage"

infection.json.dist

@@ -1,15 +1,19 @@
 {
-    "timeout": 30,
-    "testFramework": "phpunit",
+    "logs": {
+        "text": "report/infection/logs/infection-text.log",
+        "summary": "report/infection/logs/infection-summary.log"
+    },
     "tmpDir": "report/infection/",
+    "minMsi": 100,
+    "timeout": 30,
     "source": {
         "directories": [
             "src"
         ]
     },
-    "logs": {
-        "text": "report/infection/logs/infection-text.log",
-        "summary": "report/infection/logs/infection-summary.log"
+    "phpUnit": {
+        "configDir": "",
+        "customPath": "./vendor/bin/phpunit"
     },
     "mutators": {
         "@default": true,
@@ -18,12 +22,9 @@
         "Increment": false,
         "GreaterThan": false,
         "UnwrapSubstr": false,
-        "UnwrapStrToLower": false,
         "LogicalAndNegation": false,
         "LogicalAndAllSubExprNegation": false
     },
-    "phpUnit": {
-        "configDir": "",
-        "customPath": "./vendor/bin/phpunit"
-    }
+    "minCoveredMsi": 100,
+    "testFramework": "phpunit"
 }

phpunit.xml

@@ -6,6 +6,7 @@
          failOnRisky="true"
          failOnWarning="true"
          cacheDirectory=".phpunit.cache"
+         executionOrder="random"
          beStrictAboutOutputDuringTests="true">
 
     <source>
@@ -22,14 +23,15 @@
 
     <coverage>
         <report>
+            <xml outputDirectory="report/coverage/coverage-xml"/>
+            <html outputDirectory="report/coverage/coverage-html"/>
             <text outputFile="report/coverage.txt"/>
-            <html outputDirectory="report/html/"/>
             <clover outputFile="report/coverage-clover.xml"/>
         </report>
     </coverage>
 
     <logging>
-        <junit outputFile="report/execution-result.xml"/>
+        <junit outputFile="report/coverage/junit.xml"/>
     </logging>
 
 </phpunit>

src/Base62.php

@@ -10,9 +10,9 @@
 
 final readonly class Base62 implements Encoder
 {
-    public const int BASE62_RADIX = 62;
     private const int BASE62_CHARACTER_LENGTH = 1;
 
+    public const string BASE62_RADIX = '62';
     private const string BASE62_ALPHABET = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
     private function __construct(private string $value)
@@ -58,7 +58,7 @@ public function decode(): string
             return str_repeat("\x00", $bytes);
         }
 
-        $decimal = Decimal::fromBase62(number: $value, alphabet: self::BASE62_ALPHABET);
+        $decimal = Decimal::from(number: $value, alphabet: self::BASE62_ALPHABET, baseRadix: self::BASE62_RADIX);
         $hexadecimal = Hexadecimal::from(value: $decimal->toHexadecimal())
             ->fillWithZeroIfNecessary()
             ->toString();

src/Internal/Decimal.php

@@ -4,23 +4,21 @@
 
 namespace TinyBlocks\Encoder\Internal;
 
-use TinyBlocks\Encoder\Base62;
-
 final readonly class Decimal
 {
     private function __construct(private string $value)
     {
     }
 
-    public static function fromBase62(string $number, string $alphabet): Decimal
+    public static function from(string $number, string $alphabet, string $baseRadix): Decimal
     {
         $value = '0';
         $length = strlen($number);
 
         for ($index = 0; $index < $length; $index++) {
-            $digit = strpos($alphabet, $number[$index]);
-            $value = bcmul($value, (string)Base62::BASE62_RADIX);
-            $value = bcadd($value, (string)$digit);
+            $digit = (string)strpos($alphabet, $number[$index]);
+            $value = bcmul($value, $baseRadix);
+            $value = bcadd($value, $digit);
         }
 
         return new Decimal(value: $value);
@@ -32,8 +30,8 @@ public function toHexadecimal(): string
         $hexadecimalValue = '';
 
         while (bccomp($value, '0') > 0) {
-            $remainder = bcmod($value, Hexadecimal::HEXADECIMAL_RADIX);
-            $hexadecimalValue = sprintf('%s%s', Hexadecimal::HEXADECIMAL_ALPHABET[(int)$remainder], $hexadecimalValue);
+            $remainder = (int)bcmod($value, Hexadecimal::HEXADECIMAL_RADIX);
+            $hexadecimalValue = sprintf('%s%s', Hexadecimal::HEXADECIMAL_ALPHABET[$remainder], $hexadecimalValue);
             $value = bcdiv($value, Hexadecimal::HEXADECIMAL_RADIX);
         }
 

src/Internal/Hexadecimal.php

@@ -59,24 +59,24 @@ public function isEmpty(): bool
         return empty($this->value);
     }
 
-    public function toBase(int $base): string
+    public function toBase(string $base): string
     {
         $length = strlen($this->value);
         $decimalValue = '0';
 
         for ($index = 0; $index < $length; $index++) {
-            $digit = strpos(self::HEXADECIMAL_ALPHABET, strtolower($this->value[$index]));
+            $digit = (string)strpos(self::HEXADECIMAL_ALPHABET, $this->value[$index]);
             $decimalValue = bcmul($decimalValue, self::HEXADECIMAL_RADIX);
-            $decimalValue = bcadd($decimalValue, (string)$digit);
+            $decimalValue = bcadd($decimalValue, $digit);
         }
 
         $digits = $this->alphabet;
         $result = '';
 
         while (bccomp($decimalValue, '0') > 0) {
-            $remainder = bcmod($decimalValue, (string)$base);
-            $result = sprintf('%s%s', $digits[(int)$remainder], $result);
-            $decimalValue = bcdiv($decimalValue, (string)$base);
+            $remainder = (int)bcmod($decimalValue, $base);
+            $result = sprintf('%s%s', $digits[$remainder], $result);
+            $decimalValue = bcdiv($decimalValue, $base);
         }
 
         return $result ?: '0';