Fix sed command portability

Error messages:
    $ sed -i'' '-e/->expectWarning(/d' ./PHPCurlClass/PHPCurlClassTest.php ./PHPCurlClass/PHPMultiCurlClassTest.php
    sed: 1: "./PHPCurlClass/PHPCurlC ...": invalid command code .

    + phpunit_v10_shim
    + remove_expectWarning
    + sed -i '' '-e/->expectWarning(/d' ./PHPCurlClass/PHPCurlClassTest.php ./PHPCurlClass/PHPMultiCurlClassTest.php
    sed: can't read : No such file or directory
This commit is contained in:
Zach Borboa
2023-02-16 05:50:51 -08:00
parent bcf3c1ad33
commit acf5443a68
2 changed files with 20 additions and 4 deletions
+10 -2
View File
@@ -1,6 +1,6 @@
remove_expectWarning() {
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
sed -i'' -e"/->expectWarning(/d" "./PHPCurlClass/PHP"*
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
}
replace_assertStringContainsString() {
@@ -8,7 +8,15 @@ replace_assertStringContainsString() {
# +->assertContains(
find='->assertStringContainsString('
replace='->assertContains('
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
}
replace_assertMatchesRegularExpression() {
# -->assertMatchesRegularExpression(
# +->assertRegExp(
find='->assertMatchesRegularExpression('
replace='->assertRegExp('
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
}
phpunit_v6_5_shim() {
+10 -2
View File
@@ -2,7 +2,7 @@
remove_expectWarning() {
# Fix "Call to undefined method CurlTest\CurlTest::expectWarning()".
sed -i'' -e"/->expectWarning(/d" "./PHPCurlClass/PHP"*
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "/->expectWarning(/d" "./PHPCurlClass/PHP"*
}
replace_assertStringContainsString() {
@@ -10,7 +10,15 @@ replace_assertStringContainsString() {
# +->assertContains(
find='->assertStringContainsString('
replace='->assertContains('
sed -i'' -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e "s/${find}/${replace}/" "./PHPCurlClass/PHP"*
}
replace_assertMatchesRegularExpression() {
# -->assertMatchesRegularExpression(
# +->assertRegExp(
find='->assertMatchesRegularExpression('
replace='->assertRegExp('
sed -i$(sed v < /dev/null 2> /dev/null || echo -n " ''") -e"s/${find}/${replace}/" "./PHPCurlClass/PHP"*
}
phpunit_v6_5_shim() {