Skip to content

Commit 021aa5e

Browse files
chrismsheltonchrismshelton
committed
Fix sendmail path - see php/php-src#5548 
1 parent 3b3e95c commit 021aa5e

File tree

15 files changed

+15
-15
lines changed

15 files changed

+15
-15
lines changed

‎7.0-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.0/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.1-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.1/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.2-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.2/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.3-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.3/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.4-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎7.4/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎8.0-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎8.0/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎8.1-dev/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎8.1/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

‎template/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ commandTests:
1818
args: ["-i"]
1919
expectedOutput:
2020
- memory_limit => 128M => 128M
21-
- sendmail_path => -t -i => -t -i
21+
- sendmail_path => (?:\/usr\/sbin\/sendmail)? -t -i\s*=> (?:\/usr\/sbin\/sendmail)? -t -i
2222
- date.timezone => UTC => UTC
2323
- name: "Composer should work"
2424
command: composer

0 commit comments

Comments
 (0)