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

Commit bc132fa

Browse files
committed
Removes mysql::config from present classes as before
1 parent eb249f4 commit bc132fa

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

spec/defines/php_project_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
end
155155

156156
it do
157-
should contain_class("mysql::config")
158157
should contain_mysql__db("a_database_name")
159158

160159
should contain_file("/test/boxen/config/php/5.4.17/php.ini").with({

templates/php.ini.erb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,6 @@ date.timezone = UTC
10041004
;pdo_odbc.connection_pooling=strict
10051005

10061006
;pdo_odbc.db2_instance_name
1007-
10081007
<% if @mysql %>
10091008
[Pdo_mysql]
10101009
; If mysqlnd is used: Number of cache slots for the internal result set cache
@@ -1015,7 +1014,7 @@ pdo_mysql.cache_size = 2000
10151014
; MySQL defaults.
10161015
; http://php.net/pdo_mysql.default-socket
10171016
pdo_mysql.default_socket=<%= scope.lookupvar('::mysql::config::socket') %>
1018-
<% end -%>
1017+
<% end %>
10191018
[Phar]
10201019
; http://php.net/phar.readonly
10211020
;phar.readonly = On
@@ -1136,7 +1135,6 @@ ibase.dateformat = "%Y-%m-%d"
11361135

11371136
; Default time format.
11381137
ibase.timeformat = "%H:%M:%S"
1139-
11401138
<% if @mysql %>
11411139
[MySQL]
11421140
; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
@@ -1268,7 +1266,7 @@ mysqlnd.collect_memory_statistics = Off
12681266
; bytes.
12691267
; http://php.net/mysqlnd.net_read_buffer_size
12701268
;mysqlnd.net_read_buffer_size = 32768
1271-
<% end -%>
1269+
<% end %>
12721270
[OCI8]
12731271

12741272
; Connection: Enables privileged connections using external

0 commit comments

Comments
 (0)