Skip to content

Commit 3cbc8e0

Browse files
CopilotKanti
Copilot
and
Kanti
authored
Adapt PHP specs to PHP 8
Co-authored-by: Kanti <471387+Kanti@users.noreply.github.com>
1 parent 43a7498 commit 3cbc8e0

18 files changed

Lines changed: 60 additions & 474 deletions

File tree

tests/serverspec/spec/collection/php-fpm7.rb renamed to tests/serverspec/spec/collection/php-fpm8.rb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
shared_examples 'collection::php-fpm7' do
1+
shared_examples 'collection::php-fpm8' do
22
include_examples 'php-fpm::layout'
3-
include_examples 'php-fpm7::layout'
3+
include_examples 'php-fpm8::layout'
44
end
55

6-
shared_examples 'collection::php-fpm7::public' do
6+
shared_examples 'collection::php-fpm8::public' do
77
# services
88
include_examples 'php-fpm::listening::public'
99

@@ -12,7 +12,7 @@
1212
end
1313

1414

15-
shared_examples 'collection::php-fpm7::local-only' do
15+
shared_examples 'collection::php-fpm8::local-only' do
1616
# services
1717
include_examples 'php-fpm::listening::local-only'
1818

@@ -21,26 +21,25 @@
2121
end
2222

2323

24-
shared_examples 'collection::php-fpm7::webserver-test::development' do
24+
shared_examples 'collection::php-fpm8::webserver-test::development' do
2525
include_examples 'php-fpm::modules'
26-
include_examples 'php-fpm7::modules'
26+
include_examples 'php-fpm8::modules'
2727
include_examples 'php-fpm::modules::development'
2828
include_examples 'php::fpm::test::sha1'
2929
include_examples 'php::fpm::test::php_ini_scanned_files'
3030
include_examples 'php::fpm::test::php_sapi_name'
3131
include_examples 'php::fpm::test::process_user_id'
32-
include_examples 'php7::fpm::test::version'
32+
include_examples 'php8::fpm::test::version'
3333
end
3434

3535

36-
shared_examples 'collection::php-fpm7::webserver-test::production' do
36+
shared_examples 'collection::php-fpm8::webserver-test::production' do
3737
include_examples 'php-fpm::modules'
38-
include_examples 'php-fpm7::modules'
38+
include_examples 'php-fpm8::modules'
3939
include_examples 'php-fpm::modules::production'
4040
include_examples 'php::fpm::test::sha1'
4141
include_examples 'php::fpm::test::php_ini_scanned_files'
4242
include_examples 'php::fpm::test::php_sapi_name'
4343
include_examples 'php::fpm::test::process_user_id'
44-
include_examples 'php7::fpm::test::version'
44+
include_examples 'php8::fpm::test::version'
4545
end
46-

tests/serverspec/spec/collection/php7.rb renamed to tests/serverspec/spec/collection/php8.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
shared_examples 'collection::php7' do
1+
shared_examples 'collection::php8' do
22
include_examples 'php::layout'
33
include_examples 'php::cli'
4-
include_examples 'php7::cli::version'
4+
include_examples 'php8::cli::version'
55
include_examples 'php::modules'
6-
include_examples 'php7::modules'
6+
include_examples 'php8::modules'
77
include_examples 'php::cli::configuration'
88
include_examples 'php::cli::test::sha1'
99
include_examples 'php::cli::test::php_ini_scanned_files'
@@ -15,14 +15,14 @@
1515
include_examples 'misc::ghostscript'
1616
end
1717

18-
shared_examples 'collection::php7::production' do
19-
include_examples 'collection::php7'
18+
shared_examples 'collection::php8::production' do
19+
include_examples 'collection::php8'
2020
include_examples 'php::modules::production'
2121
include_examples 'php::cli::configuration::production'
2222
end
2323

24-
shared_examples 'collection::php7::development' do
25-
include_examples 'collection::php7'
24+
shared_examples 'collection::php8::development' do
25+
include_examples 'collection::php8'
2626
include_examples 'php::modules::development'
2727
include_examples 'php::cli::configuration::development'
2828
end

‎tests/serverspec/spec/docker/php-apache-dev_spec.rb‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,14 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::development'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::public'
19-
elsif ($testConfiguration[:php] == 8)
20-
else
21-
include_examples 'collection::php7::development'
22-
include_examples 'collection::php-fpm7'
23-
include_examples 'collection::php-fpm7::public'
24-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::development'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::public'
2517

2618
include_examples 'collection::php-tools'
2719
include_examples 'collection::apache'
2820

29-
if ($testConfiguration[:php] == 5)
30-
include_examples 'collection::php-fpm5::webserver-test::development'
31-
elsif ($testConfiguration[:php] == 8)
32-
else
33-
include_examples 'collection::php-fpm7::webserver-test::development'
34-
end
21+
include_examples 'collection::php-fpm8::webserver-test::development'
3522

3623
end

‎tests/serverspec/spec/docker/php-apache_spec.rb‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,13 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::production'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::local-only'
19-
elsif ($testConfiguration[:php] == 8)
20-
else
21-
include_examples 'collection::php7::production'
22-
include_examples 'collection::php-fpm7'
23-
include_examples 'collection::php-fpm7::local-only'
24-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::production'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::local-only'
2517

2618
include_examples 'collection::apache'
2719

28-
if ($testConfiguration[:php] == 5)
29-
include_examples 'collection::php-fpm5::webserver-test::production'
30-
elsif ($testConfiguration[:php] == 8)
31-
else
32-
include_examples 'collection::php-fpm7::webserver-test::production'
33-
end
20+
include_examples 'collection::php-fpm8::webserver-test::production'
3421

