Merge pull request #43 from WebFiori/dev

Dev
WebFiori · Dec 23, 2024 · 3f337d7 · 3f337d7
2 parents 3d126ef + 12e03bc
commit 3f337d7
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 209 deletions.
diff --git a/.github/workflows/php71.yml b/.github/workflows/php71.yml
diff --git a/.github/workflows/php72.yml b/.github/workflows/php72.yml
diff --git a/.github/workflows/php73.yml b/.github/workflows/php73.yml
diff --git a/.github/workflows/php74.yml b/.github/workflows/php74.yml
diff --git a/.github/workflows/php80.yml b/.github/workflows/php80.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps: 
       - name: Clone Repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -28,8 +28,6 @@ jobs:
           extensions: mysqli, mbstring, sqlsrv
           tools: phpunit:8.5.13
 
-      - name: Shutdown Ubuntu MySQL
-        run: sudo service mysql stop
 
       - name: Install Dependencies
         run: composer install --prefer-source --no-interaction --no-dev
@@ -38,4 +36,6 @@ jobs:
         run: phpunit
 
       - name: CodeCov
-        uses: codecov/codecov-action@v1   
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}    
diff --git a/.github/workflows/php81.yml b/.github/workflows/php81.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps: 
       - name: Clone Repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -37,10 +37,7 @@ jobs:
         run: phpunit
 
       - name: CodeCov
-        uses: codecov/codecov-action@v1
-
-      - name: SonarCloud
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: codecov/codecov-action@v4
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}  
+
diff --git a/.github/workflows/php82.yml b/.github/workflows/php82.yml
@@ -20,17 +20,14 @@ jobs:
 
     steps: 
       - name: Clone Repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }} 
           extensions: mysqli, mbstring, sqlsrv
           tools: phpunit:9.5.20, composer
-
-      - name: Shutdown Ubuntu MySQL
-        run: sudo service mysql stop
 
       - name: Install Dependencies
         run: composer install --prefer-source --no-interaction --no-dev
@@ -39,4 +36,6 @@ jobs:
         run: phpunit
 
       - name: CodeCov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}  
diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master, dev ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, dev ]
 
 jobs:
   test:
@@ -20,17 +20,14 @@ jobs:
 
     steps: 
       - name: Clone Repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }} 
           extensions: mysqli, mbstring, sqlsrv
           tools: phpunit:9.5.20, composer
-
-      - name: Shutdown Ubuntu MySQL
-        run: sudo service mysql stop
 
       - name: Install Dependencies
         run: composer install --prefer-source --no-interaction --no-dev
@@ -39,4 +36,26 @@ jobs:
         run: phpunit
 
       - name: CodeCov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}  
+
+      - name: SonarCloud Code Scan
+        uses: sonarsource/sonarqube-scan-action@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+  release_prod:
+    name: Prepare Production Release Branch / Publish Release
+    needs:
+      - "test"
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: google-github-actions/release-please-action@v3
+        with:
+          release-type: php
+          config-file: release-please-config.json
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/php70.yml → .github/workflows/php84.yml b/.github/workflows/php70.yml → .github/workflows/php84.yml
@@ -1,39 +1,44 @@
-name: Build PHP 7.0
+name: Build PHP 8.4
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, dev ]
   pull_request:
     branches: [ master ]
 
 jobs:
   test:
     runs-on: ${{ matrix.os }} 
-    
+
     strategy: 
       fail-fast: true
       matrix: 
         os: [ ubuntu-latest ]
-        php: [7.0]
+        php: [8.4]
 
     name: PHP${{matrix.php}} - ${{matrix.os}}
 
     steps: 
       - name: Clone Repo
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }} 
           extensions: mysqli, mbstring, sqlsrv
-          tools: phpunit:5.7.27, composer
+          tools: phpunit:9.5.20, composer
 
+      - name: Shutdown Ubuntu MySQL
+        run: sudo service mysql stop
+
       - name: Install Dependencies
         run: composer install --prefer-source --no-interaction --no-dev
-        
+
       - name: Execute Tests
         run: phpunit
 
       - name: CodeCov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}  
diff --git a/README.md b/README.md
@@ -47,16 +47,11 @@ According to [json.org](https://www.json.org/json-en.html), JSON is a data excha
 ## Supported PHP Versions
 |                                                                                        Build Status                                                                                         |
 |:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php70.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php70.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php71.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php71.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php72.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php72.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php73.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php73.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php74.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php74.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php80.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php80.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php81.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php81.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php82.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php82.yml/badge.svg?branch=master"></a> |
-| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php83.yml"><img src="https://github.com/WebFiori/json/actions/workflows/php83.yml/badge.svg?branch=master"></a> |
-
+| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php80.yml"><img src="https://github.com/WebFiori/json/workflows/php80.yml/badge.svg?branch=master"></a> |
+| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php81.yml"><img src="https://github.com/WebFiori/json/workflows/php81.yml/badge.svg?branch=master"></a> |
+| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php82.yml"><img src="https://github.com/WebFiori/json/workflows/php82.yml/badge.svg?branch=master"></a> |
+| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php83.yml"><img src="https://github.com/WebFiori/json/workflows/php83.yml/badge.svg?branch=master"></a> |
+| <a target="_blank" href="https://github.com/WebFiori/json/actions/workflows/php84.yml"><img src="https://github.com/WebFiori/json/workflows/php84.yml/badge.svg?branch=master"></a> |
 
 ## Installation
 If you are using composer to manage your dependencies, then it is possible to install the library by including the entry `"webfiori/jsonx":"*"` in the `require` section of your `composer.json` file to install the latest release. 

diff --git a/composer.json b/composer.json
@@ -2,6 +2,8 @@
     "name": "webfiori/jsonx",
     "type": "library",
     "description": "PHP library for creating well-formatted JSON strings.",
+    "type":"library",
+    "version":"3.3.0",
     "keywords": [
         "JSON", "PHP", "JSONx"
     ],