more php7 fixes

Author: jippi

docs/examples.rst

@@ -84,10 +84,10 @@ FPM
     create_resources('php::fpm::pool',  hiera_hash('php_fpm_pool', {}))
     create_resources('php::fpm::config',  hiera_hash('php_fpm_config', {}))
 
-    Php::Extension <| |> ~> Service['php5-fpm']
+    Php::Extension <| |> ~> Service['php7.0-fpm']
 
-    exec { "restart-php5-fpm":
-      command  => "service php5-fpm restart",
+    exec { "restart-php7.0-fpm":
+      command  => "service php7.0-fpm restart",
       schedule => hourly
     }
 

docs/sapi.rst

@@ -26,7 +26,7 @@ Installs the ``mod_php`` PHP SAPI for apache.
 
 * ``$package`` defaults to ``libapache2-mod-php5``.
 
-* ``$inifile`` defaults to ``/etc/php5/apache2/php.ini``.
+* ``$inifile`` defaults to ``/etc/php/7.0/apache2/php.ini``.
 
 * ``$service_name`` defaults to ``apache2``.
 
@@ -40,11 +40,11 @@ php::fpm
 
 Installs the ``FPM`` PHP SAPI.
 
-* ``$package`` defaults to ``php5-fpm``.
+* ``$package`` defaults to ``php7.0-fpm``.
 
-* ``$inifile`` defaults to ``/etc/php5/fpm/php.ini``.
+* ``$inifile`` defaults to ``/etc/php/7.0/fpm/php.ini``.
 
-* ``$service_name`` defaults to ``php5-fpm``.
+* ``$service_name`` defaults to ``php7.0-fpm``.
 
 * ``$service_ensure`` defaults to ``running``.
 
@@ -60,5 +60,5 @@ Installs the ``CLI`` PHP SAPI.
 
 * ``$package`` defaults to ``php5-cli``.
 
-* ``$inifile`` defaults to ``/etc/php5/cli/php.ini``.
+* ``$inifile`` defaults to ``/etc/php/7.0/cli/php.ini``.
 

manifests/apache/params.pp

@@ -43,7 +43,7 @@
   $ensure   = $php::params::ensure
   $package  = 'libapache2-mod-php5'
   $provider = undef
-  $inifile  = '/etc/php5/apache2/php.ini'
+  $inifile  = '/etc/php/7.0/apache2/php.ini'
   $settings = [ ]
 
   $service_name = 'apache2'

manifests/extension/ldap/params.pp

@@ -43,6 +43,6 @@
   $ensure   = $php::params::ensure
   $package  = 'php5-ldap'
   $provider = undef
-  $inifile  = '/etc/php5/conf.d/20-ldap.ini'
+  $inifile  = '/etc/php/7.0/conf.d/20-ldap.ini'
   $settings = []
 }

manifests/fpm.pp

@@ -10,14 +10,14 @@
 #
 # [*package*]
 #   The package name for fpm package
-#   For debian it's php5-fpm
+#   For debian it's php7.0-fpm
 #
 # [*provider*]
-#   The provider used to install php5-fpm
+#   The provider used to install php7.0-fpm
 #   Could be "pecl", "apt" or any other OS package provider
 #
 # [*inifile*]
-#   The path to the ini php5-fpm ini file
+#   The path to the ini php7.0-fpm ini file
 #
 # [*settings*]
 #   Hash with 'set' nested hash of key => value

spec/classes/fpm/php_fpm_package_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe 'php::fpm::package', :type => :class do
-  context 'with package_name => php5-fpm' do
-    let(:params) { {:package_name => 'php5-fpm', :package_ensure => 'installed'} }
-    it { should contain_package('php5-fpm') }
+  context 'with package_name => php7.0-fpm' do
+    let(:params) { {:package_name => 'php7.0-fpm', :package_ensure => 'installed'} }
+    it { should contain_package('php7.0-fpm') }
   end
 end

spec/classes/fpm_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'php::fpm', :type => :class do
   it { should contain_class('php::fpm::package') }
-  it { should contain_class('php::fpm::service').that_requires('Package[php5-fpm]') }
-  it { should contain_php__fpm__config('php-fpm').that_requires('Package[php5-fpm]') }
-  it { should contain_file('/etc/php5/fpm/php-fpm.conf').that_requires('Package[php5-fpm]') }
+  it { should contain_class('php::fpm::service').that_requires('Package[php7.0-fpm]') }
+  it { should contain_php__fpm__config('php-fpm').that_requires('Package[php7.0-fpm]') }
+  it { should contain_file('/etc/php/7.0/fpm/php-fpm.conf').that_requires('Package[php7.0-fpm]') }
 end

spec/classes/xdebug_spec.rb

@@ -10,7 +10,7 @@
 
     it { should contain_augeas("php-php-extension-xdebug-config")
       .with({
-        :incl      => '/etc/php5/mods-available/xdebug.ini',
+        :incl      => '/etc/php/7.0/mods-available/xdebug.ini',
       })
     }
   end
@@ -20,7 +20,7 @@
 
     it { should contain_augeas("php-php-extension-xdebug-config")
       .with({
-        :incl      => '/etc/php5/conf.d/xdebug.ini',
+        :incl      => '/etc/php/7.0/conf.d/xdebug.ini',
       })
     }
   end
@@ -30,7 +30,7 @@
 
     it { should contain_augeas("php-php-extension-xdebug-config")
       .with({
-        :incl      => '/etc/php5/mods-available/xdebug.ini',
+        :incl      => '/etc/php/7.0/mods-available/xdebug.ini',
       })
     }
   end
