Merge pull request #9832 from haberman/php-dist

haberman · web-flow · commit 21027a27c4c2 · 2022-04-22T01:00:40.000Z
Fixed PHP release script.
diff --git a/php/composer.json.dist b/php/composer.json.dist
@@ -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"
     }
   }
 }
diff --git a/php/release.sh b/php/release.sh
@@ -10,32 +10,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/php/composer.json.dist composer.json
-sed -i 's|php/src|src|g' composer.json
+cp -r php/src protobuf-php
+cp php/composer.json.dist protobuf-php/composer.json
+
+cd protobuf-php
 git add .
 git commit -m "$VERSION"
 if [ $(git tag -l "$VERSION") ]; then
   echo "tag $VERSION already exists"
 else
   git tag "$VERSION"
 fi
-popd
-
-# Clean up
-rm -rf protobuf

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`},`
`17`	`17`	`"autoload": {`
`18`	`18`	`"psr-4": {`
`19`		`- "Google\\Protobuf\\": "php/src/Google/Protobuf",`
`20`		`- "GPBMetadata\\Google\\Protobuf\\": "php/src/GPBMetadata/Google/Protobuf"`
	`19`	`+ "Google\\Protobuf\\": "src/Google/Protobuf",`
	`20`	`+ "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf"`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`}`