mirror of
https://github.com/php-curl-class/php-curl-class.git
synced 2026-09-05 23:38:22 +00:00
Unify continuous integration and run scripts more closely
This commit is contained in:
Zach Borboa
+83
-76
@@ -1,3 +1,62 @@
|
||||
php_v5_3_shim() {
|
||||
remove_double_colon_class_name_resolution
|
||||
}
|
||||
|
||||
phpunit_shim() {
|
||||
# -class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
# +class CurlTest extends \PHPUnit_Framework_TestCase
|
||||
find='class CurlTest extends \\PHPUnit\\Framework\\TestCase'
|
||||
replace='class CurlTest extends \\PHPUnit_Framework_TestCase'
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
|
||||
# -\PHPUnit\Framework\Assert
|
||||
# +\PHPUnit_Framework_Assert
|
||||
find='\\PHPUnit\\Framework\\Assert'
|
||||
replace='\\PHPUnit_Framework_Assert'
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/Helper.php"
|
||||
|
||||
# -\PHPUnit\Framework\Error\Warning
|
||||
# +\PHPUnit_Framework_Error_Warning
|
||||
find='\\PHPUnit\\Framework\\Error\\Warning'
|
||||
replace='\\PHPUnit_Framework_Error_Warning'
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
remove_double_colon_class_name_resolution() {
|
||||
sed -i'' -e"/::class/d" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
remove_expectWarning() {
|
||||
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
|
||||
sed -i'' -e"/->expectWarning(/d" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
replace_assertStringContainsString() {
|
||||
# -->assertStringContainsString(
|
||||
# +->assertContains(
|
||||
find='->assertStringContainsString('
|
||||
replace='->assertContains('
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
phpunit_v4_8_shim() {
|
||||
replace_assertStringContainsString
|
||||
}
|
||||
|
||||
phpunit_v6_5_shim() {
|
||||
remove_expectWarning
|
||||
replace_assertStringContainsString
|
||||
}
|
||||
|
||||
phpunit_v7_5_shim() {
|
||||
remove_expectWarning
|
||||
}
|
||||
|
||||
phpunit_v8_1_shim() {
|
||||
remove_expectWarning
|
||||
}
|
||||
|
||||
install_nginx() {
|
||||
$superuser apt-get install -y nginx
|
||||
}
|
||||
@@ -38,18 +97,27 @@ start_php_servers() {
|
||||
port=8000
|
||||
(( port += $i ))
|
||||
|
||||
php -S "127.0.0.1:${port}" -t tests/PHPCurlClass/ &
|
||||
php -S "127.0.0.1:${port}" -t PHPCurlClass/ &
|
||||
done
|
||||
}
|
||||
|
||||
set -x
|
||||
|
||||
composer self-update
|
||||
composer install --prefer-source --no-interaction
|
||||
|
||||
# Use composer's phpunit and phpcs by adding composer bin directory to the path environment variable.
|
||||
export PATH="${PWD}/vendor/bin:${PATH}"
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "${SCRIPT_DIR}"
|
||||
|
||||
echo "CI_PHP_VERSION: ${CI_PHP_VERSION}"
|
||||
php -r "var_dump(phpversion());"
|
||||
php -r "var_dump(curl_version());"
|
||||
|
||||
composer self-update
|
||||
composer install --prefer-source --no-interaction
|
||||
# Let test server know we should allow testing.
|
||||
export PHP_CURL_CLASS_TEST_MODE_ENABLED="yes"
|
||||
|
||||
# Use docker-specific settings.
|
||||
if [ -f "/.dockerenv" ]; then
|
||||
@@ -64,9 +132,6 @@ else
|
||||
fastcgi_pass="127.0.0.1:9000"
|
||||
fi
|
||||
|
||||
# Let test server know we should allow testing.
|
||||
export PHP_CURL_CLASS_TEST_MODE_ENABLED="yes"
|
||||
|
||||
if [[ "${CI_PHP_VERSION}" == "5.3" ]]; then
|
||||
if ! [ -x "$(command -v add-apt-repository)" ]; then
|
||||
$superuser apt-get install -y python-software-properties
|
||||
@@ -128,76 +193,8 @@ elif [[ "${CI_PHP_VERSION}" == "7.4" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "8.0" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "nightly" ]]; then
|
||||
start_php_servers
|
||||
fi
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "${SCRIPT_DIR}"
|
||||
|
||||
# Use composer's phpunit and phpcs by adding composer bin directory to the path environment variable.
|
||||
export PATH="${PWD}/vendor/bin:${PATH}"
|
||||
|
||||
php_v5_3_shim() {
|
||||
remove_double_colon_class_name_resolution
|
||||
}
|
||||
|
||||
phpunit_shim() {
|
||||
# -class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
# +class CurlTest extends \PHPUnit_Framework_TestCase
|
||||
find='class CurlTest extends \\PHPUnit\\Framework\\TestCase'
|
||||
replace='class CurlTest extends \\PHPUnit_Framework_TestCase'
|
||||
sed -i'' -e"s/${find}/${replace}/" "$(pwd)/tests/PHPCurlClass/PHP"*
|
||||
|
||||
# -\PHPUnit\Framework\Assert
|
||||
# +\PHPUnit_Framework_Assert
|
||||
find='\\PHPUnit\\Framework\\Assert'
|
||||
replace='\\PHPUnit_Framework_Assert'
|
||||
sed -i'' -e"s/${find}/${replace}/" "$(pwd)/tests/PHPCurlClass/PHP"*
|
||||
sed -i'' -e"s/${find}/${replace}/" "$(pwd)/tests/PHPCurlClass/Helper.php"
|
||||
|
||||
# -\PHPUnit\Framework\Error\Warning
|
||||
# +\PHPUnit_Framework_Error_Warning
|
||||
find='\\PHPUnit\\Framework\\Error\\Warning'
|
||||
replace='\\PHPUnit_Framework_Error_Warning'
|
||||
sed -i'' -e"s/${find}/${replace}/" "$(pwd)/tests/PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
remove_double_colon_class_name_resolution() {
|
||||
sed -i'' -e"/::class/d" "$(pwd)/tests/PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
remove_expectWarning() {
|
||||
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
|
||||
sed -i'' -e"/->expectWarning(/d" "$(pwd)/tests/PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
replace_assertStringContainsString() {
|
||||
# -->assertStringContainsString(
|
||||
# +->assertContains(
|
||||
find='->assertStringContainsString('
|
||||
replace='->assertContains('
|
||||
sed -i'' -e"s/${find}/${replace}/" "$(pwd)/tests/PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
phpunit_v4_8_shim() {
|
||||
replace_assertStringContainsString
|
||||
}
|
||||
|
||||
phpunit_v6_5_shim() {
|
||||
remove_expectWarning
|
||||
replace_assertStringContainsString
|
||||
}
|
||||
|
||||
phpunit_v7_5_shim() {
|
||||
remove_expectWarning
|
||||
}
|
||||
|
||||
phpunit_v8_1_shim() {
|
||||
remove_expectWarning
|
||||
}
|
||||
|
||||
|
||||
errors=()
|
||||
|
||||
source "check_syntax.sh"
|
||||
@@ -210,7 +207,7 @@ else
|
||||
fi
|
||||
|
||||
phpunit_version="$("${phpunit_to_use}" --version | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"
|
||||
echo "${phpunit_version}"
|
||||
echo "phpunit_version: ${phpunit_version}"
|
||||
|
||||
if [[ "${phpunit_version}" == "6.5."* ]]; then
|
||||
phpunit_v6_5_shim
|
||||
@@ -222,7 +219,10 @@ fi
|
||||
|
||||
# Run tests.
|
||||
"${phpunit_to_use}" --version
|
||||
"${phpunit_to_use}" --configuration "phpunit.xml" --debug --verbose
|
||||
"${phpunit_to_use}" \
|
||||
--configuration "phpunit.xml" \
|
||||
--debug \
|
||||
--verbose
|
||||
if [[ "${?}" -ne 0 ]]; then
|
||||
echo "Error: phpunit command failed"
|
||||
errors+=("phpunit command failed")
|
||||
@@ -230,6 +230,8 @@ fi
|
||||
|
||||
source "check_coding_standards.sh"
|
||||
|
||||
set +x
|
||||
|
||||
error_count="${#errors[@]}"
|
||||
if [[ "${error_count}" -ge 1 ]]; then
|
||||
echo -e "\nErrors found: ${error_count}"
|
||||
@@ -242,4 +244,9 @@ if [[ "${error_count}" -ge 1 ]]; then
|
||||
done
|
||||
fi
|
||||
|
||||
# Stop test servers.
|
||||
for pid in "${pids[@]}"; do
|
||||
kill "${pid}" &> /dev/null &
|
||||
done
|
||||
|
||||
exit "${#errors[@]}"
|
||||
|
||||
+133
-15
@@ -1,7 +1,87 @@
|
||||
php_v5_3_shim() {
|
||||
remove_double_colon_class_name_resolution
|
||||
}
|
||||
|
||||
phpunit_shim() {
|
||||
# -class CurlTest extends \PHPUnit\Framework\TestCase
|
||||
# +class CurlTest extends \PHPUnit_Framework_TestCase
|
||||
find='class CurlTest extends \\PHPUnit\\Framework\\TestCase'
|
||||
replace='class CurlTest extends \\PHPUnit_Framework_TestCase'
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
|
||||
# -\PHPUnit\Framework\Assert
|
||||
# +\PHPUnit_Framework_Assert
|
||||
find='\\PHPUnit\\Framework\\Assert'
|
||||
replace='\\PHPUnit_Framework_Assert'
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/Helper.php"
|
||||
|
||||
# -\PHPUnit\Framework\Error\Warning
|
||||
# +\PHPUnit_Framework_Error_Warning
|
||||
find='\\PHPUnit\\Framework\\Error\\Warning'
|
||||
replace='\\PHPUnit_Framework_Error_Warning'
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
remove_double_colon_class_name_resolution() {
|
||||
sed -i'' -e"/::class/d" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
remove_expectWarning() {
|
||||
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
|
||||
sed -i'' -e"/->expectWarning(/d" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
replace_assertStringContainsString() {
|
||||
# -->assertStringContainsString(
|
||||
# +->assertContains(
|
||||
find='->assertStringContainsString('
|
||||
replace='->assertContains('
|
||||
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
|
||||
}
|
||||
|
||||
phpunit_v4_8_shim() {
|
||||
replace_assertStringContainsString
|
||||
}
|
||||
|
||||
phpunit_v6_5_shim() {
|
||||
remove_expectWarning
|
||||
replace_assertStringContainsString
|
||||
}
|
||||
|
||||
phpunit_v7_5_shim() {
|
||||
remove_expectWarning
|
||||
}
|
||||
|
||||
phpunit_v8_1_shim() {
|
||||
remove_expectWarning
|
||||
}
|
||||
|
||||
start_php_servers() {
|
||||
# Start test servers. Run servers on different ports to allow simultaneous
|
||||
# requests without blocking.
|
||||
server_count=7
|
||||
declare -A pids
|
||||
for i in $(seq 0 $(("${server_count}" - 1))); do
|
||||
port=8000
|
||||
(( port += $i ))
|
||||
|
||||
php -S "127.0.0.1:${port}" -t PHPCurlClass/ &> /dev/null &
|
||||
pids["${i}"]="${!}"
|
||||
done
|
||||
}
|
||||
|
||||
set -x
|
||||
|
||||
# Use composer's phpunit and phpcs by adding composer bin directory to the path environment variable.
|
||||
export PATH="${PWD}/vendor/bin:${PATH}"
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
cd "${SCRIPT_DIR}"
|
||||
|
||||
set -x
|
||||
echo "CI_PHP_VERSION: ${CI_PHP_VERSION}"
|
||||
php -r "var_dump(phpversion());"
|
||||
php -r "var_dump(curl_version());"
|
||||
|
||||
# Let test server know we should allow testing.
|
||||
export PHP_CURL_CLASS_TEST_MODE_ENABLED="yes"
|
||||
@@ -9,36 +89,74 @@ export PHP_CURL_CLASS_TEST_MODE_ENABLED="yes"
|
||||
# Let test server know this is a local test.
|
||||
export PHP_CURL_CLASS_LOCAL_TEST="yes"
|
||||
|
||||
# Start test servers. Run servers on different ports to allow simultaneous
|
||||
# requests without blocking.
|
||||
server_count=7
|
||||
declare -A pids
|
||||
for i in $(seq 0 $(("${server_count}" - 1))); do
|
||||
port=8000
|
||||
(( port += $i ))
|
||||
if [[ "${CI_PHP_VERSION}" == "7.0" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "7.1" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "7.2" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "7.3" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "7.4" ]]; then
|
||||
start_php_servers
|
||||
elif [[ "${CI_PHP_VERSION}" == "8.0" ]]; then
|
||||
start_php_servers
|
||||
fi
|
||||
|
||||
php -S "127.0.0.1:${port}" -t PHPCurlClass/ &> /dev/null &
|
||||
pid="${!}"
|
||||
errors=()
|
||||
|
||||
pids["${i}"]="${pid}"
|
||||
done
|
||||
source "check_syntax.sh"
|
||||
|
||||
# Determine which phpunit to use.
|
||||
if [[ -f "../vendor/phpunit/phpunit/phpunit" ]]; then
|
||||
phpunit_to_use="../vendor/phpunit/phpunit/phpunit"
|
||||
if [[ -f "../vendor/bin/phpunit" ]]; then
|
||||
phpunit_to_use="../vendor/bin/phpunit"
|
||||
else
|
||||
phpunit_to_use="phpunit"
|
||||
fi
|
||||
|
||||
phpunit_version="$("${phpunit_to_use}" --version | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")"
|
||||
echo "phpunit_version: ${phpunit_version}"
|
||||
|
||||
if [[ "${phpunit_version}" == "6.5."* ]]; then
|
||||
phpunit_v6_5_shim
|
||||
elif [[ "${phpunit_version}" == "7.5."* ]]; then
|
||||
phpunit_v7_5_shim
|
||||
elif [[ "${phpunit_version}" == "8.1."* ]]; then
|
||||
phpunit_v8_1_shim
|
||||
fi
|
||||
|
||||
# Run tests.
|
||||
extra_args="${@}"
|
||||
"${phpunit_to_use}" --version
|
||||
"${phpunit_to_use}" \
|
||||
--configuration "phpunit.xml" \
|
||||
--debug \
|
||||
--verbose \
|
||||
${extra_args}
|
||||
if [[ "${?}" -ne 0 ]]; then
|
||||
echo "Error: phpunit command failed"
|
||||
errors+=("phpunit command failed")
|
||||
fi
|
||||
|
||||
source "check_coding_standards.sh"
|
||||
|
||||
set +x
|
||||
|
||||
error_count="${#errors[@]}"
|
||||
if [[ "${error_count}" -ge 1 ]]; then
|
||||
echo -e "\nErrors found: ${error_count}"
|
||||
|
||||
iter=0
|
||||
for value in "${errors[@]}"; do
|
||||
((iter++))
|
||||
echo -e "\nError ${iter} of ${error_count}:"
|
||||
echo "${value}" | perl -pe 's/^(.*)$/\t\1/'
|
||||
done
|
||||
fi
|
||||
|
||||
# Stop test servers.
|
||||
for pid in "${pids[@]}"; do
|
||||
kill "${pid}"
|
||||
kill "${pid}" &> /dev/null &
|
||||
done
|
||||
|
||||
exit "${#errors[@]}"
|
||||
|
||||
Reference in New Issue
Block a user