@@ -40,7 +40,7 @@
 
     it { should contain_augeas("php-php-extension-xdebug-config")
       .with({
-        :incl      => '/etc/php5/mods-available/xdebug.ini',
+        :incl      => '/etc/php/7.0/mods-available/xdebug.ini',
       })
     }
   end
@@ -50,19 +50,19 @@
 
     it { should contain_augeas("php-php-extension-xdebug-config")
       .with({
-        :incl      => '/etc/php5/mods-available/xdebug.ini',
+        :incl      => '/etc/php/7.0/mods-available/xdebug.ini',
       })
     }
   end
-  
+
   context 'with php 5.5.11-1~dotdeb.1' do
     let(:facts) { { :php_version => '5.5'} }
 
     it { should contain_augeas("php-php-extension-xdebug-config")
       .with({
-        :incl      => '/etc/php5/mods-available/xdebug.ini',
+        :incl      => '/etc/php/7.0/mods-available/xdebug.ini',
       })
     }
   end
-  
+
 end

spec/defines/config_spec.rb

@@ -5,13 +5,13 @@
   context 'default config' do
     let(:title) { 'unique-name' }
     let(:params) {{
-      :file   => '/etc/php5/conf.d/unique-name.ini',
+      :file   => '/etc/php/7.0/conf.d/unique-name.ini',
       :config => []
     }}
 
     it { should contain_augeas("php-unique-name-config")
       .with({
-        :incl      => '/etc/php5/conf.d/unique-name.ini',
+        :incl      => '/etc/php/7.0/conf.d/unique-name.ini',
         :changes   => [],
         :load_path => '/usr/share/augeas/lenses/contrib',
         :lens      => 'PHP.lns'
@@ -22,20 +22,20 @@
   context 'simple example' do
     let(:title) { 'unique-name' }
     let(:params) {{
-      :file   => '/etc/php5/conf.d/unique-name.ini',
+      :file   => '/etc/php/7.0/conf.d/unique-name.ini',
       :config => [
         'set .anon/apc.enabled 1'
       ]
     }}
 
-    it { should contain_php__config('unique-name').with({'file' => '/etc/php5/conf.d/unique-name.ini'})}
+    it { should contain_php__config('unique-name').with({'file' => '/etc/php/7.0/conf.d/unique-name.ini'})}
     it { should contain_augeas("php-unique-name-config").with({'changes' => "set .anon/apc.enabled 1"})}
   end
 
   context 'invalid config (string)' do
     let(:title) { 'unique-name' }
     let(:params) {{
-      :file   => '/etc/php5/conf.d/unique-name.ini',
+      :file   => '/etc/php/7.0/conf.d/unique-name.ini',
       :config => 'hello world'
     }}
 

spec/defines/fpm_config_spec.rb

@@ -8,28 +8,28 @@
   context 'valid config' do
     let(:title) { 'unique-name' }
     let(:params) {{
-      :file   => '/etc/php5/fpm/conf.d/unique-name.ini',
+      :file   => '/etc/php/7.0/fpm/conf.d/unique-name.ini',
       :config  => ['set .anon/apc.enabled 1'],
     }}
 
     it { should contain_php__fpm__config('unique-name')
       .with({
-        'file'    => '/etc/php5/fpm/conf.d/unique-name.ini',
+        'file'    => '/etc/php/7.0/fpm/conf.d/unique-name.ini',
         'config'  => ['set .anon/apc.enabled 1']
       })
     }
 
     it { should contain_php__config('unique-name')
       .with({
-        'file'    => '/etc/php5/fpm/conf.d/unique-name.ini',
+        'file'    => '/etc/php/7.0/fpm/conf.d/unique-name.ini',
         'config'  => ['set .anon/apc.enabled 1'],
-        'notify'  => 'Service[php5-fpm]',
+        'notify'  => 'Service[php7.0-fpm]',
       })
     }
 
     it { should contain_augeas("php-fpm-unique-name-config")
       .with({
-        'incl'    => '/etc/php5/fpm/conf.d/unique-name.ini',
+        'incl'    => '/etc/php/7.0/fpm/conf.d/unique-name.ini',
         'changes' => "set .anon/apc.enabled 1"
       })
     }
@@ -39,7 +39,7 @@
   context 'invalid config (string)' do
     let(:title) { 'unique-name' }
     let(:params) {{
-      :file => '/etc/php5/fpm/conf.d/unique-name.ini',
+      :file => '/etc/php/7.0/fpm/conf.d/unique-name.ini',
       :config => 'hello world'
     }}
 
@@ -51,13 +51,13 @@
 
     it { should contain_php__config('upload_max_filesize=20M').with({
       'ensure'  => 'present',
-      'file'    => '/etc/php5/fpm/php.ini',
+      'file'    => '/etc/php/7.0/fpm/php.ini',
       'section' => 'PHP',
     } )}
 
-    it { should contain_ini_setting('upload_max_filesize=20M in /etc/php5/fpm/php.ini').with({
+    it { should contain_ini_setting('upload_max_filesize=20M in /etc/php/7.0/fpm/php.ini').with({
       'ensure'  => 'present',
-      'path'    => '/etc/php5/fpm/php.ini',
+      'path'    => '/etc/php/7.0/fpm/php.ini',
       'section' => 'PHP',
       'setting' => 'upload_max_filesize',
       'value'   => '20M',