Merge pull request #26 from macocci7/upgrade_dependencies

macocci7 · web-flow · commit e1823e8b57a2 · 2025-01-04T13:41:33.000+09:00
Upgrade dependencies
diff --git a/.github/workflows/tag_meged_pull_request.yml b/.github/workflows/tag_meged_pull_request.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           coverage: xdebug
           tools: composer:v2
 
diff --git a/.github/workflows/test_pull_request.yml b/.github/workflows/test_pull_request.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           tools: composer:v2
 
       - name: Checkout code
@@ -52,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Set up PHP
@@ -65,7 +65,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: '20.x'
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -88,10 +88,10 @@ jobs:
       #- name: Neon Lint
       #  run: ./vendor/nette/neon/bin/neon-lint conf
 
-      - name: PHP MD
-        run: |
-          ./vendor/bin/phpmd --version
-          ./vendor/bin/phpmd ./src/ ./examples/ ./tests/ text phpmd.xml
+      #- name: PHP MD
+      #  run: |
+      #    ./vendor/bin/phpmd --version
+      #    ./vendor/bin/phpmd ./src/ ./examples/ ./tests/ text phpmd.xml
 
       - name: PHP Code Sniffer
         run: |
@@ -115,7 +115,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1']
+        php: ['8.3']
 
     steps:
       - name: Set up PHP
@@ -128,7 +128,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: '20.x'
 
       - name: Checkout code
         uses: actions/checkout@v4
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /vendor/
 composer.lock
-.php-version
+.php-version
+.tool-versions
diff --git a/PHP_VERSIONS b/PHP_VERSIONS
@@ -1,3 +1,4 @@
+8.4
 8.3
 8.2
 8.1
diff --git a/README.md b/README.md
@@ -980,6 +980,6 @@ with patterns of `size`, `color` and `amount`.
 
 *Document Created: 2023/11/11*
 
-*Document Updated: 2024/05/15*
+*Document Updated: 2025/01/04*
 
-Copyright 2023 - 2024 macocci7
+Copyright 2023 - 2025 macocci7
diff --git a/bin/TestAndLint.sh b/bin/TestAndLint.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/bash
 
 # Script to Test and Lint
-# - for the repository: macocci7/php-combination
 # requirement:
-# - phpenv/phpenv
+# - https://github.com/jdx/mise installed
 # - PHP versions defined in ../PHP_VERSIONS installed
 
-CMD=phpenv
+CMD=mise
 $CMD -v &> /dev/null
 if [ $? -ne 0 ]; then
     echo "command [${CMD}] not found!"
@@ -20,46 +19,13 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-test_and_lint() {
+switch_version() {
     echo "==========================================================="
-    echo "[PHP $1][phpenv local $1]"
-    phpenv local $1
-    if [ $? -ne 0 ]; then
-        echo "Failed to switch version to $i. skipped."
-        return 1
-    fi
-    echo "-----------------------------------------------------------"
-    echo "[PHP $1][php -v]"
-    php -v
-    echo "-----------------------------------------------------------"
-    echo "[PHP $1][parallel-lint]"
-    ./vendor/bin/parallel-lint src tests examples
-    #echo "-----------------------------------------------------------"
-    #echo "[PHP $1][neon-lint]"
-    #./vendor/nette/neon/bin/neon-lint conf
-    echo "-----------------------------------------------------------"
-    echo "[PHP $1][phpcs]"
-    ./vendor/bin/phpcs --ignore=vendor \
-                       --standard=phpcs.xml \
-                       -p \
-                       -s \
-                       .
-    echo "-----------------------------------------------------------"
-    echo "[PHP $1][phpmd]"
-    ./vendor/bin/phpmd \
-                       ./src/ ./examples/ ./tests/ text \
-                       phpmd.xml
-    echo "-----------------------------------------------------------"
-    echo "[PHP $1][phpstan]"
-    ./vendor/bin/phpstan analyze -c phpstan.neon
-    echo "-----------------------------------------------------------"
-    echo "[PHP $1][phpunit]"
-    ./vendor/bin/phpunit ./tests/ \
-                         --color=auto
-    echo "-----------------------------------------------------------"
+    echo "[PHP $1][Switching PHP version to $1]"
+    mise x php@$1 -- bash bin/TestAndLintSub.sh $1;
 }
 
-echo "[[TesAndLint.sh]]"
+echo "[[TestAndLint.sh]]"
 
 SUPPORTED_PHP_VERSIONS=PHP_VERSIONS
 if [ ! -f $SUPPORTED_PHP_VERSIONS ]; then
@@ -74,6 +40,6 @@ if [ ! -r $SUPPORTED_PHP_VERSIONS ]; then
 fi
 STR_CMD=''
 while read version ; do
-    STR_CMD="$STR_CMD test_and_lint $version;"
+    STR_CMD="$STR_CMD switch_version $version;"
 done < $SUPPORTED_PHP_VERSIONS
 eval $STR_CMD
diff --git a/bin/TestAndLintSub.sh b/bin/TestAndLintSub.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/bash
+
+# Script to Test and Lint
+# requirement:
+# - PHP versions defined in ../PHP_VERSIONS installed
+
+echo "-----------------------------------------------------------"
+echo "[PHP $1][php -v]"
+php -v
+echo "-----------------------------------------------------------"
+echo "[PHP $1][parallel-lint]"
+./vendor/bin/parallel-lint src tests examples
+#echo "-----------------------------------------------------------"
+#echo "[PHP $1][neon-lint]"
+#./vendor/nette/neon/bin/neon-lint conf
+echo "-----------------------------------------------------------"
+echo "[PHP $1][phpcs]"
+./vendor/bin/phpcs --ignore=vendor \
+                    --standard=phpcs.xml \
+                    -p \
+                    -s \
+                    .
+#echo "-----------------------------------------------------------"
+#echo "[PHP $1][phpmd]"
+#./vendor/bin/phpmd \
+#                   ./src/ ./examples/ ./tests/ text \
+#                   phpmd.xml
+echo "-----------------------------------------------------------"
+echo "[PHP $1][phpstan]"
+./vendor/bin/phpstan analyze -c phpstan.neon
+echo "-----------------------------------------------------------"
+echo "[PHP $1][phpunit]"
+./vendor/bin/phpunit ./tests/
+echo "-----------------------------------------------------------"
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "macocci7/php-combination",
-    "version": "1.1.0",
-    "description": "a simple PHP library to make combinations",
+    "version": "1.1.1",
+    "description": "A simple PHP library to make combinations from array elements.",
     "type": "library",
     "license": "MIT",
     "autoload": {
@@ -17,12 +17,11 @@
     ],
     "minimum-stability": "stable",
     "require-dev": {
-        "squizlabs/php_codesniffer": "^3.7",
+        "squizlabs/php_codesniffer": "^3.11",
         "phpunit/phpunit": "^10.5",
-        "phpmd/phpmd": "^2.15",
-        "phpstan/phpstan": "^1.10",
-        "php-parallel-lint/php-parallel-lint": "^1.3",
-        "monolog/monolog": "^3.5"
+        "phpstan/phpstan": "^2.1",
+        "php-parallel-lint/php-parallel-lint": "^1.4",
+        "monolog/monolog": "^3.8"
     },
     "require": {
         "php": ">=8.1"

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 +8.4
 .3
 .2
 .1