From 2c1bd44a2bd4405bb5c40d5b5be925747428678c Mon Sep 17 00:00:00 2001
From: Brent Shaffer <betterbrent@google.com>
Date: Fri, 8 Nov 2024 13:23:59 -0800
Subject: [PATCH] chore: upgrade docfx to 3.5.3 (#7814)

---
 .kokoro/docs/docker/Dockerfile | 16 +++++++---------
 .kokoro/docs/publish.sh        |  2 ++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.kokoro/docs/docker/Dockerfile b/.kokoro/docs/docker/Dockerfile
index 53fe8d853556..f5cd7424cdff 100644
--- a/.kokoro/docs/docker/Dockerfile
+++ b/.kokoro/docs/docker/Dockerfile
@@ -91,17 +91,15 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" &&
     php -r "if (hash_file('SHA384', 'composer-setup.php') === rtrim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
     php composer-setup.php --filename=composer --install-dir=/usr/local/bin
 
-# Use phpDocumentor from HEAD until they create a new release
-# TODO: Remove once phpDocumentor tags a new release
+# Use phpDocumentor from HEAD (useful for testing changes before a release)
 # @see https://github.com/phpDocumentor/phpDocumentor/issues/3434
-COPY --from=phpdoc/phpdoc:3.5.3 /opt/phpdoc /opt/phpdoc
-RUN ln -s /opt/phpdoc/bin/phpdoc /usr/local/bin/phpdoc
-ENV PHPDOC_ENV=prod
+# COPY --from=phpdoc/phpdoc:3.5.3 /opt/phpdoc /opt/phpdoc
+# RUN ln -s /opt/phpdoc/bin/phpdoc /usr/local/bin/phpdoc
+# ENV PHPDOC_ENV=prod
 
-# Install phpdoc
-# TODO: uncomment once phpDocumentor creates a new release
-# RUN wget -O /usr/local/bin/phpdoc "https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.3.1/phpDocumentor.phar" \
-#   && chmod +x /usr/local/bin/phpdoc
+# Install phpdoc (v3.5.3)
+RUN wget -O /usr/local/bin/phpdoc "https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.5.3/phpDocumentor.phar" \
+  && chmod +x /usr/local/bin/phpdoc
 
 # Install Python3
 RUN wget https://www.python.org/ftp/python/3.9.14/Python-3.9.14.tgz \
diff --git a/.kokoro/docs/publish.sh b/.kokoro/docs/publish.sh
index 0c0073578330..aae7926e2e37 100755
--- a/.kokoro/docs/publish.sh
+++ b/.kokoro/docs/publish.sh
@@ -13,6 +13,8 @@ fi
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 PROJECT_DIR=$(dirname $(dirname $SCRIPT_DIR))
 
+phpdoc --version
+
 # Run "composer install" if it hasn't been run yet
 if [ ! -d 'dev/vendor/' ]; then
     composer install -d $PROJECT_DIR/dev