Merge pull request #93 from microsoft/release/serialization-json

Mono-repo updates for release

Author: microsoft-graph-devx-bot[bot]

.github/dependabot.yml

@@ -0,0 +1,49 @@
+name: "Tag & create GitHub release"
+
+on:
+  push:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: write
+
+jobs:
+  create-tag:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.get-version.outputs.VERSION }}
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Get lib version and set environment variable
+      id: get-version
+      run: |
+        VERSION=$(grep 'VERSION' src/Constants.php |  grep -oE '[0-9]+\.[0-9]+\.([0-9]+|[0-9]+-[a-z]+)')
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
+        echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
+
+    - name: Create and publish tag
+      run: |
+        git tag $VERSION
+        if [[ $? -ne 0 ]]; then
+          echo "Tag $VERSION already exists. Skipping tag creation."
+          exit 1
+        fi
+        git push origin $VERSION
+
+  create-release:
+    needs: create-tag
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Github Release
+      uses: taiki-e/create-gh-release-action@v1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN}}
+        ref: refs/tags/${{ needs.create-tag.outputs.version }}
+        changelog: "CHANGELOG.md"

.github/workflows/auto-merge-dependabot.yml

@@ -27,41 +27,12 @@ jobs:
           coverage: none
       - name: Install dependencies
         run: composer install
-      - name: Run static analysis
-        run: ./vendor/bin/phpstan
-      - name: Run tests without coverage
-        run: ./vendor/bin/phpunit
-
-  code-coverage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup PHP and Xdebug for Code Coverage report
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          coverage: xdebug
-      - name: Install dependencies
-        run: composer install
-      - name: Run static analysis
-        run: ./vendor/bin/phpstan
-      - name: Run tests with coverage
-        run: ./vendor/bin/phpunit --coverage-clover=coverage.xml
-      - name: Fix code coverage paths
-        run: sed -i 's@'$GITHUB_WORKSPACE'@/github/workspace/@g' coverage.xml
-      - name: SonarCloud Scan
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        uses: SonarSource/sonarcloud-github-action@master
-        env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   # The check-php-version-matrix returns success if all matrix jobs in build are successful; otherwise, it returns a failure.
   # Use this as a PR status check for GitHub Policy Service instead of individual matrix entry checks.
   check-php-version-matrix:
     runs-on: ubuntu-latest
-    needs: [build, code-coverage]
+    needs: [build]
     if: always()
     steps:
       - name: All build matrix options are successful

.github/workflows/create-release.yml

