Skip to content
This repository has been archived by the owner on Dec 2, 2020. It is now read-only.

Removes reliance on MySQL for PHP projects not using it. #93

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/project.pp
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
}

if $mysql {
include mysql::config
$mysql_dbs = $mysql ? {
true => ["${name}_development", "${name}_test"],
default => $mysql,
Expand Down
1 change: 0 additions & 1 deletion manifests/version.pp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
$version = $name
) {
require php
include mysql::config

# Current supported and secure versions
$secure_5_6 = $php::config::secure_versions['5.6']
Expand Down
9 changes: 8 additions & 1 deletion spec/defines/php_project_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,14 @@
})
end

it { should contain_mysql__db("a_database_name") }
it do
should contain_mysql__db("a_database_name")

should contain_file("/test/boxen/config/php/5.4.17/php.ini").with({
:content => File.read("spec/fixtures/php-with-mysql.ini"),
:require => "File[/test/boxen/config/php/5.4.17]"
})
end
end

context "nginx => php/nginx/nginx.conf.erb" do
Expand Down
Loading