Skip to content

Commit

Permalink
Drop php7.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
TeBoring committed Dec 2, 2020
1 parent 2aa847d commit 1679907
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 45 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -137,6 +137,7 @@ conformance/*.class

# php test output
composer.lock
php/.phpunit.result.cache
php/tests/.phpunit.result.cache
php/tests/generated/
php/tests/old_protoc
Expand All @@ -162,6 +163,7 @@ php/ext/google/protobuf/configure.ac
php/ext/google/protobuf/configure.in
php/ext/google/protobuf/mkinstalldirs
php/ext/google/protobuf/run-tests.php
php/ext/google/protobuf/third_party/
vendor/

# JavaScript artifacts
Expand Down
4 changes: 2 additions & 2 deletions php/composer.json
Expand Up @@ -6,10 +6,10 @@
"homepage": "https://developers.google.com/protocol-buffers/",
"license": "BSD-3-Clause",
"require": {
"php": ">=7.0.0"
"php": ">=7.1.0"
},
"require-dev": {
"phpunit/phpunit": ">=5.0.0"
"phpunit/phpunit": ">=7.5.0"
},
"autoload": {
"psr-4": {
Expand Down
44 changes: 1 addition & 43 deletions tests.sh
Expand Up @@ -467,43 +467,6 @@ use_php_zts() {
internal_build_cpp
}

build_php7.0() {
use_php 7.0
pushd php
rm -rf vendor
composer update
composer test
popd
(cd conformance && make test_php)
}

build_php7.0_c() {
use_php 7.0
php/tests/test.sh
pushd conformance
make test_php_c
popd
}

build_php7.0_mixed() {
use_php 7.0
pushd php
rm -rf vendor
composer update
tests/compile_extension.sh
tests/generate_protos.sh
php -dextension=./ext/google/protobuf/modules/protobuf.so ./vendor/bin/phpunit
popd
}

build_php7.0_zts_c() {
use_php_zts 7.0
php/tests/test.sh
pushd conformance
make test_php_c
popd
}

build_php7.0_mac() {
internal_build_cpp
# Install PHP
Expand Down Expand Up @@ -666,16 +629,12 @@ build_php8.0_all() {
}

build_php_all_32() {
build_php7.0
build_php7.1
build_php7.4
build_php7.0_c $1
build_php7.1_c $1
build_php7.4_c $1
build_php7.0_mixed
build_php7.1_mixed
build_php7.4_mixed
build_php7.0_zts_c $1
build_php7.1_zts_c $1
build_php7.4_zts_c $1
}
Expand Down Expand Up @@ -720,12 +679,11 @@ Usage: $0 { cpp |
ruby27 |
jruby |
ruby_all |
php7.0 |
php7.0_c |
php_compatibility |
php7.1 |
php7.1_c |
php_all |
php8.0_all |
dist_install |
benchmark)
"
Expand Down

0 comments on commit 1679907

Please sign in to comment.