@@ -0,0 +1,38 @@
+name: "Re-run checks on Release PRs"
+
+on:
+  pull_request:
+    branches:
+      - main
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: write
+
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  PR_URL: ${{ github.event.pull_request.html_url }}
+
+jobs:
+  rerun-checks:
+    if: ${{ github.actor == 'microsoft-graph-devx-bot[bot]' }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    # Kiota Abstractions needs to be released first for PR checks to pass
+    # We delay before re-running checks to ensure Abstractions is already released
+    # We sleep before re-running checks to ensure the status checks have time to update (https://github.com/cli/cli/pull/2279#discussion_r513610296)
+    # Fetching checks on recently created branches can return a false "no required checks reported on the ... branch" error
+    - name: Delay and re-run checks
+      run: |
+        sleep 30
+        needsRerun=$(gh pr checks $PR_URL --required --watch --json bucket --jq '.[] | select(.bucket != "pass") | .bucket')
+        if [[ $needsRerun ]]; then
+          sleep 300
+          gh pr checks $PR_URL --required --json link --jq .[].link | grep -oP '/runs/\K\d+' | { read runId; gh run rerun $runId; }
+        fi

.github/workflows/pr-validation.yml

@@ -5,11 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [1.5.0](https://github.com/microsoft/kiota-php/compare/microsoft-kiota-serialization-json-v1.4.0...microsoft-kiota-serialization-json-v1.5.0) (2025-02-10)
 
-### Added
 
-### Changed
+### Features
+
+* add kiota bundle ([575e3bc](https://github.com/microsoft/kiota-php/commit/575e3bc147dfcdd02128db5cad46b82959d3e38e))
+* add release please configuration to monorepo ([57de3a2](https://github.com/microsoft/kiota-php/commit/57de3a20091d1cd349d3c4b0e840920ac3a57d75))
+
+
+### Bug Fixes
+
+* Json serialization tests namespace ([e80465e](https://github.com/microsoft/kiota-php/commit/e80465ea81e2fba6c524ce664a2fe18c867219d4))
+* removes call to addcslashes in getStringValue() functions ([f7097a1](https://github.com/microsoft/kiota-php/commit/f7097a1e13c71f5fe4246d61dc806ac7300412ea))
+* removes call to addcslashes in getStringValue() functions ([64db05d](https://github.com/microsoft/kiota-php/commit/64db05d895bf6e1b09462dbd184665a6e7b3a66f))
+* subproject config & CI ([673beef](https://github.com/microsoft/kiota-php/commit/673beef4ae3f99c94a7730bb3810d4a1abdf27d5))
 
 ## [1.3.1]
 

.github/workflows/rerun-pr-checks.yml

@@ -14,27 +14,20 @@ Read more about Kiota [here](https://github.com/microsoft/kiota/blob/main/README
 
 run `composer require microsoft/kiota-serialization-json` or add the following to your `composer.json` file:
 
-```Shell
+```
 {
     "require": {
-        "microsoft/kiota-serialization-json": "^1.3.0"
+        // x-release-please-start-version
+        "microsoft/kiota-serialization-json": "^1.5.0"
+        // x-release-end
     }
 }
 ```
 
 ## Contributing
 
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
-Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
-the rights to use your contribution. For details, visit https://cla.opensource.microsoft.com.
-
-When you submit a pull request, a CLA bot will automatically determine whether you need to provide
-a CLA and decorate the PR appropriately (e.g., status check, comment). Simply follow the instructions
-provided by the bot. You will only need to do this once across all repos using our CLA.
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
-contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
+This project welcomes contributions and suggestions. This project welcomes contributions and suggestions. Issues and pull requests should be made against the [kiota-php](https://github.com/microsoft/kiota-php/) repository.
+This repository is only used for releases.
 
 ## Trademarks
 

CHANGELOG.md

@@ -1,38 +1,40 @@
 {
-  "name": "microsoft/kiota-serialization-json",
-  "description": "Implementation of Kiota serialization abstractions using Json.",
-  "authors": [
-    {
-      "name": "Microsoft Graph Client Tooling",
-      "email": "[email protected]",
-      "role": "Developer"
+    "name": "microsoft/kiota-serialization-json",
+    "description": "Implementation of Kiota serialization abstractions using Json.",
+    "authors": [
+        {
+            "name": "Microsoft Graph Client Tooling",
+            "email": "[email protected]",
+            "role": "Developer"
+        }
+    ],
+    "license": [
+        "MIT"
+    ],
+    "autoload": {
+        "psr-4": {
+            "Microsoft\\Kiota\\Serialization\\Json\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Microsoft\\Kiota\\Serialization\\Json\\Tests\\": "tests"
+        }
+    },
+    "require": {
+        "microsoft/kiota-abstractions": "^1.5.0",
+        "guzzlehttp/psr7": "^1.6 || ^2",
+        "php": "^7.4 || ^8.0",
+        "ext-json": "*"
+    },
+    "require-dev": {
+        "roave/security-advisories": "dev-latest",
+        "phpunit/phpunit": "^9.6.22",
+        "phpstan/phpstan": "^1.12.16"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": false
+        }
     }
-  ],
-  "license": ["MIT"],
-  "autoload": {
-    "psr-4": {
-      "Microsoft\\Kiota\\Serialization\\Json\\": "src"
-    }
-  },
-  "autoload-dev": {
-	"psr-4": {
-		"Microsoft\\Kiota\\Serialization\\Tests\\": "tests"
-	}
-  },
-  "require": {
-    "microsoft/kiota-abstractions": "^1.4.0",
-    "guzzlehttp/psr7": "^1.6 || ^2",
-    "php": "^7.4 || ^8",
-    "ext-json": "*"
-  },
-  "require-dev": {
-    "roave/security-advisories": "dev-latest",
-    "phpunit/phpunit": "^8 || ^9",
-    "phpstan/phpstan": "^1.4"
-  },
-  "config": {
-    "allow-plugins": {
-      "php-http/discovery": false
-    }
-  }
 }

README.md

@@ -4,5 +4,7 @@
 
 final class Constants
 {
-    public const VERSION = '1.0.1';
+    // x-release-please-start-version
+    public const VERSION = '1.5.0';
+    // x-release-please-end
 }

composer.json

@@ -53,7 +53,7 @@ public function getChildNode(string $identifier): ?ParseNode {
      * @inheritDoc
      */
     public function getStringValue(): ?string {
-        return is_string($this->jsonNode) ? addcslashes($this->jsonNode, "\\\r\n") : null;
+        return is_string($this->jsonNode) ? $this->jsonNode : null;
     }
 
     /**

phpstan.neon

@@ -1,6 +1,6 @@
 <?php
 
-namespace Microsoft\Kiota\Serialization\Tests;
+namespace Microsoft\Kiota\Serialization\Json\Tests;
 
 use GuzzleHttp\Psr7\Utils;
 use InvalidArgumentException;