Merge pull request #19 from macocci7/support_php_8.5

Support PHP 8.5

Author: macocci7

.github/workflows/tag_meged_pull_request.yml

@@ -3,56 +3,12 @@ name: Test and Static Analysis (Pull Request)
 on: pull_request
 
 jobs:
-  check-version-in-composer-json:
-    name: Check Version
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.3
-          tools: composer:v2
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: PHP Version Check
-        run: php -v
-
-      - name: Validate Composer JSON
-        run: composer validate
-
-      - name: Get Version From Comopser JSON
-        id: new-version
-        run: |
-          echo version=$(cat composer.json | grep version | head -1 | grep -Po '\d+\.\d+\.\d+') >> $GITHUB_OUTPUT
-      
-      - name: Show New Version
-        run: echo "version=${{ steps.new-version.outputs.version }}"
-
-      - name: Show Tags
-        run: git tag
-
-      - name: Check If The Version Is Not In The Tag List
-        run: |
-          for tag in `git tag`
-          do
-            if [ $tag = ${{ steps.new-version.outputs.version }} ]; then
-              echo "version ${{ steps.new-version.outputs.version }} already exists."
-              exit 1
-            fi
-          done
-          echo "OK."
-
   test-and-static-analysis:
     name: Test and Lint
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1', '8.2', '8.3', '8.4']
+        php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
     steps:
       - name: Set up PHP
@@ -63,12 +19,12 @@ jobs:
           tools: composer:v2
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.x'
+          node-version: '24.x'
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -88,11 +44,6 @@ 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 Code Sniffer
         run: |
           ./vendor/bin/phpcs --version
@@ -115,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.3']
+        php: ['8.4']
 
     steps:
       - name: Set up PHP
@@ -126,12 +77,12 @@ jobs:
           tools: composer:v2
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20.x'
+          node-version: '24.x'
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/test_pull_request.yml

@@ -1,3 +1,4 @@
+8.5
 8.4
 8.3
 8.2

PHP_VERSIONS

@@ -662,8 +662,4 @@ Then, run the PHP code.
 
 ***
 
-*Document written: 2023/06/06*
-
-*Document updated: 2025/01/04*
-
 Copyright 2023 - 2025 macocci7.

README.md

@@ -2,10 +2,10 @@
 
 # Script to Test and Lint
 # requirement:
-# - https://github.com/jdx/mise installed
+# - https://github.com/phpenv/phpenv installed
 # - PHP versions defined in ../PHP_VERSIONS installed
 
-CMD=mise
+CMD=phpenv
 $CMD -v &> /dev/null
 if [ $? -ne 0 ]; then
     echo "command [${CMD}] not found!"
@@ -19,13 +19,33 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
-switch_version() {
-    echo "==========================================================="
-    echo "[PHP $1][Switching PHP version to $1]"
-    mise x php@$1 -- bash bin/TestAndLintSub.sh $1;
+test_and_lint() {
+    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][phpstan]"
+    ./vendor/bin/phpstan analyze -c phpstan.neon
+    echo "-----------------------------------------------------------"
+    echo "[PHP $1][phpunit]"
+    ./vendor/bin/phpunit ./tests/
+    echo "-----------------------------------------------------------"
 }
 
-echo "[[TestAndLint.sh]]"
+echo "[[TesAndLint.sh]]"
 
 SUPPORTED_PHP_VERSIONS=PHP_VERSIONS
 if [ ! -f $SUPPORTED_PHP_VERSIONS ]; then
@@ -40,6 +60,6 @@ if [ ! -r $SUPPORTED_PHP_VERSIONS ]; then
 fi
 STR_CMD=''
 while read version ; do
-    STR_CMD="$STR_CMD switch_version $version;"
+    STR_CMD="$STR_CMD test_and_lint $version;"
 done < $SUPPORTED_PHP_VERSIONS
 eval $STR_CMD

bin/CheckVersion.sh

@@ -1,7 +1,6 @@
 {
     "name": "macocci7/php-scatterplot",
     "description": "PHP-Scatterplot is a simple PHP library to create scatter plot easily.",
-    "version": "1.2.3",
     "type": "library",
     "license": "MIT",
     "autoload": {
@@ -18,14 +17,14 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=8.1",
-        "intervention/image": "^3.10",
+        "intervention/image": "^3.11",
         "macocci7/php-frequency-table": "^1.4",
         "macocci7/php-csv": "^1.1",
         "macocci7/php-combination": "^1.1",
         "nette/neon": "^3.4"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "^3.11",
+        "squizlabs/php_codesniffer": "^4.0",
         "phpunit/phpunit": "^10.5",
         "phpstan/phpstan": "^2.1",
         "php-parallel-lint/php-parallel-lint": "^1.4"

bin/TestAndLint.sh

@@ -32,7 +32,6 @@ public function test_load_can_load_config_file_correctly(): void
         Config::load();
         $r = new \ReflectionClass(Config::class);
         $p = $r->getProperty('conf');
-        $p->setAccessible(true);
         $this->assertSame(
             Neon::decodeFile($this->testConf),
             $p->getValue()[$this::class]