Removed PHP support for third_party/wyhash in favor of ABSL wyhash.

php/ext/google/protobuf/package.xml

@@ -46,8 +46,6 @@
     <file baseinstalldir="/" name="protobuf.c" role="src"/>
     <file baseinstalldir="/" name="protobuf.h" role="src"/>
     <file baseinstalldir="/" name="wkt.inc" role="src"/>
-    <file baseinstalldir="/" name="third_party/wyhash/wyhash.h" role="src"/>
-    <file baseinstalldir="/" name="third_party/wyhash/LICENSE" role="doc"/>
     <file baseinstalldir="/" name="LICENSE" role="doc"/>
   </dir>
  </contents>

php/generate_test_protos.sh

@@ -4,8 +4,6 @@ set -e
 
 cd `dirname $0`
 
-./prepare_c_extension.sh
-
 if ../src/protoc --help > /dev/null; then
   PROTOC=src/protoc
 else
@@ -13,7 +11,6 @@ else
   PROTOC=bazel-bin/protoc
 fi
 
-
 if [[ -d tmp && -z $(find tests/proto ../$PROTOC -newer tmp) ]]; then
   # Generated protos are already present and up to date, so we can skip protoc.
   #

php/prepare_c_extension.sh

@@ -1,20 +0,0 @@
-
-cd $(dirname $0)
-
-if [[ -f ext/google/protobuf/third_party/wyhash/wyhash.h && -z $(find ../third_party/wyhash -newer ext/google/protobuf/third_party) ]]; then
-  # Generated protos are already present and up to date, so we can skip protoc.
-  #
-  # Protoc is very fast, but sometimes it is not available (like if we haven't
-  # built it in Docker). Skipping it helps us proceed in this case.
-  echo "wyhash is up to date, skipping."
-  exit 0
-fi
-
-# wyhash has to live in the base third_party directory.
-# We copy it into the ext/google/protobuf directory for the build
-# (and for the release to PECL).
-rm -rf ext/google/protobuf/third_party
-mkdir -p ext/google/protobuf/third_party/wyhash
-cp ../third_party/wyhash/* ext/google/protobuf/third_party/wyhash
-
-echo "Copied wyhash from ../third_party -> ext/google/protobuf/third_party"

php/tests/compile_extension.sh

@@ -4,7 +4,6 @@ set -e
 
 cd $(dirname $0)
 
-../prepare_c_extension.sh
 pushd  ../ext/google/protobuf > /dev/null
 
 CONFIGURE_OPTIONS=("./configure" "--with-php-config=$(which php-config)")