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

Add PHP 5.6 ius #49

Closed
jameshalsall wants to merge 4 commits into from
Closed

Add PHP 5.6 ius #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1bdace
allow ius php55
Sep 28, 2015
61948b0
switch xdebug to package on php55
Oct 26, 2015
43f0613
Add support for php56 packages
Jul 29, 2016
0ed4d2b
Fix array write in module_dev.rb
Jul 29, 2016
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
6 changes: 5 additions & 1 deletion recipes/module_dev.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-devel }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-devel }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-devel }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-devel }
Expand Down
6 changes: 5 additions & 1 deletion recipes/module_gd.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-gd }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-gd }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-gd }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-gd }
Expand Down
7 changes: 6 additions & 1 deletion recipes/module_imagick.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
#

include_recipe "chef-php-extra"
if node['php']['ius'] == "5.4"

if node['php']['ius'] == "5.6"
packages = %w{ php56u-pecl-imagick }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-pecl-imagick }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-pecl-imagick }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-pecl-imagick }
Expand Down
6 changes: 5 additions & 1 deletion recipes/module_intl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-intl }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-intl }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-intl }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-intl }
Expand Down
6 changes: 5 additions & 1 deletion recipes/module_mbstring.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-mbstring }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-mbstring }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-mbstring }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-mbstring }
Expand Down
14 changes: 11 additions & 3 deletions recipes/module_mcrypt.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@
# limitations under the License.
#



include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-mcrypt }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-mcrypt }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-mcrypt }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-mcrypt }
Expand All @@ -42,6 +48,8 @@
end
end

template "#{node['php']['ext_conf_dir']}/mcrypt.ini" do
mode "0644"
if not ["5.5", "5.6"].include?(node['php']['ius'])
template "#{node['php']['ext_conf_dir']}/mcrypt.ini" do
mode "0644"
end
end
6 changes: 5 additions & 1 deletion recipes/module_memcache.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-pecl-memcache }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-pecl-memcache }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-pecl-memcache }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-pecl-memcache }
Expand Down
6 changes: 5 additions & 1 deletion recipes/module_mysql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-mysqlnd }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-mysqlnd }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-mysql }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-mysql }
Expand Down
6 changes: 5 additions & 1 deletion recipes/module_soap.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-soap }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-soap }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-soap }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-soap }
Expand Down
6 changes: 5 additions & 1 deletion recipes/module_xml.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

include_recipe "chef-php-extra"

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
packages = %w{ php56u-xml }
elsif node['php']['ius'] == "5.5"
packages = %w{ php55u-xml }
elsif node['php']['ius'] == "5.4"
packages = %w{ php54-xml }
elsif node['php']['ius'] == "5.3"
packages = %w{ php53u-xml }
Expand Down
6 changes: 5 additions & 1 deletion recipes/package.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
include_recipe "yum::ius"
end

if node['php']['ius'] == "5.4"
if node['php']['ius'] == "5.6"
centos_packages = %w{ php56u php56u-devel php56u-cli php56u-pear }
elsif node['php']['ius'] == "5.5"
centos_packages = %w{ php55u php55u-devel php55u-cli php55u-pear }
elsif node['php']['ius'] == "5.4"
centos_packages = %w{ php54 php54-devel php54-cli php54-pear }
elsif node['php']['ius'] == "5.3"
centos_packages = %w{ php53u php53u-devel php53u-cli php53u-pear }
Expand Down
45 changes: 29 additions & 16 deletions recipes/xdebug.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,37 @@
# limitations under the License.
#

# Needed for phpize, which pecl needs
include_recipe "chef-php-extra::module_dev"
use_pear = false

# php_pear "xdebug" do
# action :install
# end
case node['php']['ius']
when '5.6' then package 'php56u-xdebug'
when '5.5' then package 'php55u-xdebug'
when '5.4' then use_pear = true
when '5.3' then use_pear = true
else
use_pear = true
end

if use_pear
# Needed for phpize, which pecl needs
include_recipe "chef-php-extra::module_dev"

# php_pear "xdebug" do
# action :install
# end

if platform?(%w{debian ubuntu})
package "php5-xdebug"
elsif platform?(%w{centos redhat fedora amazon scientific})
php_pear "xdebug" do
action :install
if platform?(%w{debian ubuntu})
package "php5-xdebug"
elsif platform?(%w{centos redhat fedora amazon scientific})
php_pear "xdebug" do
action :install
end
end
end

template "#{node['php']['ext_conf_dir']}/xdebug.ini" do
mode "0644"
variables(
:params => node['xdebug']
)
template "#{node['php']['ext_conf_dir']}/xdebug.ini" do
mode "0644"
variables(
:params => node['xdebug']
)
end
end