Merge pull request protocolbuffers#10558 from deannagarcia/3.18.x

Fix php release script

composer.json

@@ -16,8 +16,8 @@
   },
   "autoload": {
     "psr-4": {
-      "Google\\Protobuf\\": "php/src/Google/Protobuf",
-      "GPBMetadata\\Google\\Protobuf\\": "php/src/GPBMetadata/Google/Protobuf"
+      "Google\\Protobuf\\": "src/Google/Protobuf",
+      "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf"
     }
   }
 }

php/ext/google/protobuf/package.xml

@@ -5,9 +5,9 @@
  <summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary>
  <description>https://developers.google.com/protocol-buffers/</description>
  <lead>
-  <name>Bo Yang</name>
-  <user>stanleycheung</user>
-  <email>protobuf-opensource@google.com</email>
+  <name>Protobuf Team</name>
+  <user>protobufpackages</user>
+  <email>protobuf-packages@google.com</email>
   <active>yes</active>
  </lead>
  <date>2022-09-13</date>
@@ -1122,7 +1122,7 @@ G  A release.
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2022-09-13</date>
+   <date>2022-09-14</date>
    <time>10:41:45</time>
    <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
    <notes>

php/release.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
-
 set -ex
-
 # Make sure we are in a protobuf source tree.
 [ -f "php/release.sh" ] || {
   echo "This script must be ran under root of protobuf source tree."
@@ -10,28 +8,21 @@ set -ex
 
 VERSION=$1
 
+rm -rf protobuf-php
 git clone https://github.com/protocolbuffers/protobuf-php.git
-git clone https://github.com/protocolbuffers/protobuf.git
 
 # Clean old files
-pushd protobuf-php
-rm -rf src
-popd
-
-# Checkout the target version
-pushd protobuf/php
-git checkout -b $VERSION
-popd
+rm -rf protobuf-php/src
 
 # Copy files
-pushd protobuf-php
-mv ../protobuf/php/src src
-mv ../protobuf/composer.json composer.json
-sed -i 's|php/src|src|g' composer.json
+cp -r php/src protobuf-php
+cp composer.json protobuf-php/composer.json
+
+cd protobuf-php
 git add .
 git commit -m "$VERSION"
-git tag "$VERSION"
-popd
-
-# Clean up
-rm -rf protobuf
+if [ $(git tag -l "$VERSION") ]; then
+  echo "tag $VERSION already exists"
+else
+  git tag "$VERSION"
+fi