From 5ed4edc9315110a715e9763d27ee6761e1aaa00a Mon Sep 17 00:00:00 2001 From: Carlos Granados Date: Fri, 17 Mar 2023 12:15:09 +0100 Subject: [PATCH 1/4] fix: calling class_exists with null in Google\Model (#2405) --- src/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Model.php b/src/Model.php index 95328f5d3..87f437d66 100644 --- a/src/Model.php +++ b/src/Model.php @@ -294,7 +294,7 @@ protected function keyType($key) $keyType = $key . "Type"; // ensure keyType is a valid class - if (property_exists($this, $keyType) && class_exists($this->$keyType)) { + if (property_exists($this, $keyType) && $this->$keyType !== null && class_exists($this->$keyType)) { return $this->$keyType; } } From 7bac7a5b8710962e05c376a40b8216393ce2fe6d Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 22 Mar 2023 17:01:45 -0700 Subject: [PATCH 2/4] chore(docs): ensure doc generation fails on error --- .github/actions/docs/entrypoint.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/docs/entrypoint.sh b/.github/actions/docs/entrypoint.sh index 203f98e62..08d50b049 100755 --- a/.github/actions/docs/entrypoint.sh +++ b/.github/actions/docs/entrypoint.sh @@ -1,5 +1,7 @@ #!/bin/sh -l +set -e + apt-get update apt-get install -y git wget git reset --hard HEAD From bd7b138bbc1c5016b7e85ff85f0533ae3684b9ed Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 22 Mar 2023 17:09:12 -0700 Subject: [PATCH 3/4] chore(docs): attempt to fix github "detected dubious ownership" error --- .github/actions/docs/entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/docs/entrypoint.sh b/.github/actions/docs/entrypoint.sh index 08d50b049..7ac74e427 100755 --- a/.github/actions/docs/entrypoint.sh +++ b/.github/actions/docs/entrypoint.sh @@ -4,6 +4,10 @@ set -e apt-get update apt-get install -y git wget + +# Fix github "detected dubious ownership" error +git config --global --add safe.directory /github/workspace + git reset --hard HEAD # Create the directories From 53c3168fd1836ec21d28a768f78a8c0e44046ec4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 07:59:47 -0700 Subject: [PATCH 4/4] chore(main): release 2.13.2 (#2412) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5e516a65..f484d6fc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.13.2](https://github.com/googleapis/google-api-php-client/compare/v2.13.1...v2.13.2) (2023-03-23) + + +### Bug Fixes + +* Calling class_exists with null in Google\Model ([#2405](https://github.com/googleapis/google-api-php-client/issues/2405)) ([5ed4edc](https://github.com/googleapis/google-api-php-client/commit/5ed4edc9315110a715e9763d27ee6761e1aaa00a)) + ## [2.13.1](https://github.com/googleapis/google-api-php-client/compare/v2.13.0...v2.13.1) (2023-03-13)