geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-08-19 18:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sed portability

Browse Source
This commit is contained in:
Zach Borboa
2023-03-10 04:31:11 -08:00
parent 9b9dd17c8d
commit 3971c2f081
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/ci.sh
+20 -4
View File
@@ -2,7 +2,11 @@
remove_expectWarning() {
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
else
sed -i "" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
fi
}
replace_assertStringContainsString() {
@@ -10,7 +14,11 @@ replace_assertStringContainsString() {
# +->assertContains(
find='->assertStringContainsString('
replace='->assertContains('
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
else
sed -i "" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
fi
}
replace_assertMatchesRegularExpression() {
@@ -18,7 +26,11 @@ replace_assertMatchesRegularExpression() {
# +->assertRegExp(
find='->assertMatchesRegularExpression('
replace='->assertRegExp('
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
else
sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
fi
}
phpunit_v6_5_shim() {
@@ -50,7 +62,11 @@ php_v7_0_shim() {
# +protected function setUp()
find='protected function setUp(): void'
replace='protected function setUp()'
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
else
sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
fi
}
set -x
tests/run.sh
+20 -4
View File
@@ -2,7 +2,11 @@
remove_expectWarning() {
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
else
sed -i "" -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
fi
}
replace_assertStringContainsString() {
@@ -10,7 +14,11 @@ replace_assertStringContainsString() {
# +->assertContains(
find='->assertStringContainsString('
replace='->assertContains('
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
else
sed -i "" -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
fi
}
replace_assertMatchesRegularExpression() {
@@ -18,7 +26,11 @@ replace_assertMatchesRegularExpression() {
# +->assertRegExp(
find='->assertMatchesRegularExpression('
replace='->assertRegExp('
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
else
sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
fi
}
phpunit_v6_5_shim() {
@@ -50,7 +62,11 @@ php_v7_0_shim() {
# +protected function setUp()
find='protected function setUp(): void'
replace='protected function setUp()'
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
if sed v < /dev/null 2> /dev/null; then
sed -i"" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
else
sed -i "" -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
fi
}
set -x