.fixtures.yml

@@ -9,3 +9,4 @@ fixtures:
     yumrepo_core:
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
       puppet_version: ">= 6.0.0"
+    zend_common: "https://github.com/zendtech/puppet-zend-common.git"

.gitignore

@@ -1,23 +1,23 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-pkg/
-Gemfile.lock
-Gemfile.local
-vendor/
-.vendor/
-spec/fixtures/manifests/
-spec/fixtures/modules/
-.vagrant/
-.bundle/
-.ruby-version
-coverage/
-log/
-.idea/
-.dependencies/
-.librarian/
-Puppetfile.lock
+/pkg/
+/Gemfile.lock
+/Gemfile.local
+/vendor/
+/.vendor/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/
+/.vagrant/
+/.bundle/
+/.ruby-version
+/coverage/
+/log/
+/.idea/
+/.dependencies/
+/.librarian/
+/Puppetfile.lock
 *.iml
 .*.sw?
-.yardoc/
-Guardfile
+/.yardoc/
+/Guardfile

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '5.4.0'
+modulesync_config_version: '6.0.0'

.pmtignore

@@ -1,37 +1,37 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-docs/
-pkg/
-Gemfile
-Gemfile.lock
-Gemfile.local
-vendor/
-.vendor/
-spec/
-Rakefile
-.vagrant/
-.bundle/
-.ruby-version
-coverage/
-log/
-.idea/
-.dependencies/
-.github/
-.librarian/
-Puppetfile.lock
+/docs/
+/pkg/
+/Gemfile
+/Gemfile.lock
+/Gemfile.local
+/vendor/
+/.vendor/
+/spec/
+/Rakefile
+/.vagrant/
+/.bundle/
+/.ruby-version
+/coverage/
+/log/
+/.idea/
+/.dependencies/
+/.github/
+/.librarian/
+/Puppetfile.lock
 *.iml
-.editorconfig
-.fixtures.yml
-.gitignore
-.msync.yml
-.overcommit.yml
-.pmtignore
-.rspec
-.rspec_parallel
-.rubocop.yml
-.sync.yml
+/.editorconfig
+/.fixtures.yml
+/.gitignore
+/.msync.yml
+/.overcommit.yml
+/.pmtignore
+/.rspec
+/.rspec_parallel
+/.rubocop.yml
+/.sync.yml
 .*.sw?
-.yardoc/
-.yardopts
-Dockerfile
+/.yardoc/
+/.yardopts
+/Dockerfile

CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v9.0.0](https://github.com/voxpupuli/puppet-php/tree/v9.0.0) (2023-08-08)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v8.2.0...v9.0.0)
+
+**Breaking changes:**
+
+- Drop Puppet 6 support [\#683](https://github.com/voxpupuli/puppet-php/pull/683) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- Add Puppet 8 support [\#692](https://github.com/voxpupuli/puppet-php/pull/692) ([bastelfreak](https://github.com/bastelfreak))
+- puppetlabs/stdlib: Allow 9.x [\#691](https://github.com/voxpupuli/puppet-php/pull/691) ([bastelfreak](https://github.com/bastelfreak))
+- Add class parameter `fpm_log_dir_mode` to customize the file permission of log directory [\#675](https://github.com/voxpupuli/puppet-php/pull/675) ([Q-Storm](https://github.com/Q-Storm))
+- Add ZendPHP support [\#671](https://github.com/voxpupuli/puppet-php/pull/671) ([jbh](https://github.com/jbh))
+
+**Closed issues:**
+
+- Use Stable composer install instead of latest [\#583](https://github.com/voxpupuli/puppet-php/issues/583)
+
+**Merged pull requests:**
+
+- puppetlabs/inifile: Allow 6.x [\#693](https://github.com/voxpupuli/puppet-php/pull/693) ([smortex](https://github.com/smortex))
+- Add option to disable management of rundir [\#674](https://github.com/voxpupuli/puppet-php/pull/674) ([tmanninger](https://github.com/tmanninger))
+
 ## [v8.2.0](https://github.com/voxpupuli/puppet-php/tree/v8.2.0) (2023-01-27)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v8.1.1...v8.2.0)

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 6.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 2.0',  :require => false
+  gem 'puppet_metadata', '~> 3.0',  :require => false
 end
 
 group :development do
@@ -16,19 +16,19 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '>= 1.2.0',            :require => false
-  gem 'puppet-strings', '>= 2.2',                 :require => false
+  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
+  gem 'voxpupuli-release', '~> 3.0',              :require => false
+  gem 'faraday-retry', '~> 2.1',                  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

README.md

@@ -299,6 +299,58 @@ We prefer using php-fpm. You can find an example Apache vhost in
 `manifests/apache_vhost.pp` that shows you how to use `mod_proxy_fcgi` to
 connect to php-fpm.
 
+### ZendPHP support
+
+> Be sure to require the `zend/zend_common` puppet module
+> to ensure the correct package repository is being used.
+
+To use ZendPHP, configure the global zend parameters.
+
+```puppet
+class { 'php::globals':
+  php_version => '7.4',
+  flavor      => 'zend',
+  zend_creds  => {
+    'username' => '<USERNAME>',
+    'password' => '<PASSWORD>',
+  },
+}->
+class { 'php':
+  fpm        => true,
+  fpm_pools  => {
+    www      => {
+      listen => "127.0.0.1:9000",
+    },
+  }
+}
+```
+
+#### ZendPHP soft dependencies on RedHat/CentOS/Rocky
+
+Due to the nature of ZendPHP delivering patched, LTS versions of PHP and its extensions,
+RedHat systems sometimes depend on `epel` and the `powertools` repo.
+
+If you're trying to use ZendPHP and running into issues of missing dependencies,
+first try installing epel. If the dependencies still can't be found, try
+enabling `powertools`.
+
+```puppet
+if $facts['os']['family'] == 'RedHat' {
+  package { 'epel-release': }
+
+  if Float($php_version) < 7.4 {
+    # Depends on puppet/yum
+    class { 'yum':
+      managed_repos => ['powertools'],
+      repos => {
+        'powertools' => {
+          enabled => true,
+        },
+      },
+    }
+  }
+}
+```
 
 ### RedHat/CentOS SCL Users
 If you plan to use the SCL repositories with this module you must do the following adjustments:

REFERENCE.md

@@ -208,6 +208,7 @@ The following parameters are available in the `php` class:
 * [`fpm_package`](#-php--fpm_package)
 * [`fpm_user`](#-php--fpm_user)
 * [`fpm_group`](#-php--fpm_group)
+* [`fpm_log_dir_mode`](#-php--fpm_log_dir_mode)
 * [`embedded`](#-php--embedded)
 * [`dev`](#-php--dev)
 * [`composer`](#-php--composer)
@@ -335,6 +336,14 @@ Data type: `String[1]`
 
 Default value: `$php::params::fpm_group`
 
+##### <a name="-php--fpm_log_dir_mode"></a>`fpm_log_dir_mode`
+
+Data type: `Stdlib::Filemode`
+
+
+
+Default value: `$php::params::fpm_log_dir_mode`
+
 ##### <a name="-php--embedded"></a>`embedded`
 
 Data type: `Boolean`
@@ -1162,6 +1171,9 @@ Configure php-fpm service
 [*pid_file*]
   Path to fpm pid file
 
+[*manage_run_dir*]
+  Manage the run directory
+
 #### Parameters
 
 The following parameters are available in the `php::fpm::config` class:
@@ -1188,6 +1200,7 @@ The following parameters are available in the `php::fpm::config` class:
 * [`root_group`](#-php--fpm--config--root_group)
 * [`syslog_facility`](#-php--fpm--config--syslog_facility)
 * [`syslog_ident`](#-php--fpm--config--syslog_ident)
+* [`manage_run_dir`](#-php--fpm--config--manage_run_dir)
 
 ##### <a name="-php--fpm--config--config_file"></a>`config_file`
 
@@ -1335,11 +1348,11 @@ Default value: `$php::params::fpm_group`
 
 ##### <a name="-php--fpm--config--log_dir_mode"></a>`log_dir_mode`
 
-Data type: `Pattern[/^\d+$/]`
+Data type: `Stdlib::Filemode`
 
 
 
-Default value: `'0770'`
+Default value: `$php::params::fpm_log_dir_mode`
 
 ##### <a name="-php--fpm--config--root_group"></a>`root_group`
 
@@ -1365,6 +1378,14 @@ Data type: `String`
 
 Default value: `'php-fpm'`
 
+##### <a name="-php--fpm--config--manage_run_dir"></a>`manage_run_dir`
+
+Data type: `Boolean`
+
+
+
+Default value: `true`
+
 ### <a name="php--fpm--service"></a>`php::fpm::service`
 
 Manage fpm service
@@ -1478,6 +1499,8 @@ The following parameters are available in the `php::globals` class:
 * [`config_root`](#-php--globals--config_root)
 * [`fpm_pid_file`](#-php--globals--fpm_pid_file)
 * [`rhscl_mode`](#-php--globals--rhscl_mode)
+* [`zend_creds`](#-php--globals--zend_creds)
+* [`flavor`](#-php--globals--flavor)
 
 ##### <a name="-php--globals--php_version"></a>`php_version`
 
@@ -1511,6 +1534,22 @@ Data type: `Optional[Enum['rhscl', 'remi']]`
 
 Default value: `undef`
 
+##### <a name="-php--globals--zend_creds"></a>`zend_creds`
+
+Data type: `Optional[Hash]`
+
+
+
+Default value: `undef`
+
+##### <a name="-php--globals--flavor"></a>`flavor`
+
+Data type: `Enum['community', 'zend']`
+
+
+
+Default value: `'community'`
+
 ### <a name="php--packages"></a>`php::packages`
 
 Install common PHP packages