3522
end

‎tests/serverspec/spec/docker/php-dev_spec.rb‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,10 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::development'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::public'
19-
elsif ($testConfiguration[:php] == 8)
20-
else
21-
include_examples 'collection::php7::development'
22-
include_examples 'collection::php-fpm7'
23-
include_examples 'collection::php-fpm7::public'
24-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::development'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::public'
2517

2618
include_examples 'collection::php-tools'
2719
include_examples 'collection::development'

‎tests/serverspec/spec/docker/php-nginx-dev_spec.rb‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,14 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::development'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::public'
19-
elsif ($testConfiguration[:php] == 8)
20-
else
21-
include_examples 'collection::php7::development'
22-
include_examples 'collection::php-fpm7'
23-
include_examples 'collection::php-fpm7::public'
24-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::development'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::public'
2517

2618
include_examples 'collection::php-tools'
2719
include_examples 'collection::nginx'
2820

29-
if ($testConfiguration[:php] == 5)
30-
include_examples 'collection::php-fpm5::webserver-test::development'
31-
elsif ($testConfiguration[:php] == 8)
32-
else
33-
include_examples 'collection::php-fpm7::webserver-test::development'
34-
end
21+
include_examples 'collection::php-fpm8::webserver-test::development'
3522

3623
end

‎tests/serverspec/spec/docker/php-nginx_spec.rb‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,14 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::production'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::local-only'
19-
elsif ($testConfiguration[:php] == 8)
20-
else
21-
include_examples 'collection::php7::production'
22-
include_examples 'collection::php-fpm7'
23-
include_examples 'collection::php-fpm7::local-only'
24-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::production'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::local-only'
17+
include_examples 'php::cli::test::avif'
2518

2619
include_examples 'collection::nginx'
2720

28-
if ($testConfiguration[:php] == 5)
29-
include_examples 'collection::php-fpm5::webserver-test::production'
30-
elsif ($testConfiguration[:php] == 8)
31-
else
32-
include_examples 'collection::php-fpm7::webserver-test::production'
33-
end
21+
include_examples 'collection::php-fpm8::webserver-test::production'
3422

3523
end

‎tests/serverspec/spec/docker/php-official_spec.rb‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,10 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::production'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::public'
19-
elsif ($testConfiguration[:php] == 8)
20-
include_examples 'php::cli::test::avif'
21-
else
22-
include_examples 'collection::php7::production'
23-
include_examples 'collection::php-fpm7'
24-
include_examples 'collection::php-fpm7::public'
25-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::production'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::public'
17+
include_examples 'php::cli::test::avif'
2618

2719
end

‎tests/serverspec/spec/docker/php_spec.rb‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,10 @@
1010
include_examples 'collection::bootstrap'
1111
include_examples 'collection::base'
1212
include_examples 'collection::base-app'
13-
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
14-
15-
if ($testConfiguration[:php] == 5)
16-
include_examples 'collection::php5::production'
17-
include_examples 'collection::php-fpm5'
18-
include_examples 'collection::php-fpm5::public'
19-
elsif ($testConfiguration[:php] == 8)
20-
include_examples 'php::cli::test::avif'
21-
else
22-
include_examples 'collection::php7::production'
23-
include_examples 'collection::php-fpm7'
24-
include_examples 'collection::php-fpm7::public'
25-
end
13+
include_examples 'php::modules::ftp_ssl'
14+
include_examples 'collection::php8::production'
15+
include_examples 'collection::php-fpm8'
16+
include_examples 'collection::php-fpm8::public'
17+
include_examples 'php::cli::test::avif'
2618

2719
end

‎tests/serverspec/spec/shared/php/fpm.rb‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,12 @@
1010
end
1111
end
1212

13-
shared_examples 'php-fpm5::layout' do
14-
it "should have local php-fpm 5.x layout" do
13+
shared_examples 'php-fpm8::layout' do
14+
it "should have local php-fpm 8.x layout" do
1515
if $testConfiguration[:phpOfficialImage]
1616
expect(file("/usr/local/etc/php-fpm.d")).to be_symlink
1717
elsif os[:family] == 'redhat'
1818
expect(file("/etc/php-fpm.d")).to be_symlink
19-
elsif ['debian', 'ubuntu'].include?(os[:family])
20-
expect(file("/etc/php5/fpm/pool.d")).to be_symlink
21-
end
22-
end
23-
end
24-
25-
26-
shared_examples 'php-fpm7::layout' do
27-
it "should have local php-fpm 7.x layout" do
28-
if $testConfiguration[:phpOfficialImage]
29-
expect(file("/usr/local/etc/php-fpm.d")).to be_symlink
30-
elsif os[:family] == 'redhat'
31-
expect(file("/etc/php-fpm.d")).to be_symlink
32-
elsif ['debian', 'ubuntu'].include?(os[:family])
33-
if (os[:family] == 'ubuntu' and os[:version] == '17.10')
34-
expect(file("/etc/php/7.1/fpm/pool.d")).to be_symlink
35-
elsif (os[:family] == 'ubuntu' and os[:version] == '18.04')
36-
expect(file("/etc/php/7.2/fpm/pool.d")).to be_symlink
37-
elsif (os[:family] == 'debian' and os[:version] == '10')
38-
expect(file("/etc/php/7.3/fpm/pool.d")).to be_symlink
39-
else
40-
expect(file("/etc/php/7.0/fpm/pool.d")).to be_symlink
41-
end
4219
end
4320
end
4421
end

0 commit comments

Comments
 (0)