66 changed files with 706 additions and 11039 deletions
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-name: 'Kitchen Vagrant (FreeBSD)'
-'on': ['push', 'pull_request']
-
-env:
-  KITCHEN_LOCAL_YAML: 'kitchen.vagrant.yml'
-
-jobs:
-  test:
-    runs-on: 'macos-10.15'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - freebsd-freebsd-130-master-py3
-          - freebsd-freebsd-123-master-py3
-          # - freebsd-freebsd-130-3004-0-py3
-          # - freebsd-freebsd-123-3004-0-py3
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
--- a/.gitignore
+++ b/.gitignore
@ -91,9 +91,6 @@ celerybeat-schedule
 venv/
 ENV/

-# visual studio
-.vs/
-
 # Spyder project settings
 .spyderproject
 .spyproject
@ -123,12 +120,3 @@ docs/*.md
 Dockerfile.*_*
 ignore/
 tmp/
-
-# `salt-formula` -- Vagrant Specific files
-.vagrant
-top.sls
-!test/salt/pillar/top.sls
-
-# `suricata-formula` -- Platform binaries
-*.rpm
-*.deb
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -18,7 +18,6 @@
  image_precommit: &image_precommit
    name: 'myii/ssf-pre-commit:2.9.2'
    entrypoint: ['/bin/bash', '-c']
-  image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
  image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
  # `services`
  services_docker_dind: &services_docker_dind
@ -46,15 +45,14 @@ variables:
  DOCKER_DRIVER: 'overlay2'

 ###############################################################################
-# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
+# `lint` stage: `commitlint` & `pre-commit`
 ###############################################################################
 commitlint:
  stage: *stage_lint
  image: *image_commitlint
  script:
    # Add `upstream` remote to get access to `upstream/master`
-    - 'git remote add upstream
-       https://gitlab.com/saltstack-formulas/php-formula.git'
+    - 'git remote add upstream ${CI_PROJECT_URL}.git'
    - 'git fetch --all'
    # Set default commit hashes for `--from` and `--to`
    - 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
@ -86,23 +84,10 @@ pre-commit:
  script:
    - 'pre-commit run --all-files --color always --verbose'

-# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
-# - The `pre-commit` check will only be available for formulas that pass the default
-#   `rubocop` check -- and must continue to do so
-# - This job is allowed to fail, so can be used for all formulas
-# - Furthermore, this job uses all of the latest `rubocop` features & cops,
-#   which will help when upgrading the `rubocop` linter used in `pre-commit`
-rubocop:
-  allow_failure: true
-  stage: *stage_lint
-  image: *image_rubocop
-  script:
-    - 'rubocop -d -P -S --enable-pending-cops'
-
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance: &test_instance
+.test_instance:
  stage: *stage_test
  image: *image_dindruby
  services: *services_docker_dind
@ -117,78 +102,38 @@ rubocop:
    # Alternative value to consider: `${CI_JOB_NAME}`
    - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'

-###############################################################################
-# Define `test` template (`allow_failure: true`)
-###############################################################################
-.test_instance_failure_permitted:
-  <<: *test_instance
-  allow_failure: true
-
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
-# yamllint disable rule:line-length
-# debian-debian-11-tiamat-py3: {extends: '.test_instance'}
-# debian-debian-10-tiamat-py3: {extends: '.test_instance'}
-# debian-debian-9-tiamat-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
-# ubuntu-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# redhat-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-centos-7-tiamat-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
-# redhat-almalinux-8-tiamat-py3: {extends: '.test_instance'}
-# redhat-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
-debian-debian-11-master-py3: {extends: '.test_instance'}
 debian-debian-10-master-py3: {extends: '.test_instance'}
-debian-debian-9-master-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
-ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
-redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
-redhat-centos-7-master-py3: {extends: '.test_instance'}
-redhat-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-redhat-fedora-35-master-py3: {extends: '.test_instance'}
-suse-opensuse-leap-154-master-py3: {extends: '.test_instance'}
-suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
-redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
-redhat-oraclelinux-8-master-py3: {extends: '.test_instance'}
-redhat-oraclelinux-7-master-py3: {extends: '.test_instance'}
-redhat-almalinux-8-master-py3: {extends: '.test_instance'}
-redhat-rockylinux-8-master-py3: {extends: '.test_instance'}
-# debian-debian-11-3004-1-py3: {extends: '.test_instance'}
-# debian-debian-10-3004-1-py3: {extends: '.test_instance'}
-# debian-debian-9-3004-1-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# ubuntu-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-# redhat-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-centos-7-3004-1-py3: {extends: '.test_instance'}
-# redhat-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# redhat-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# redhat-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# suse-opensuse-leap-154-3004-0-py3: {extends: '.test_instance'}
-# suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# debian-debian-10-3003-4-py3: {extends: '.test_instance'}
-# debian-debian-9-3003-4-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# redhat-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# redhat-centos-7-3003-4-py3: {extends: '.test_instance'}
-# redhat-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# redhat-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# redhat-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# yamllint enable rule:line-length
+# ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# redhat-centos-8-master-py3: {extends: '.test_instance'}
+# redhat-fedora-31-master-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-151-master-py3: {extends: '.test_instance'}
+# redhat-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# debian-debian-10-2019-2-py3: {extends: '.test_instance'}
+# debian-debian-9-2019-2-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-2019-2-py3: {extends: '.test_instance'}
+# redhat-centos-8-2019-2-py3: {extends: '.test_instance'}
+# redhat-fedora-31-2019-2-py3: {extends: '.test_instance'}
+# suse-opensuse-leap-151-2019-2-py3: {extends: '.test_instance'}
+# redhat-centos-7-2019-2-py2: {extends: '.test_instance'}
+redhat-amazonlinux-2-2019-2-py3: {extends: '.test_instance'}
+redhat-fedora-30-2018-3-py3: {extends: '.test_instance'}
+# debian-debian-9-2018-3-py2: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-2018-3-py2: {extends: '.test_instance'}
+# redhat-centos-7-2018-3-py2: {extends: '.test_instance'}
+suse-opensuse-leap-151-2018-3-py2: {extends: '.test_instance'}
+# redhat-amazonlinux-1-2018-3-py2: {extends: '.test_instance'}
+# debian-debian-8-2017-7-py2: {extends: '.test_instance'}
+# ubuntu-ubuntu-1604-2017-7-py2: {extends: '.test_instance'}
+# redhat-centos-6-2017-7-py2: {extends: '.test_instance'}
+# redhat-fedora-30-2017-7-py2: {extends: '.test_instance'}
+# suse-opensuse-leap-151-2017-7-py2: {extends: '.test_instance'}
+# redhat-amazonlinux-1-2017-7-py2: {extends: '.test_instance'}

 ###############################################################################
 # `release` stage: `semantic-release`
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,18 +3,6 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-ci:
-  autofix_commit_msg: |
-    ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
-
-    For more information, see https://pre-commit.ci
-  autofix_prs: true
-  autoupdate_branch: ''
-  autoupdate_commit_msg: |
-    ci(pre-commit.ci): perform `pre-commit` autoupdate
-  autoupdate_schedule: quarterly
-  skip: []
-  submodules: false
 default_stages: [commit]
 repos:
  - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@ -29,23 +17,16 @@ repos:
        stages: [manual]
        additional_dependencies: ['@commitlint/config-conventional@8.3.4']
        always_run: true
-  - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.30.1
-    hooks:
-      - id: rubocop
-        name: Check Ruby files with rubocop
-        args: [--debug]
-        always_run: true
-        pass_filenames: false
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 2.1.3
    hooks:
      - id: shellcheck
        name: Check shell scripts with shellcheck
        files: ^.*\.(sh|bash|ksh)$
        types: []
-  - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+        args: []
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.23.0
    hooks:
      - id: yamllint
        name: Check YAML syntax with yamllint
@ -53,7 +34,7 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/warpnet/salt-lint
-    rev: v0.8.0
+    rev: v0.3.0
    hooks:
      - id: salt-lint
        name: Check Salt files using salt-lint
@ -64,14 +45,4 @@ repos:
      - id: rstcheck
        name: Check reST files using rstcheck
        exclude: 'docs/CHANGELOG.rst'
-  - repo: https://github.com/saltstack-formulas/mirrors-rst-lint
-    rev: v1.3.2
-    hooks:
-      - id: rst-lint
-        name: Check reST files using rst-lint
-        exclude: |
-            (?x)^(
-                docs/CHANGELOG.rst|
-                docs/TOFS_pattern.rst|
-            )$
-        additional_dependencies: [pygments==2.9.0]
+        args: [--report=warning]
--- a/.rstcheck.cfg
+++ b/.rstcheck.cfg
@ -1,4 +1,3 @@
 [rstcheck]
-report=info
+report=error
 ignore_language=rst
-ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -7,17 +7,10 @@ Layout/LineLength:
  # Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
  Max: 88
 Metrics/BlockLength:
-  IgnoredMethods:
+  ExcludedMethods:
    - control
    - describe
  # Increase from default of `25`
  Max: 30
-Security/YAMLLoad:
-  Exclude:
-    - test/integration/**/_mapdata.rb
-
-# General settings across all cops in this formula
-AllCops:
-  NewCops: enable

 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
--- a/.travis.yml
+++ b/.travis.yml
@ -36,14 +36,17 @@ stages:
  # - name: 'release'
  #   if: 'branch = master AND type != pull_request'
 jobs:
+  allow_failures:
+    - env: Lint_rubocop
+  fast_finish: true
  include:
    ## Define the test stage that runs the linters (and testing matrix, if applicable)

-    # Run all of the linters in a single job
+    # Run all of the linters in a single job (except `rubocop`)
    - language: 'node_js'
      node_js: 'lts/*'
      env: 'Lint'
-      name: 'Lint: salt-lint, yamllint, rubocop, shellcheck & commitlint'
+      name: 'Lint: salt-lint, yamllint, shellcheck & commitlint'
      before_install: 'skip'
      script:
        # Install and run `salt-lint`
@ -54,9 +57,6 @@ jobs:
        # Need at least `v1.17.0` for the `yaml-files` setting
        - pip install --user yamllint>=1.17.0
        - yamllint -s .
-        # Install and run `rubocop`
-        - gem install rubocop
-        - rubocop -d
        # Run `shellcheck` (already pre-installed in Travis)
        - shellcheck --version
        - git ls-files -- '*.sh' '*.bash' '*.ksh'
@ -65,6 +65,17 @@ jobs:
        - npm i -D @commitlint/config-conventional
                   @commitlint/travis-cli
        - commitlint-travis
+    # Run the `rubocop` linter in a separate job that is allowed to fail
+    # Once these lint errors are fixed, this can be merged into a single job
+    - language: node_js
+      node_js: lts/*
+      env: Lint_rubocop
+      name: 'Lint: rubocop'
+      before_install: skip
+      script:
+        # Install and run `rubocop`
+        - gem install rubocop
+        - rubocop -d

    # Run `pre-commit` linters in a single job
    - language: 'python'
@ -83,63 +94,32 @@ jobs:
    ## Define the rest of the matrix based on Kitchen testing
    # Make sure the instances listed below match up with
    # the `platforms` defined in `kitchen.yml`
-    # - env: INSTANCE=debian-debian-11-tiamat-py3
-    # - env: INSTANCE=debian-debian-10-tiamat-py3
-    # - env: INSTANCE=debian-debian-9-tiamat-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2204-tiamat-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-tiamat-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=redhat-centos-stream8-tiamat-py3
-    # - env: INSTANCE=redhat-centos-7-tiamat-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-tiamat-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-tiamat-py3
-    # - env: INSTANCE=redhat-almalinux-8-tiamat-py3
-    # - env: INSTANCE=redhat-rockylinux-8-tiamat-py3
-    - env: INSTANCE=debian-debian-11-master-py3
    - env: INSTANCE=debian-debian-10-master-py3
-    - env: INSTANCE=debian-debian-9-master-py3
-    - env: INSTANCE=ubuntu-ubuntu-2204-master-py3
-    - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
-    - env: INSTANCE=redhat-centos-stream8-master-py3
-    - env: INSTANCE=redhat-centos-7-master-py3
-    - env: INSTANCE=redhat-fedora-36-master-py3
-    - env: INSTANCE=redhat-fedora-35-master-py3
-    - env: INSTANCE=suse-opensuse-leap-154-master-py3
-    - env: INSTANCE=suse-opensuse-tmbl-latest-master-py3
-    - env: INSTANCE=redhat-amazonlinux-2-master-py3
-    - env: INSTANCE=redhat-oraclelinux-8-master-py3
-    - env: INSTANCE=redhat-oraclelinux-7-master-py3
-    - env: INSTANCE=redhat-almalinux-8-master-py3
-    - env: INSTANCE=redhat-rockylinux-8-master-py3
-    # - env: INSTANCE=debian-debian-11-3004-1-py3
-    # - env: INSTANCE=debian-debian-10-3004-1-py3
-    # - env: INSTANCE=debian-debian-9-3004-1-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2204-3004-1-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3004-1-py3
-    # - env: INSTANCE=redhat-centos-stream8-3004-1-py3
-    # - env: INSTANCE=redhat-centos-7-3004-1-py3
-    # - env: INSTANCE=redhat-fedora-36-3004-1-py3
-    # - env: INSTANCE=redhat-fedora-35-3004-1-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3004-1-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3004-1-py3
-    # - env: INSTANCE=redhat-almalinux-8-3004-1-py3
-    # - env: INSTANCE=redhat-rockylinux-8-3004-1-py3
-    # - env: INSTANCE=suse-opensuse-leap-154-3004-0-py3
-    # - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=debian-debian-10-3003-4-py3
-    # - env: INSTANCE=debian-debian-9-3003-4-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-4-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=redhat-centos-stream8-3003-4-py3
-    # - env: INSTANCE=redhat-centos-7-3003-4-py3
-    # - env: INSTANCE=redhat-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=redhat-oraclelinux-8-3003-4-py3
-    # - env: INSTANCE=redhat-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=redhat-almalinux-8-3003-4-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
+    # - env: INSTANCE=redhat-centos-8-master-py3
+    # - env: INSTANCE=redhat-fedora-31-master-py3
+    # - env: INSTANCE=suse-opensuse-leap-151-master-py3
+    # - env: INSTANCE=redhat-amazonlinux-2-master-py3
+    # - env: INSTANCE=debian-debian-10-2019-2-py3
+    # - env: INSTANCE=debian-debian-9-2019-2-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=redhat-centos-8-2019-2-py3
+    # - env: INSTANCE=redhat-fedora-31-2019-2-py3
+    # - env: INSTANCE=suse-opensuse-leap-151-2019-2-py3
+    # - env: INSTANCE=redhat-centos-7-2019-2-py2
+    - env: INSTANCE=redhat-amazonlinux-2-2019-2-py3
+    - env: INSTANCE=redhat-fedora-30-2018-3-py3
+    # - env: INSTANCE=debian-debian-9-2018-3-py2
+    # - env: INSTANCE=ubuntu-ubuntu-1604-2018-3-py2
+    # - env: INSTANCE=redhat-centos-7-2018-3-py2
+    - env: INSTANCE=suse-opensuse-leap-151-2018-3-py2
+    # - env: INSTANCE=redhat-amazonlinux-1-2018-3-py2
+    # - env: INSTANCE=debian-debian-8-2017-7-py2
+    # - env: INSTANCE=ubuntu-ubuntu-1604-2017-7-py2
+    # - env: INSTANCE=redhat-centos-6-2017-7-py2
+    # - env: INSTANCE=redhat-fedora-30-2017-7-py2
+    # - env: INSTANCE=suse-opensuse-leap-151-2017-7-py2
+    # - env: INSTANCE=redhat-amazonlinux-1-2017-7-py2

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/.yamllint
+++ b/.yamllint
@ -2,24 +2,17 @@
 # vim: ft=yaml
 ---
 # Extend the `default` configuration provided by `yamllint`
-extends: 'default'
+extends: default

 # Files to ignore completely
-# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
-# 2. All YAML files under directory `.cache/`, introduced during the CI run
-# 3. All YAML files under directory `.git/`
-# 4. All YAML files under directory `node_modules/`, introduced during the CI run
-# 5. Any SLS files under directory `test/`, which are actually state files
-# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
-# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
+# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
+# 2. Any SLS files under directory `test/`, which are actually state files
+# 3. Any YAML files under directory `.kitchen/`, introduced during local testing
 ignore: |
-  .bundle/
  .cache/
-  .git/
  node_modules/
  test/**/states/**/*.sls
  .kitchen/
-  kitchen.vagrant.yml

 yaml-files:
  # Default settings
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -4,70 +4,67 @@ This list is sorted by the number of commits per contributor in _descending_ ord

 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|172
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|52
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|48
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|32
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|16
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|14
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1184479?v=4' width='36' height='36' alt='@cheuschober'>|[@cheuschober](https://github.com/cheuschober)|12
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>|[@babilen](https://github.com/babilen)|11
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10924313?v=4' width='36' height='36' alt='@Kurt108'>|[@Kurt108](https://github.com/Kurt108)|8
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|7
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|7
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>|[@bogdanr](https://github.com/bogdanr)|7
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|6
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|6
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/11757928?v=4' width='36' height='36' alt='@pawelrosada'>|[@pawelrosada](https://github.com/pawelrosada)|5
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/197639?v=4' width='36' height='36' alt='@ckng'>|[@ckng](https://github.com/ckng)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1197993?v=4' width='36' height='36' alt='@danoe'>|[@danoe](https://github.com/danoe)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/183678?v=4' width='36' height='36' alt='@Seldaek'>|[@Seldaek](https://github.com/Seldaek)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6086064?v=4' width='36' height='36' alt='@mgomersbach'>|[@mgomersbach](https://github.com/mgomersbach)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1386595?v=4' width='36' height='36' alt='@tsia'>|[@tsia](https://github.com/tsia)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5655231?v=4' width='36' height='36' alt='@kpostrup'>|[@kpostrup](https://github.com/kpostrup)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>|[@ross-p](https://github.com/ross-p)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38883924?v=4' width='36' height='36' alt='@Ahummeling'>|[@Ahummeling](https://github.com/Ahummeling)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/732321?v=4' width='36' height='36' alt='@gtmanfred'>|[@gtmanfred](https://github.com/gtmanfred)|4
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>|[@ixs](https://github.com/ixs)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurzenika'>|[@arthurzenika](https://github.com/arthurzenika)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>|[@fintanmm](https://github.com/fintanmm)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>|[@pprkut](https://github.com/pprkut)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>|[@stp-ip](https://github.com/stp-ip)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/500703?v=4' width='36' height='36' alt='@retrry'>|[@retrry](https://github.com/retrry)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3119969?v=4' width='36' height='36' alt='@genuss'>|[@genuss](https://github.com/genuss)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/94157?v=4' width='36' height='36' alt='@imran1008'>|[@imran1008](https://github.com/imran1008)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/16899663?v=4' width='36' height='36' alt='@Mario-F'>|[@Mario-F](https://github.com/Mario-F)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/533172?v=4' width='36' height='36' alt='@roock'>|[@roock](https://github.com/roock)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/583677?v=4' width='36' height='36' alt='@hackel'>|[@hackel](https://github.com/hackel)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/548843?v=4' width='36' height='36' alt='@teohhanhui'>|[@teohhanhui](https://github.com/teohhanhui)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>|[@thatch45](https://github.com/thatch45)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>|[@vquiering](https://github.com/vquiering)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/374134?v=4' width='36' height='36' alt='@yellow1912'>|[@yellow1912](https://github.com/yellow1912)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/551974?v=4' width='36' height='36' alt='@wdalmut'>|[@wdalmut](https://github.com/wdalmut)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3180588?v=4' width='36' height='36' alt='@jeroen92'>|[@jeroen92](https://github.com/jeroen92)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/551789?v=4' width='36' height='36' alt='@giannello'>|[@giannello](https://github.com/giannello)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20515?v=4' width='36' height='36' alt='@scambra'>|[@scambra](https://github.com/scambra)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3309784?v=4' width='36' height='36' alt='@aidanharris'>|[@aidanharris](https://github.com/aidanharris)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@sarcastic-coder'>|[@sarcastic-coder](https://github.com/sarcastic-coder)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4754654?v=4' width='36' height='36' alt='@alinefr'>|[@alinefr](https://github.com/alinefr)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/378158?v=4' width='36' height='36' alt='@dseira'>|[@dseira](https://github.com/dseira)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8737019?v=4' width='36' height='36' alt='@johnccfm'>|[@johnccfm](https://github.com/johnccfm)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>|[@mschiff](https://github.com/mschiff)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1616654?v=4' width='36' height='36' alt='@mkhubbard'>|[@mkhubbard](https://github.com/mkhubbard)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5170979?v=4' width='36' height='36' alt='@taion809'>|[@taion809](https://github.com/taion809)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/387511?v=4' width='36' height='36' alt='@philpep'>|[@philpep](https://github.com/philpep)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/327943?v=4' width='36' height='36' alt='@Cottser'>|[@Cottser](https://github.com/Cottser)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/131665?v=4' width='36' height='36' alt='@iamseth'>|[@iamseth](https://github.com/iamseth)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1366252?v=4' width='36' height='36' alt='@zls'>|[@zls](https://github.com/zls)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8792243?v=4' width='36' height='36' alt='@sc250024'>|[@sc250024](https://github.com/sc250024)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10833722?v=4' width='36' height='36' alt='@sylvainfaivre'>|[@sylvainfaivre](https://github.com/sylvainfaivre)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|90
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|52
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|48
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|31
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>|[@n-rodriguez](https://github.com/n-rodriguez)|16
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|14
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1184479?v=4' width='36' height='36' alt='@cheuschober'>|[@cheuschober](https://github.com/cheuschober)|12
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|11
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/10924313?v=4' width='36' height='36' alt='@Kurt108'>|[@Kurt108](https://github.com/Kurt108)|8
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|7
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|7
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>|[@bogdanr](https://github.com/bogdanr)|7
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|6
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|6
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11757928?v=4' width='36' height='36' alt='@pawelrosada'>|[@pawelrosada](https://github.com/pawelrosada)|5
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/197639?v=4' width='36' height='36' alt='@ckng'>|[@ckng](https://github.com/ckng)|4
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1197993?v=4' width='36' height='36' alt='@danoe'>|[@danoe](https://github.com/danoe)|4
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/183678?v=4' width='36' height='36' alt='@Seldaek'>|[@Seldaek](https://github.com/Seldaek)|4
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/6086064?v=4' width='36' height='36' alt='@mgomersbach'>|[@mgomersbach](https://github.com/mgomersbach)|4
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1386595?v=4' width='36' height='36' alt='@tsia'>|[@tsia](https://github.com/tsia)|4
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/5655231?v=4' width='36' height='36' alt='@kpostrup'>|[@kpostrup](https://github.com/kpostrup)|4
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>|[@ross-p](https://github.com/ross-p)|4
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/732321?v=4' width='36' height='36' alt='@gtmanfred'>|[@gtmanfred](https://github.com/gtmanfred)|4
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>|[@ixs](https://github.com/ixs)|3
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurlogilab'>|[@arthurlogilab](https://github.com/arthurlogilab)|3
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>|[@fintanmm](https://github.com/fintanmm)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>|[@pprkut](https://github.com/pprkut)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>|[@stp-ip](https://github.com/stp-ip)|3
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/500703?v=4' width='36' height='36' alt='@retrry'>|[@retrry](https://github.com/retrry)|3
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3119969?v=4' width='36' height='36' alt='@genuss'>|[@genuss](https://github.com/genuss)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|2
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/94157?v=4' width='36' height='36' alt='@imran1008'>|[@imran1008](https://github.com/imran1008)|2
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/16899663?v=4' width='36' height='36' alt='@Mario-F'>|[@Mario-F](https://github.com/Mario-F)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/533172?v=4' width='36' height='36' alt='@roock'>|[@roock](https://github.com/roock)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/583677?v=4' width='36' height='36' alt='@hackel'>|[@hackel](https://github.com/hackel)|2
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/548843?v=4' width='36' height='36' alt='@teohhanhui'>|[@teohhanhui](https://github.com/teohhanhui)|2
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>|[@thatch45](https://github.com/thatch45)|2
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>|[@vquiering](https://github.com/vquiering)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/374134?v=4' width='36' height='36' alt='@yellow1912'>|[@yellow1912](https://github.com/yellow1912)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/551974?v=4' width='36' height='36' alt='@wdalmut'>|[@wdalmut](https://github.com/wdalmut)|2
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3180588?v=4' width='36' height='36' alt='@jeroen92'>|[@jeroen92](https://github.com/jeroen92)|2
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/551789?v=4' width='36' height='36' alt='@giannello'>|[@giannello](https://github.com/giannello)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/358074?v=4' width='36' height='36' alt='@pcdummy'>|[@pcdummy](https://github.com/pcdummy)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/20515?v=4' width='36' height='36' alt='@scambra'>|[@scambra](https://github.com/scambra)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/3309784?v=4' width='36' height='36' alt='@aidanharris'>|[@aidanharris](https://github.com/aidanharris)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@sarcastic-coder'>|[@sarcastic-coder](https://github.com/sarcastic-coder)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/4754654?v=4' width='36' height='36' alt='@alinefr'>|[@alinefr](https://github.com/alinefr)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/378158?v=4' width='36' height='36' alt='@dseira'>|[@dseira](https://github.com/dseira)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8737019?v=4' width='36' height='36' alt='@johnccfm'>|[@johnccfm](https://github.com/johnccfm)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>|[@mschiff](https://github.com/mschiff)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1616654?v=4' width='36' height='36' alt='@mkhubbard'>|[@mkhubbard](https://github.com/mkhubbard)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/5170979?v=4' width='36' height='36' alt='@taion809'>|[@taion809](https://github.com/taion809)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/387511?v=4' width='36' height='36' alt='@philpep'>|[@philpep](https://github.com/philpep)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/327943?v=4' width='36' height='36' alt='@Cottser'>|[@Cottser](https://github.com/Cottser)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/131665?v=4' width='36' height='36' alt='@iamseth'>|[@iamseth](https://github.com/iamseth)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>|[@Yoda-BZH](https://github.com/Yoda-BZH)|1
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1366252?v=4' width='36' height='36' alt='@zls'>|[@zls](https://github.com/zls)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/8792243?v=4' width='36' height='36' alt='@sc250024'>|[@sc250024](https://github.com/sc250024)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/10833722?v=4' width='36' height='36' alt='@sylvainfaivre'>|[@sylvainfaivre](https://github.com/sylvainfaivre)|1

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-03-14.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-12-16.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,145 +1,5 @@
 # Changelog

-# [1.6.0](https://github.com/saltstack-formulas/php-formula/compare/v1.5.1...v1.6.0) (2022-03-14)
-
-
-### Continuous Integration
-
-* update linters to latest versions [skip ci] ([8befefc](https://github.com/saltstack-formulas/php-formula/commit/8befefcfbe50378691cf199f900cf2ca8ba4339f))
-* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([4f54474](https://github.com/saltstack-formulas/php-formula/commit/4f5447451d28137f488bcb20313d6c30fe3e9dd8))
-* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([def6993](https://github.com/saltstack-formulas/php-formula/commit/def69936b47bfd0e65e521a3b2629b591e2a11ca))
-* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] ([ded03de](https://github.com/saltstack-formulas/php-formula/commit/ded03de05e777a4c3b0a1aad8de650470c244d6a))
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([2e98aed](https://github.com/saltstack-formulas/php-formula/commit/2e98aed831e0adcfdc7f34df7c29529614a4ce0e))
-* **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] ([4e5af98](https://github.com/saltstack-formulas/php-formula/commit/4e5af9875abd9e4149db2d3e10c9f6dfcca435f2))
-
-
-### Features
-
-* **modules:** add `xmlrpc` and `xmlreader` as FreeBSD `xml` module ([67e565f](https://github.com/saltstack-formulas/php-formula/commit/67e565f5e2ce83c26a79267f25317e6e4340a73e))
-
-
-### Tests
-
-* **system:** add `build_platform_codename` [skip ci] ([f159202](https://github.com/saltstack-formulas/php-formula/commit/f1592024d507873415debcdc03aa2c885af2e4cf))
-
-## [1.5.1](https://github.com/saltstack-formulas/php-formula/compare/v1.5.0...v1.5.1) (2021-09-17)
-
-
-### Bug Fixes
-
-* **module:** include php version in redis module package name ([2f62f6f](https://github.com/saltstack-formulas/php-formula/commit/2f62f6fa4edcd660dc6247d11b99e871d963adcb))
-* **module:** include php version in redis module package name ([55939d5](https://github.com/saltstack-formulas/php-formula/commit/55939d5cd12cc8e91b5502e7181f8d826464e82d))
-
-
-### Continuous Integration
-
-* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([c7a0c3c](https://github.com/saltstack-formulas/php-formula/commit/c7a0c3c3ea73a42a9e4682c204a620a3f7f2f2ee))
-* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([368ca34](https://github.com/saltstack-formulas/php-formula/commit/368ca34fabc10d7baffb1ea2c047cfe118f0569c))
-* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([fbf2518](https://github.com/saltstack-formulas/php-formula/commit/fbf25184558f07766b06b946f8af5b742ac7665a))
-* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([9964b38](https://github.com/saltstack-formulas/php-formula/commit/9964b38aa31fc44742a856bda5cdffd6aeb91a2a))
-* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([f8e4ba0](https://github.com/saltstack-formulas/php-formula/commit/f8e4ba0e88e58c72ed14b8e7cf4143a446fda74b))
-* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([c22aba7](https://github.com/saltstack-formulas/php-formula/commit/c22aba797e7bd02200a7a9d3b13ba95bd2195fca))
-* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([4891bf6](https://github.com/saltstack-formulas/php-formula/commit/4891bf6e77b90e6ec1a80160f48f86869aa46b88))
-
-
-### Tests
-
-* **_mapdata:** add verification file for `debian-11` [skip ci] ([9b05109](https://github.com/saltstack-formulas/php-formula/commit/9b05109c28d05ebc11c253eabbd6bb219e7726ff))
-* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] ([f55d512](https://github.com/saltstack-formulas/php-formula/commit/f55d5128ab10e9b21bbe315f4588ff13c74de68a))
-
-# [1.5.0](https://github.com/saltstack-formulas/php-formula/compare/v1.4.0...v1.5.0) (2021-06-17)
-
-
-### Continuous Integration
-
-* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([6dc94ca](https://github.com/saltstack-formulas/php-formula/commit/6dc94cae109a98e3d317b890bc86c9353a9e6fbe))
-* **kitchen+gitlab:** adjust matrix to add `3003` [skip ci] ([ace2ca9](https://github.com/saltstack-formulas/php-formula/commit/ace2ca9241698bb9035fbc9df9dc9ffe73a20bed))
-* **vagrant:** add FreeBSD 13.0 [skip ci] ([378a66a](https://github.com/saltstack-formulas/php-formula/commit/378a66a4bd0e9ee1d50ec3986773d4be930aa822))
-* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([3173cc0](https://github.com/saltstack-formulas/php-formula/commit/3173cc08511aa99dd645571c9961f097db283e53))
-
-
-### Documentation
-
-* **readme:** add `Testing with Vagrant` section [skip ci] ([48a0f1f](https://github.com/saltstack-formulas/php-formula/commit/48a0f1f95ca2fad6bb6c88520642e6815a50357a))
-
-
-### Features
-
-* **mods:** add `bcmath` module for FreeBSD ([6381ad4](https://github.com/saltstack-formulas/php-formula/commit/6381ad46347862cd3ab78cbedc7cf3b85572d513))
-* **mods:** add `soap` module for FreeBSD ([7eef994](https://github.com/saltstack-formulas/php-formula/commit/7eef994582ca9ea894368eb37826d9fd3d9cc878))
-* **mods:** add `xsl` module for FreeBSD ([4c9ed02](https://github.com/saltstack-formulas/php-formula/commit/4c9ed0295ce039ef32a4f881f944f0ac82c108df))
-
-
-### Tests
-
-* **_mapdata:** add verification file for `fedora-34` [skip ci] ([cfa76bd](https://github.com/saltstack-formulas/php-formula/commit/cfa76bdf0442be31ff681dc135fd9b3788232a45))
-* **freebsd:** add `map.jinja` verification file (for 13.0) ([8510473](https://github.com/saltstack-formulas/php-formula/commit/8510473f36fc8101cb43bf2a2f29fd79a39158f2))
-* **mods:** update integration tests accordingly ([b776b00](https://github.com/saltstack-formulas/php-formula/commit/b776b00168497f23f9afd843a442d44773ea19d0))
-
-# [1.4.0](https://github.com/saltstack-formulas/php-formula/compare/v1.3.5...v1.4.0) (2021-03-31)
-
-
-### Continuous Integration
-
-* enable Vagrant-based testing using GitHub Actions ([a0306ce](https://github.com/saltstack-formulas/php-formula/commit/a0306cee31439cbbe34cdbdef2e26fc597306592))
-* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([009dab4](https://github.com/saltstack-formulas/php-formula/commit/009dab4dee008259ca5643da6496bb21d28a13f5))
-* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([e762a51](https://github.com/saltstack-formulas/php-formula/commit/e762a51387660694b53e5340f808446a6f9d28b7))
-* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([daa4c9e](https://github.com/saltstack-formulas/php-formula/commit/daa4c9ef43da8bbe45d5068c280dbd85cad17809))
-* **pre-commit:** update hook for `rubocop` [skip ci] ([08332f5](https://github.com/saltstack-formulas/php-formula/commit/08332f5b6f4f69bf4a612289e50772ce93a73e04))
-
-
-### Features
-
-* **composer:** make dependencies configurable ([d727b15](https://github.com/saltstack-formulas/php-formula/commit/d727b15557e2223cd82fe5fde0bc16365e20ebb8))
-
-
-### Tests
-
-* **freebsd:** add specific tests for FreeBSD ([cb2758d](https://github.com/saltstack-formulas/php-formula/commit/cb2758d86e181356c1fbb9a6c5450d22a011418b))
-* **pillar:** list PHP versions for FreeBSD 11.4/12.2 (using `7.4`) ([b876d6b](https://github.com/saltstack-formulas/php-formula/commit/b876d6b1f0d1002712dc33c8525bee4622142947))
-* standardise use of `share` suite & `_mapdata` state [skip ci] ([bf6a758](https://github.com/saltstack-formulas/php-formula/commit/bf6a7582b74369935e4a9e1a7291119587eca4ba))
-* **_mapdata:** add verification files for new platforms ([610cfee](https://github.com/saltstack-formulas/php-formula/commit/610cfee03119cf29958b59edd4880d9200837f67))
-* **share:** standardise with latest changes [skip ci] ([147c996](https://github.com/saltstack-formulas/php-formula/commit/147c996a696d8d9ceb409e8497e97a49cbc18d7e))
-
-## [1.3.5](https://github.com/saltstack-formulas/php-formula/compare/v1.3.4...v1.3.5) (2021-01-14)
-
-
-### Bug Fixes
-
-* **_mapdata:** ensure map data is directly under `values` ([579a613](https://github.com/saltstack-formulas/php-formula/commit/579a61371a59db75971ecd6e0526125e7388198d))
-
-
-### Tests
-
-* **_mapdata:** update for `_mapdata/init.sls` change ([b30f514](https://github.com/saltstack-formulas/php-formula/commit/b30f5146d0dcf546d6ce26dcb9eafbc462a00fe0))
-
-## [1.3.4](https://github.com/saltstack-formulas/php-formula/compare/v1.3.3...v1.3.4) (2020-12-23)
-
-
-### Code Refactoring
-
-* **map:** use top-level `values:` key in `map.jinja` dumps ([46ad65e](https://github.com/saltstack-formulas/php-formula/commit/46ad65e39eff11eba8bd8dfbfb0a0b52e4e79cfb))
-
-
-### Continuous Integration
-
-* **pre-commit:** enable `rubocop` linter after fix ([71dbf34](https://github.com/saltstack-formulas/php-formula/commit/71dbf345d6a5d1701c6012277ae8215d2f7c1dc5))
-
-## [1.3.3](https://github.com/saltstack-formulas/php-formula/compare/v1.3.2...v1.3.3) (2020-12-22)
-
-
-### Continuous Integration
-
-* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([6ea8950](https://github.com/saltstack-formulas/php-formula/commit/6ea8950307db990b93f6e92dc19108c392a11bea))
-* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([992e934](https://github.com/saltstack-formulas/php-formula/commit/992e9348c71ff02ada8443751c8423eb7eb83576))
-
-
-### Tests
-
-* fix rubocop violations ([1a4d208](https://github.com/saltstack-formulas/php-formula/commit/1a4d20877ce9ff7e5c09ba38ff4ea4b2502e0665))
-* **_mapdata:** generate verification files ([f88fdf7](https://github.com/saltstack-formulas/php-formula/commit/f88fdf784ab67ff5083f2e06ee6f5f5aa90b42fb))
-* **map:** verify `map.jinja` dump using `_mapdata` state ([e9591db](https://github.com/saltstack-formulas/php-formula/commit/e9591db3551073ad9b7a747b848702dc4f75a22c))
-
 ## [1.3.2](https://github.com/saltstack-formulas/php-formula/compare/v1.3.1...v1.3.2) (2020-12-16)


--- a/6
+++ b/6
@ -15,14 +15,10 @@
 /docs/AUTHORS.rst                           @saltstack-formulas/ssf
 /docs/CHANGELOG.rst                         @saltstack-formulas/ssf
 /docs/TOFS_pattern.rst                      @saltstack-formulas/ssf
-/*/_mapdata/                                @saltstack-formulas/ssf
 /*/libsaltcli.jinja                         @saltstack-formulas/ssf
 /*/libtofs.jinja                            @saltstack-formulas/ssf
-/test/integration/**/_mapdata.rb            @saltstack-formulas/ssf
-/test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
-/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf
@ -40,8 +36,6 @@
 /Gemfile                                    @saltstack-formulas/ssf
 /Gemfile.lock                               @saltstack-formulas/ssf
 /kitchen.yml                                @saltstack-formulas/ssf
-/kitchen.vagrant.yml                        @saltstack-formulas/ssf
-/kitchen.windows.yml                        @saltstack-formulas/ssf
 /pre-commit_semantic-release.sh             @saltstack-formulas/ssf
 /release-rules.js                           @saltstack-formulas/ssf
 /release.config.js                          @saltstack-formulas/ssf
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 name: php
 os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE
 os_family: Debian, RedHat, Suse
-version: 1.6.0
+version: 1.3.2
 release: 1
 minimum_version: 2017.7
 summary: Php formula
--- a/29
+++ b/29
@ -1,23 +1,12 @@
 # frozen_string_literal: true

-source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
+source 'https://rubygems.org'

-# Install the `inspec` gem using `git` because versions after `4.22.22`
-# suppress diff output; this version fixes this for our uses.
-# rubocop:disable Layout/LineLength
-gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec', branch: 'ssf'
-# rubocop:enable Layout/LineLength
-
-# Install the `kitchen-docker` gem using `git` in order to gain a performance
-# improvement: avoid package installations which are already covered by the
-# `salt-image-builder` (i.e. the pre-salted images that we're using)
-# rubocop:disable Layout/LineLength
-gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
-# rubocop:enable Layout/LineLength
-
-gem 'kitchen-inspec', '>= 2.5.0'
-gem 'kitchen-salt', '>= 0.7.2'
-
-group :vagrant do
-  gem 'kitchen-vagrant'
-end
+# Use the latest version of `inspec` prior to `4.23.4`, which introduces a
+# regression where the diff isn't displayed when comparing using `eq`.
+gem 'inspec',      '~> 4.22.22'
+# Install the `kitchen-docker` gem from GitHub because the latest version
+# currently available (`2.10.0`) doesn't include a recent fix for Gentoo.
+gem 'kitchen-docker', github: 'test-kitchen/kitchen-docker', ref: '41e80fe'
+gem 'kitchen-inspec', '>= 2.2.1'
+gem 'kitchen-salt', '>= 0.6.3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,420 +1,321 @@
 GIT
-  remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
-  branch: ssf
+  remote: https://github.com/test-kitchen/kitchen-docker.git
+  revision: 41e80fed3a7cc86323e19c16a5a340cebf7e5848
+  ref: 41e80fe
  specs:
-    inspec (5.18.15)
-      cookstyle
-      faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.18.15)
-      mongo (= 2.13.2)
-      progress_bar (~> 1.3.3)
-      rake
-      train (~> 3.10)
-      train-aws (~> 0.2)
-      train-habitat (~> 0.1)
-      train-winrm (~> 0.2)
-    inspec-core (5.18.15)
-      addressable (~> 2.4)
-      chef-telemetry (~> 1.0, >= 1.0.8)
-      faraday (>= 0.9.0, < 1.5)
-      faraday_middleware (~> 1.0)
-      hashie (>= 3.4, < 5.0)
-      license-acceptance (>= 0.2.13, < 3.0)
-      method_source (>= 0.8, < 2.0)
-      mixlib-log (~> 3.0)
-      multipart-post (~> 2.0)
-      parallel (~> 1.9)
-      parslet (>= 1.5, < 2.0)
-      pry (~> 0.13)
-      rspec (>= 3.9, <= 3.11)
-      rspec-its (~> 1.2)
-      rubyzip (>= 1.2.2, < 3.0)
-      semverse (~> 3.0)
-      sslshake (~> 1.2)
-      thor (>= 0.20, < 2.0)
-      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.10)
-      tty-prompt (~> 0.17)
-      tty-table (~> 0.10)
-
-GIT
-  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
-  branch: ssf
-  specs:
-    kitchen-docker (2.12.0)
+    kitchen-docker (2.10.0)
      test-kitchen (>= 1.0.0)

 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.0.3.1)
+    activesupport (5.2.4.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.0)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.607.0)
-    aws-sdk-alexaforbusiness (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.386.0)
+    aws-sdk-apigateway (1.55.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-amplify (1.32.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-apigatewayv2 (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-athena (1.33.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-autoscaling (1.22.0)
+      aws-sdk-core (~> 3, >= 3.52.1)
      aws-sigv4 (~> 1.1)
-    aws-sdk-applicationautoscaling (1.51.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-budgets (1.36.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.55.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudformation (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.63.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-cloudfront (1.46.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-batch (1.47.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-cloudhsm (1.27.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.50.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudhsmv2 (1.30.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.70.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudtrail (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.65.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatch (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.39.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatchlogs (1.38.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codecommit (1.40.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.49.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codedeploy (1.37.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.64.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codepipeline (1.37.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchevents (1.46.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-configservice (1.53.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.49.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-cognitoidentity (1.31.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-cognitoidentityprovider (1.53.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.79.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.2)
+    aws-sdk-core (3.109.1)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-costandusagereportservice (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+      jmespath (~> 1.0)
+    aws-sdk-costandusagereportservice (1.28.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-databasemigrationservice (1.53.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-dynamodb (1.55.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ec2 (1.202.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.322.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecr (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecs (1.70.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecrpublic (1.12.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-efs (1.36.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.100.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-eks (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.54.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticache (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticbeanstalk (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticloadbalancing (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticloadbalancingv2 (1.53.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticsearchservice (1.43.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-firehose (1.35.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.65.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-guardduty (1.42.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-emr (1.53.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
+    aws-sdk-iam (1.46.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eventbridge (1.24.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kafka (1.29.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.48.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kinesis (1.30.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-glue (1.88.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-lambda (1.51.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.69.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-organizations (1.17.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-rds (1.104.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.50.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-redshift (1.50.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.41.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53 (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53domains (1.28.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.84.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53resolver (1.21.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-mq (1.40.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-networkfirewall (1.17.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.24.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-organizations (1.59.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ram (1.26.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.148.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.84.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.63.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.37.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.83.1)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sdk-s3control (1.43.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-secretsmanager (1.46.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-securityhub (1.35.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.67.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ses (1.36.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-servicecatalog (1.60.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sms (1.27.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ses (1.41.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-sns (1.34.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-shield (1.48.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sqs (1.34.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-signer (1.32.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-ssm (1.95.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-simpledb (1.29.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
-      aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.51.1)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.137.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-states (1.39.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-synthetics (1.19.0)
-      aws-sdk-core (~> 3, >= 3.121.2)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-transfer (1.34.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-waf (1.43.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv2 (1.1.0)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.2.2)
      aws-eventstream (~> 1, >= 1.0.2)
    azure_graph_rbac (0.17.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_key_vault (0.17.7)
+    azure_mgmt_key_vault (0.17.6)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_resources (0.18.2)
+    azure_mgmt_resources (0.18.0)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_security (0.19.0)
+    azure_mgmt_security (0.18.2)
      ms_rest_azure (~> 0.12.0)
-    azure_mgmt_storage (0.23.0)
+    azure_mgmt_storage (0.22.0)
      ms_rest_azure (~> 0.12.0)
-    bcrypt_pbkdf (1.1.0)
-    bson (4.15.0)
+    bcrypt_pbkdf (1.0.1)
    builder (3.2.4)
-    chef-config (17.10.0)
+    chef-config (16.6.14)
      addressable
-      chef-utils (= 17.10.0)
+      chef-utils (= 16.6.14)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
      tomlrb (~> 1.2)
-    chef-telemetry (1.1.1)
+    chef-telemetry (1.0.14)
      chef-config
      concurrent-ruby (~> 1.0)
-    chef-utils (17.10.0)
-      concurrent-ruby
+      ffi-yajl (~> 2.2)
+    chef-utils (16.6.14)
    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    cookstyle (7.32.1)
-      rubocop (= 1.25.1)
+    concurrent-ruby (1.1.7)
    declarative (0.0.20)
-    diff-lcs (1.5.0)
-    docker-api (2.2.0)
+    declarative-option (0.1.0)
+    diff-lcs (1.4.4)
+    docker-api (2.0.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.3.0)
-    erubi (1.10.0)
-    excon (0.92.3)
-    faraday (1.4.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+    ecma-re-validator (0.2.1)
+      regexp_parser (~> 1.2)
+    ed25519 (1.2.4)
+    erubi (1.9.0)
+    excon (0.78.0)
+    faraday (0.17.3)
      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    ffi (1.15.5)
+    faraday_middleware (0.12.2)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.13.1)
+    ffi-yajl (2.3.4)
+      libyajl2 (~> 1.2)
    fuzzyurl (0.9.0)
-    google-api-client (0.52.0)
+    google-api-client (0.44.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (~> 0.9)
      httpclient (>= 2.8.1, < 3.0)
      mini_mime (~> 1.0)
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
-      rexml
      signet (~> 0.12)
-    googleauth (0.14.0)
+    googleauth (0.13.0)
      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (~> 0.14)
-    gssapi (1.3.1)
+    gssapi (1.3.0)
      ffi (>= 1.0.1)
-    gyoku (1.4.0)
+    gyoku (1.3.1)
      builder (>= 2.1.2)
-      rexml (~> 3.0)
-    hashie (4.1.0)
-    highline (2.0.3)
-    http-cookie (1.0.5)
+    hana (1.3.6)
+    hashie (3.6.0)
+    http-cookie (1.0.3)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.8.5)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
-    kitchen-inspec (2.6.1)
-      hashie (>= 3.4, <= 5.0)
-      inspec (>= 2.2.64, < 7.0)
-      test-kitchen (>= 2.7, < 4)
-    kitchen-salt (0.7.2)
+    inspec (4.22.22)
+      faraday_middleware (~> 0.12.2)
+      inspec-core (= 4.22.22)
+      train (~> 3.0)
+      train-aws (~> 0.1)
+      train-habitat (~> 0.1)
+      train-winrm (~> 0.2)
+    inspec-core (4.22.22)
+      addressable (~> 2.4)
+      chef-telemetry (~> 1.0)
+      faraday (>= 0.9.0)
+      hashie (~> 3.4)
+      json_schemer (>= 0.2.1, < 0.2.12)
+      license-acceptance (>= 0.2.13, < 2.0)
+      method_source (>= 0.8, < 2.0)
+      mixlib-log (~> 3.0)
+      multipart-post (~> 2.0)
+      parallel (~> 1.9)
+      parslet (~> 1.5)
+      pry (~> 0.13)
+      rspec (~> 3.9)
+      rspec-its (~> 1.2)
+      rubyzip (~> 1.2, >= 1.2.2)
+      semverse (~> 3.0)
+      sslshake (~> 1.2)
+      thor (>= 0.20, < 2.0)
+      tomlrb (~> 1.2.0)
+      train-core (~> 3.0)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
+    jmespath (1.4.0)
+    json (2.3.1)
+    json_schemer (0.2.11)
+      ecma-re-validator (~> 0.2)
+      hana (~> 1.3)
+      regexp_parser (~> 1.5)
+      uri_template (~> 0.7)
+    jwt (2.2.2)
+    kitchen-inspec (2.2.1)
+      hashie (~> 3.4)
+      inspec (>= 2.2.64, < 5.0)
+      test-kitchen (>= 2.7, < 3)
+    kitchen-salt (0.6.3)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
-    kitchen-vagrant (1.12.0)
-      test-kitchen (>= 1.4, < 4)
-    license-acceptance (2.1.13)
+    libyajl2 (1.2.0)
+    license-acceptance (1.0.19)
      pastel (~> 0.7)
-      tomlrb (>= 1.2, < 3.0)
-      tty-box (~> 0.6)
-      tty-prompt (~> 0.20)
+      tomlrb (~> 1.2)
+      tty-box (~> 0.3)
+      tty-prompt (~> 0.18)
    little-plugger (1.1.4)
-    logging (2.3.1)
+    logging (2.3.0)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
-    mini_mime (1.1.2)
-    minitest (5.16.2)
-    mixlib-config (3.0.27)
+    mini_mime (1.0.2)
+    minitest (5.14.2)
+    mixlib-config (3.0.9)
      tomlrb
-    mixlib-install (3.12.19)
+    mixlib-install (3.12.3)
      mixlib-shellout
      mixlib-versioning
      thor
    mixlib-log (3.0.9)
-    mixlib-shellout (3.2.7)
+    mixlib-shellout (3.1.6)
      chef-utils
    mixlib-versioning (1.2.12)
-    mongo (2.13.2)
-      bson (>= 4.8.2, < 5.0.0)
    ms_rest (0.7.6)
      concurrent-ruby (~> 1.0)
      faraday (>= 0.9, < 2.0.0)
@ -425,83 +326,60 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      ms_rest (~> 0.7.6)
    multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.1.1)
    net-scp (3.0.0)
      net-ssh (>= 2.6.5, < 7.0.0)
    net-ssh (6.1.0)
    net-ssh-gateway (2.0.0)
      net-ssh (>= 4.0.0)
    nori (2.6.0)
-    options (2.3.2)
-    os (1.1.4)
-    parallel (1.22.1)
-    parser (3.1.2.0)
-      ast (~> 2.4.1)
+    os (1.1.1)
+    parallel (1.19.2)
    parslet (1.8.2)
    pastel (0.8.0)
      tty-color (~> 0.5)
-    progress_bar (1.3.3)
-      highline (>= 1.6, < 3)
-      options (~> 2.3.0)
-    pry (0.14.1)
+    pry (0.13.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (4.0.7)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.5.0)
-    representable (3.2.0)
+    public_suffix (4.0.6)
+    regexp_parser (1.8.2)
+    representable (3.0.4)
      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
+      declarative-option (< 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.3)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.9.0)
    rspec-its (1.3.0)
      rspec-core (>= 3.0.0)
      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.9.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.25.1)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    rubyntlm (0.6.3)
-    rubyzip (2.3.2)
-    semverse (3.0.2)
-    signet (0.17.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    rubyntlm (0.6.2)
+    rubyzip (1.3.0)
+    semverse (3.0.0)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
-    strings (0.2.1)
+    strings (0.2.0)
      strings-ansi (~> 0.2)
-      unicode-display_width (>= 1.5, < 3.0)
+      unicode-display_width (~> 1.5)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    test-kitchen (3.3.1)
+    test-kitchen (2.7.2)
      bcrypt_pbkdf (~> 1.0)
-      chef-utils (>= 16.4.35)
      ed25519 (~> 1.2)
      license-acceptance (>= 1.0.11, < 3.0)
      mixlib-install (~> 3.6)
@ -513,32 +391,28 @@ GEM
      winrm (~> 2.0)
      winrm-elevated (~> 1.0)
      winrm-fs (~> 1.1)
-    thor (1.2.1)
+    thor (1.0.1)
+    thread_safe (0.3.6)
    timeliness (0.3.10)
-    tomlrb (1.3.0)
-    trailblazer-option (0.1.2)
-    train (3.10.1)
-      activesupport (>= 6.0.3.1)
+    tomlrb (1.2.9)
+    train (3.3.27)
+      activesupport (>= 5.2.4.3, < 6.0.0)
      azure_graph_rbac (~> 0.16)
      azure_mgmt_key_vault (~> 0.17)
      azure_mgmt_resources (~> 0.15)
      azure_mgmt_security (~> 0.18)
      azure_mgmt_storage (~> 0.18)
      docker-api (>= 1.26, < 3.0)
-      google-api-client (>= 0.23.9, <= 0.52.0)
-      googleauth (>= 0.6.6, <= 0.14.0)
+      google-api-client (>= 0.23.9, < 0.44.1)
+      googleauth (>= 0.6.6, < 0.13.1)
      inifile (~> 3.0)
-      train-core (= 3.10.1)
+      train-core (= 3.3.27)
      train-winrm (~> 0.2)
-    train-aws (0.2.24)
-      aws-sdk-alexaforbusiness (~> 1.0)
-      aws-sdk-amplify (~> 1.32.0)
+    train-aws (0.1.18)
      aws-sdk-apigateway (~> 1.0)
      aws-sdk-apigatewayv2 (~> 1.0)
-      aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
      aws-sdk-athena (~> 1.0)
-      aws-sdk-autoscaling (>= 1.22, < 1.64)
-      aws-sdk-batch (>= 1.36, < 1.48)
+      aws-sdk-autoscaling (~> 1.22.0)
      aws-sdk-budgets (~> 1.0)
      aws-sdk-cloudformation (~> 1.0)
      aws-sdk-cloudfront (~> 1.0)
@ -546,21 +420,16 @@ GEM
      aws-sdk-cloudhsmv2 (~> 1.0)
      aws-sdk-cloudtrail (~> 1.8)
      aws-sdk-cloudwatch (~> 1.13)
-      aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
      aws-sdk-cloudwatchlogs (~> 1.13)
      aws-sdk-codecommit (~> 1.0)
      aws-sdk-codedeploy (~> 1.0)
      aws-sdk-codepipeline (~> 1.0)
-      aws-sdk-cognitoidentity (>= 1.26, < 1.32)
-      aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54)
      aws-sdk-configservice (~> 1.21)
      aws-sdk-core (~> 3.0)
      aws-sdk-costandusagereportservice (~> 1.6)
-      aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
      aws-sdk-dynamodb (~> 1.31)
      aws-sdk-ec2 (~> 1.70)
      aws-sdk-ecr (~> 1.18)
-      aws-sdk-ecrpublic (~> 1.3)
      aws-sdk-ecs (~> 1.30)
      aws-sdk-efs (~> 1.0)
      aws-sdk-eks (~> 1.9)
@ -569,65 +438,48 @@ GEM
      aws-sdk-elasticloadbalancing (~> 1.8)
      aws-sdk-elasticloadbalancingv2 (~> 1.0)
      aws-sdk-elasticsearchservice (~> 1.0)
-      aws-sdk-emr (~> 1.53.0)
-      aws-sdk-eventbridge (~> 1.24.0)
      aws-sdk-firehose (~> 1.0)
-      aws-sdk-glue (>= 1.71, < 1.89)
      aws-sdk-guardduty (~> 1.31)
      aws-sdk-iam (~> 1.13)
      aws-sdk-kafka (~> 1.0)
      aws-sdk-kinesis (~> 1.0)
      aws-sdk-kms (~> 1.13)
      aws-sdk-lambda (~> 1.0)
-      aws-sdk-mq (~> 1.40.0)
-      aws-sdk-networkfirewall (>= 1.6.0)
-      aws-sdk-networkmanager (>= 1.13.0)
-      aws-sdk-organizations (>= 1.17, < 1.60)
-      aws-sdk-ram (>= 1.21, < 1.27)
+      aws-sdk-organizations (~> 1.17.0)
      aws-sdk-rds (~> 1.43)
      aws-sdk-redshift (~> 1.0)
      aws-sdk-route53 (~> 1.0)
      aws-sdk-route53domains (~> 1.0)
      aws-sdk-route53resolver (~> 1.0)
      aws-sdk-s3 (~> 1.30)
-      aws-sdk-s3control (~> 1.43.0)
-      aws-sdk-secretsmanager (>= 1.42, < 1.47)
      aws-sdk-securityhub (~> 1.0)
-      aws-sdk-servicecatalog (>= 1.48, < 1.61)
-      aws-sdk-ses (~> 1.41.0)
-      aws-sdk-shield (~> 1.30)
-      aws-sdk-signer (~> 1.32.0)
-      aws-sdk-simpledb (~> 1.29.0)
+      aws-sdk-ses (~> 1.0)
      aws-sdk-sms (~> 1.0)
      aws-sdk-sns (~> 1.9)
      aws-sdk-sqs (~> 1.10)
      aws-sdk-ssm (~> 1.0)
-      aws-sdk-states (>= 1.35, < 1.40)
-      aws-sdk-synthetics (~> 1.19.0)
-      aws-sdk-transfer (>= 1.26, < 1.35)
-      aws-sdk-waf (~> 1.43.0)
-    train-core (3.10.1)
+    train-core (3.3.27)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
      mixlib-shellout (>= 2.0, < 4.0)
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
-    train-habitat (0.2.22)
-    train-winrm (0.2.13)
-      winrm (>= 2.3.6, < 3.0)
+    train-habitat (0.2.13)
+    train-winrm (0.2.11)
+      winrm (~> 2.0)
      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
-    tty-box (0.7.0)
+    tty-box (0.6.0)
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-cursor (~> 0.7)
-    tty-color (0.6.0)
+    tty-color (0.5.2)
    tty-cursor (0.7.1)
-    tty-prompt (0.23.1)
+    tty-prompt (0.22.0)
      pastel (~> 0.8)
      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
+    tty-reader (0.8.0)
      tty-cursor (~> 0.7)
      tty-screen (~> 0.8)
      wisper (~> 2.0)
@ -636,15 +488,16 @@ GEM
      pastel (~> 0.8)
      strings (~> 0.2.0)
      tty-screen (~> 0.8)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.2.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
    unicode_utils (1.4.0)
-    winrm (2.3.6)
+    uri_template (0.7.0)
+    winrm (2.3.5)
      builder (>= 2.1.2)
      erubi (~> 1.8)
      gssapi (~> 1.2)
@ -652,15 +505,15 @@ GEM
      httpclient (~> 2.2, >= 2.2.0.2)
      logging (>= 1.6.1, < 3.0)
      nori (~> 2.0)
-      rubyntlm (~> 0.6.0, >= 0.6.3)
-    winrm-elevated (1.2.3)
+      rubyntlm (~> 0.6.0, >= 0.6.1)
+    winrm-elevated (1.2.2)
      erubi (~> 1.8)
      winrm (~> 2.0)
      winrm-fs (~> 1.0)
-    winrm-fs (1.3.5)
+    winrm-fs (1.3.3)
      erubi (~> 1.8)
      logging (>= 1.6.1, < 3.0)
-      rubyzip (~> 2.0)
+      rubyzip (~> 1.1)
      winrm (~> 2.0)
    wisper (2.0.1)

@ -668,11 +521,10 @@ PLATFORMS
  ruby

 DEPENDENCIES
-  inspec!
+  inspec (~> 4.22.22)
  kitchen-docker!
-  kitchen-inspec (>= 2.5.0)
-  kitchen-salt (>= 0.7.2)
-  kitchen-vagrant
+  kitchen-inspec (>= 2.2.1)
+  kitchen-salt (>= 0.6.3)

 BUNDLED WITH
   2.1.2
--- a/bin/kitchen
+++ b/bin/kitchen
@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
    load(bundle_binstub)
  else
    abort(
-      'Your `bin/bundle` was not generated by Bundler, ' \
-      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
+      'Your `bin/bundle` was not generated by Bundler, '\
+      'so this binstub cannot run.  Replace `bin/bundle` by running '\
      '`bundle binstubs bundler --force`, then run this command again.'
    )
  end
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@ -13,197 +13,188 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - Avatar
     - Contributor
     - Contributions
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
     - `@myii <https://github.com/myii>`_
-     - 172
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
+     - 90
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
     - `@gravyboat <https://github.com/gravyboat>`_
     - 52
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
     - 48
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
     - `@alxwr <https://github.com/alxwr>`_
-     - 32
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
+     - 31
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3433835?v=4' width='36' height='36' alt='@n-rodriguez'>`
     - `@n-rodriguez <https://github.com/n-rodriguez>`_
     - 16
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>`
     - `@nmadhok <https://github.com/nmadhok>`_
     - 14
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1184479?v=4' width='36' height='36' alt='@cheuschober'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1184479?v=4' width='36' height='36' alt='@cheuschober'>`
     - `@cheuschober <https://github.com/cheuschober>`_
     - 12
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>`
-     - `@babilen <https://github.com/babilen>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>`
+     - `@babilen5 <https://github.com/babilen5>`_
     - 11
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10924313?v=4' width='36' height='36' alt='@Kurt108'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/10924313?v=4' width='36' height='36' alt='@Kurt108'>`
     - `@Kurt108 <https://github.com/Kurt108>`_
     - 8
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
     - `@javierbertoli <https://github.com/javierbertoli>`_
     - 7
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>`
     - `@whiteinge <https://github.com/whiteinge>`_
     - 7
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1079875?v=4' width='36' height='36' alt='@bogdanr'>`
     - `@bogdanr <https://github.com/bogdanr>`_
     - 7
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>`
     - `@techhat <https://github.com/techhat>`_
     - 6
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
     - `@puneetk <https://github.com/puneetk>`_
     - 6
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/11757928?v=4' width='36' height='36' alt='@pawelrosada'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11757928?v=4' width='36' height='36' alt='@pawelrosada'>`
     - `@pawelrosada <https://github.com/pawelrosada>`_
     - 5
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/197639?v=4' width='36' height='36' alt='@ckng'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/197639?v=4' width='36' height='36' alt='@ckng'>`
     - `@ckng <https://github.com/ckng>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1197993?v=4' width='36' height='36' alt='@danoe'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1197993?v=4' width='36' height='36' alt='@danoe'>`
     - `@danoe <https://github.com/danoe>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/183678?v=4' width='36' height='36' alt='@Seldaek'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/183678?v=4' width='36' height='36' alt='@Seldaek'>`
     - `@Seldaek <https://github.com/Seldaek>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6086064?v=4' width='36' height='36' alt='@mgomersbach'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/6086064?v=4' width='36' height='36' alt='@mgomersbach'>`
     - `@mgomersbach <https://github.com/mgomersbach>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1386595?v=4' width='36' height='36' alt='@tsia'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1386595?v=4' width='36' height='36' alt='@tsia'>`
     - `@tsia <https://github.com/tsia>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5655231?v=4' width='36' height='36' alt='@kpostrup'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/5655231?v=4' width='36' height='36' alt='@kpostrup'>`
     - `@kpostrup <https://github.com/kpostrup>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>`
     - `@ross-p <https://github.com/ross-p>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/38883924?v=4' width='36' height='36' alt='@Ahummeling'>`
-     - `@Ahummeling <https://github.com/Ahummeling>`_
-     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/732321?v=4' width='36' height='36' alt='@gtmanfred'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/732321?v=4' width='36' height='36' alt='@gtmanfred'>`
     - `@gtmanfred <https://github.com/gtmanfred>`_
     - 4
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/214768?v=4' width='36' height='36' alt='@ixs'>`
     - `@ixs <https://github.com/ixs>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurzenika'>`
-     - `@arthurzenika <https://github.com/arthurzenika>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurlogilab'>`
+     - `@arthurlogilab <https://github.com/arthurlogilab>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
-     - `@dafyddj <https://github.com/dafyddj>`_
-     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1194646?v=4' width='36' height='36' alt='@fintanmm'>`
     - `@fintanmm <https://github.com/fintanmm>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>`
     - `@pprkut <https://github.com/pprkut>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3768412?v=4' width='36' height='36' alt='@stp-ip'>`
     - `@stp-ip <https://github.com/stp-ip>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/500703?v=4' width='36' height='36' alt='@retrry'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/500703?v=4' width='36' height='36' alt='@retrry'>`
     - `@retrry <https://github.com/retrry>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3119969?v=4' width='36' height='36' alt='@genuss'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3119969?v=4' width='36' height='36' alt='@genuss'>`
     - `@genuss <https://github.com/genuss>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>`
-     - `@baby-gnu <https://github.com/baby-gnu>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
+     - `@dafyddj <https://github.com/dafyddj>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/94157?v=4' width='36' height='36' alt='@imran1008'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/94157?v=4' width='36' height='36' alt='@imran1008'>`
     - `@imran1008 <https://github.com/imran1008>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/16899663?v=4' width='36' height='36' alt='@Mario-F'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/16899663?v=4' width='36' height='36' alt='@Mario-F'>`
     - `@Mario-F <https://github.com/Mario-F>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/533172?v=4' width='36' height='36' alt='@roock'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/533172?v=4' width='36' height='36' alt='@roock'>`
     - `@roock <https://github.com/roock>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/583677?v=4' width='36' height='36' alt='@hackel'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/583677?v=4' width='36' height='36' alt='@hackel'>`
     - `@hackel <https://github.com/hackel>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/548843?v=4' width='36' height='36' alt='@teohhanhui'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/548843?v=4' width='36' height='36' alt='@teohhanhui'>`
     - `@teohhanhui <https://github.com/teohhanhui>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>`
     - `@thatch45 <https://github.com/thatch45>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>`
     - `@vquiering <https://github.com/vquiering>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/374134?v=4' width='36' height='36' alt='@yellow1912'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/374134?v=4' width='36' height='36' alt='@yellow1912'>`
     - `@yellow1912 <https://github.com/yellow1912>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/551974?v=4' width='36' height='36' alt='@wdalmut'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/551974?v=4' width='36' height='36' alt='@wdalmut'>`
     - `@wdalmut <https://github.com/wdalmut>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3180588?v=4' width='36' height='36' alt='@jeroen92'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3180588?v=4' width='36' height='36' alt='@jeroen92'>`
     - `@jeroen92 <https://github.com/jeroen92>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>`
-     - `@sticky-note <https://github.com/sticky-note>`_
-     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/551789?v=4' width='36' height='36' alt='@giannello'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/551789?v=4' width='36' height='36' alt='@giannello'>`
     - `@giannello <https://github.com/giannello>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20515?v=4' width='36' height='36' alt='@scambra'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/358074?v=4' width='36' height='36' alt='@pcdummy'>`
+     - `@pcdummy <https://github.com/pcdummy>`_
+     - 2
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/20515?v=4' width='36' height='36' alt='@scambra'>`
     - `@scambra <https://github.com/scambra>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3309784?v=4' width='36' height='36' alt='@aidanharris'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/3309784?v=4' width='36' height='36' alt='@aidanharris'>`
     - `@aidanharris <https://github.com/aidanharris>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@sarcastic-coder'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7353491?v=4' width='36' height='36' alt='@sarcastic-coder'>`
     - `@sarcastic-coder <https://github.com/sarcastic-coder>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4754654?v=4' width='36' height='36' alt='@alinefr'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/4754654?v=4' width='36' height='36' alt='@alinefr'>`
     - `@alinefr <https://github.com/alinefr>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/378158?v=4' width='36' height='36' alt='@dseira'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/378158?v=4' width='36' height='36' alt='@dseira'>`
     - `@dseira <https://github.com/dseira>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8737019?v=4' width='36' height='36' alt='@johnccfm'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8737019?v=4' width='36' height='36' alt='@johnccfm'>`
     - `@johnccfm <https://github.com/johnccfm>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
     - `@johnkeates <https://github.com/johnkeates>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/924183?v=4' width='36' height='36' alt='@mschiff'>`
     - `@mschiff <https://github.com/mschiff>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1616654?v=4' width='36' height='36' alt='@mkhubbard'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1616654?v=4' width='36' height='36' alt='@mkhubbard'>`
     - `@mkhubbard <https://github.com/mkhubbard>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5170979?v=4' width='36' height='36' alt='@taion809'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/5170979?v=4' width='36' height='36' alt='@taion809'>`
     - `@taion809 <https://github.com/taion809>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/387511?v=4' width='36' height='36' alt='@philpep'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/387511?v=4' width='36' height='36' alt='@philpep'>`
     - `@philpep <https://github.com/philpep>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/327943?v=4' width='36' height='36' alt='@Cottser'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/327943?v=4' width='36' height='36' alt='@Cottser'>`
     - `@Cottser <https://github.com/Cottser>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/131665?v=4' width='36' height='36' alt='@iamseth'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/131665?v=4' width='36' height='36' alt='@iamseth'>`
     - `@iamseth <https://github.com/iamseth>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/751889?v=4' width='36' height='36' alt='@Yoda-BZH'>`
     - `@Yoda-BZH <https://github.com/Yoda-BZH>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1366252?v=4' width='36' height='36' alt='@zls'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/1366252?v=4' width='36' height='36' alt='@zls'>`
     - `@zls <https://github.com/zls>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
-     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8792243?v=4' width='36' height='36' alt='@sc250024'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/8792243?v=4' width='36' height='36' alt='@sc250024'>`
     - `@sc250024 <https://github.com/sc250024>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10833722?v=4' width='36' height='36' alt='@sylvainfaivre'>`
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/10833722?v=4' width='36' height='36' alt='@sylvainfaivre'>`
     - `@sylvainfaivre <https://github.com/sylvainfaivre>`_
     - 1


 ----

-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-03-14.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-12-16.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@ -2,172 +2,6 @@
 Changelog
 =========

-`1.6.0 <https://github.com/saltstack-formulas/php-formula/compare/v1.5.1...v1.6.0>`_ (2022-03-14)
-----------------------------------------------------------------------------------------------------
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* update linters to latest versions [skip ci] (\ `8befefc <https://github.com/saltstack-formulas/php-formula/commit/8befefcfbe50378691cf199f900cf2ca8ba4339f>`_\ )
-* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `4f54474 <https://github.com/saltstack-formulas/php-formula/commit/4f5447451d28137f488bcb20313d6c30fe3e9dd8>`_\ )
-* **kitchen+ci:** update with ``3004`` pre-salted images/boxes [skip ci] (\ `def6993 <https://github.com/saltstack-formulas/php-formula/commit/def69936b47bfd0e65e521a3b2629b591e2a11ca>`_\ )
-* **kitchen+ci:** update with latest CVE pre-salted images [skip ci] (\ `ded03de <https://github.com/saltstack-formulas/php-formula/commit/ded03de05e777a4c3b0a1aad8de650470c244d6a>`_\ )
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `2e98aed <https://github.com/saltstack-formulas/php-formula/commit/2e98aed831e0adcfdc7f34df7c29529614a4ce0e>`_\ )
-* **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] (\ `4e5af98 <https://github.com/saltstack-formulas/php-formula/commit/4e5af9875abd9e4149db2d3e10c9f6dfcca435f2>`_\ )
-
-Features
-^^^^^^^^
-
-
-* **modules:** add ``xmlrpc`` and ``xmlreader`` as FreeBSD ``xml`` module (\ `67e565f <https://github.com/saltstack-formulas/php-formula/commit/67e565f5e2ce83c26a79267f25317e6e4340a73e>`_\ )
-
-Tests
-^^^^^
-
-
-* **system:** add ``build_platform_codename`` [skip ci] (\ `f159202 <https://github.com/saltstack-formulas/php-formula/commit/f1592024d507873415debcdc03aa2c885af2e4cf>`_\ )
-
-`1.5.1 <https://github.com/saltstack-formulas/php-formula/compare/v1.5.0...v1.5.1>`_ (2021-09-17)
-----------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **module:** include php version in redis module package name (\ `2f62f6f <https://github.com/saltstack-formulas/php-formula/commit/2f62f6fa4edcd660dc6247d11b99e871d963adcb>`_\ )
-* **module:** include php version in redis module package name (\ `55939d5 <https://github.com/saltstack-formulas/php-formula/commit/55939d5cd12cc8e91b5502e7181f8d826464e82d>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **3003.1:** update inc. AlmaLinux, Rocky & ``rst-lint`` [skip ci] (\ `c7a0c3c <https://github.com/saltstack-formulas/php-formula/commit/c7a0c3c3ea73a42a9e4682c204a620a3f7f2f2ee>`_\ )
-* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] (\ `368ca34 <https://github.com/saltstack-formulas/php-formula/commit/368ca34fabc10d7baffb1ea2c047cfe118f0569c>`_\ )
-* **gemfile+lock:** use ``ssf`` customised ``inspec`` repo [skip ci] (\ `fbf2518 <https://github.com/saltstack-formulas/php-formula/commit/fbf25184558f07766b06b946f8af5b742ac7665a>`_\ )
-* **kitchen:** move ``provisioner`` block & update ``run_command`` [skip ci] (\ `9964b38 <https://github.com/saltstack-formulas/php-formula/commit/9964b38aa31fc44742a856bda5cdffd6aeb91a2a>`_\ )
-* **kitchen+ci:** update with latest ``3003.2`` pre-salted images [skip ci] (\ `f8e4ba0 <https://github.com/saltstack-formulas/php-formula/commit/f8e4ba0e88e58c72ed14b8e7cf4143a446fda74b>`_\ )
-* add Debian 11 Bullseye & update ``yamllint`` configuration [skip ci] (\ `c22aba7 <https://github.com/saltstack-formulas/php-formula/commit/c22aba797e7bd02200a7a9d3b13ba95bd2195fca>`_\ )
-* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] (\ `4891bf6 <https://github.com/saltstack-formulas/php-formula/commit/4891bf6e77b90e6ec1a80160f48f86869aa46b88>`_\ )
-
-Tests
-^^^^^
-
-
-* **_mapdata:** add verification file for ``debian-11`` [skip ci] (\ `9b05109 <https://github.com/saltstack-formulas/php-formula/commit/9b05109c28d05ebc11c253eabbd6bb219e7726ff>`_\ )
-* **alma+rocky:** add platforms (based on CentOS 8) [skip ci] (\ `f55d512 <https://github.com/saltstack-formulas/php-formula/commit/f55d5128ab10e9b21bbe315f4588ff13c74de68a>`_\ )
-
-`1.5.0 <https://github.com/saltstack-formulas/php-formula/compare/v1.4.0...v1.5.0>`_ (2021-06-17)
-----------------------------------------------------------------------------------------------------
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* add ``arch-master`` to matrix and update ``.travis.yml`` [skip ci] (\ `6dc94ca <https://github.com/saltstack-formulas/php-formula/commit/6dc94cae109a98e3d317b890bc86c9353a9e6fbe>`_\ )
-* **kitchen+gitlab:** adjust matrix to add ``3003`` [skip ci] (\ `ace2ca9 <https://github.com/saltstack-formulas/php-formula/commit/ace2ca9241698bb9035fbc9df9dc9ffe73a20bed>`_\ )
-* **vagrant:** add FreeBSD 13.0 [skip ci] (\ `378a66a <https://github.com/saltstack-formulas/php-formula/commit/378a66a4bd0e9ee1d50ec3986773d4be930aa822>`_\ )
-* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] (\ `3173cc0 <https://github.com/saltstack-formulas/php-formula/commit/3173cc08511aa99dd645571c9961f097db283e53>`_\ )
-
-Documentation
-^^^^^^^^^^^^^
-
-
-* **readme:** add ``Testing with Vagrant`` section [skip ci] (\ `48a0f1f <https://github.com/saltstack-formulas/php-formula/commit/48a0f1f95ca2fad6bb6c88520642e6815a50357a>`_\ )
-
-Features
-^^^^^^^^
-
-
-* **mods:** add ``bcmath`` module for FreeBSD (\ `6381ad4 <https://github.com/saltstack-formulas/php-formula/commit/6381ad46347862cd3ab78cbedc7cf3b85572d513>`_\ )
-* **mods:** add ``soap`` module for FreeBSD (\ `7eef994 <https://github.com/saltstack-formulas/php-formula/commit/7eef994582ca9ea894368eb37826d9fd3d9cc878>`_\ )
-* **mods:** add ``xsl`` module for FreeBSD (\ `4c9ed02 <https://github.com/saltstack-formulas/php-formula/commit/4c9ed0295ce039ef32a4f881f944f0ac82c108df>`_\ )
-
-Tests
-^^^^^
-
-
-* **_mapdata:** add verification file for ``fedora-34`` [skip ci] (\ `cfa76bd <https://github.com/saltstack-formulas/php-formula/commit/cfa76bdf0442be31ff681dc135fd9b3788232a45>`_\ )
-* **freebsd:** add ``map.jinja`` verification file (for 13.0) (\ `8510473 <https://github.com/saltstack-formulas/php-formula/commit/8510473f36fc8101cb43bf2a2f29fd79a39158f2>`_\ )
-* **mods:** update integration tests accordingly (\ `b776b00 <https://github.com/saltstack-formulas/php-formula/commit/b776b00168497f23f9afd843a442d44773ea19d0>`_\ )
-
-`1.4.0 <https://github.com/saltstack-formulas/php-formula/compare/v1.3.5...v1.4.0>`_ (2021-03-31)
-----------------------------------------------------------------------------------------------------
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* enable Vagrant-based testing using GitHub Actions (\ `a0306ce <https://github.com/saltstack-formulas/php-formula/commit/a0306cee31439cbbe34cdbdef2e26fc597306592>`_\ )
-* **gemfile+lock:** use ``ssf`` customised ``kitchen-docker`` repo [skip ci] (\ `009dab4 <https://github.com/saltstack-formulas/php-formula/commit/009dab4dee008259ca5643da6496bb21d28a13f5>`_\ )
-* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] (\ `e762a51 <https://github.com/saltstack-formulas/php-formula/commit/e762a51387660694b53e5340f808446a6f9d28b7>`_\ )
-* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] (\ `daa4c9e <https://github.com/saltstack-formulas/php-formula/commit/daa4c9ef43da8bbe45d5068c280dbd85cad17809>`_\ )
-* **pre-commit:** update hook for ``rubocop`` [skip ci] (\ `08332f5 <https://github.com/saltstack-formulas/php-formula/commit/08332f5b6f4f69bf4a612289e50772ce93a73e04>`_\ )
-
-Features
-^^^^^^^^
-
-
-* **composer:** make dependencies configurable (\ `d727b15 <https://github.com/saltstack-formulas/php-formula/commit/d727b15557e2223cd82fe5fde0bc16365e20ebb8>`_\ )
-
-Tests
-^^^^^
-
-
-* **freebsd:** add specific tests for FreeBSD (\ `cb2758d <https://github.com/saltstack-formulas/php-formula/commit/cb2758d86e181356c1fbb9a6c5450d22a011418b>`_\ )
-* **pillar:** list PHP versions for FreeBSD 11.4/12.2 (using ``7.4``\ ) (\ `b876d6b <https://github.com/saltstack-formulas/php-formula/commit/b876d6b1f0d1002712dc33c8525bee4622142947>`_\ )
-* standardise use of ``share`` suite & ``_mapdata`` state [skip ci] (\ `bf6a758 <https://github.com/saltstack-formulas/php-formula/commit/bf6a7582b74369935e4a9e1a7291119587eca4ba>`_\ )
-* **_mapdata:** add verification files for new platforms (\ `610cfee <https://github.com/saltstack-formulas/php-formula/commit/610cfee03119cf29958b59edd4880d9200837f67>`_\ )
-* **share:** standardise with latest changes [skip ci] (\ `147c996 <https://github.com/saltstack-formulas/php-formula/commit/147c996a696d8d9ceb409e8497e97a49cbc18d7e>`_\ )
-
-`1.3.5 <https://github.com/saltstack-formulas/php-formula/compare/v1.3.4...v1.3.5>`_ (2021-01-14)
-----------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **_mapdata:** ensure map data is directly under ``values`` (\ `579a613 <https://github.com/saltstack-formulas/php-formula/commit/579a61371a59db75971ecd6e0526125e7388198d>`_\ )
-
-Tests
-^^^^^
-
-
-* **_mapdata:** update for ``_mapdata/init.sls`` change (\ `b30f514 <https://github.com/saltstack-formulas/php-formula/commit/b30f5146d0dcf546d6ce26dcb9eafbc462a00fe0>`_\ )
-
-`1.3.4 <https://github.com/saltstack-formulas/php-formula/compare/v1.3.3...v1.3.4>`_ (2020-12-23)
-----------------------------------------------------------------------------------------------------
-
-Code Refactoring
-^^^^^^^^^^^^^^^^
-
-
-* **map:** use top-level ``values:`` key in ``map.jinja`` dumps (\ `46ad65e <https://github.com/saltstack-formulas/php-formula/commit/46ad65e39eff11eba8bd8dfbfb0a0b52e4e79cfb>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **pre-commit:** enable ``rubocop`` linter after fix (\ `71dbf34 <https://github.com/saltstack-formulas/php-formula/commit/71dbf345d6a5d1701c6012277ae8215d2f7c1dc5>`_\ )
-
-`1.3.3 <https://github.com/saltstack-formulas/php-formula/compare/v1.3.2...v1.3.3>`_ (2020-12-22)
-----------------------------------------------------------------------------------------------------
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `6ea8950 <https://github.com/saltstack-formulas/php-formula/commit/6ea8950307db990b93f6e92dc19108c392a11bea>`_\ )
-* **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `992e934 <https://github.com/saltstack-formulas/php-formula/commit/992e9348c71ff02ada8443751c8423eb7eb83576>`_\ )
-
-Tests
-^^^^^
-
-
-* fix rubocop violations (\ `1a4d208 <https://github.com/saltstack-formulas/php-formula/commit/1a4d20877ce9ff7e5c09ba38ff4ea4b2502e0665>`_\ )
-* **_mapdata:** generate verification files (\ `f88fdf7 <https://github.com/saltstack-formulas/php-formula/commit/f88fdf784ab67ff5083f2e06ee6f5f5aa90b42fb>`_\ )
-* **map:** verify ``map.jinja`` dump using ``_mapdata`` state (\ `e9591db <https://github.com/saltstack-formulas/php-formula/commit/e9591db3551073ad9b7a747b848702dc4f75a22c>`_\ )
-
 `1.3.2 <https://github.com/saltstack-formulas/php-formula/compare/v1.3.1...v1.3.2>`_ (2020-12-16)
 -----------------------------------------------------------------------------------------------------

--- a/docs/README.rst
+++ b/docs/README.rst
@ -140,7 +140,7 @@ Installs the php-cache-lite package.
 ^^^^^^^^^^^^^^

 Installs the php-cgi package.
-Disabled on openSUSE, as there is only php-fastcgi available.
+Disabled on opensuse only php5-fastcgi available.

 ``php.cli``
 ^^^^^^^^^^^^^^
@ -557,11 +557,6 @@ Installs the php-xsl package.

 Installs the php-zip package.

-``php.zlib``
-^^^^^^^^^^^^^^
-
-Installs the php-zlib package.
-
 Testing
 -------

@ -585,7 +580,7 @@ e.g. ``debian-9-2019-2-py3``.
 ``bin/kitchen converge``
 ^^^^^^^^^^^^^^^^^^^^^^^^

-Creates the docker instance and runs the ``php`` main states, ready for testing.
+Creates the docker instance and runs the ``template`` main state, ready for testing.

 ``bin/kitchen verify``
 ^^^^^^^^^^^^^^^^^^^^^^
@ -606,65 +601,3 @@ Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``veri
 ^^^^^^^^^^^^^^^^^^^^^

 Gives you SSH access to the instance for manual testing.
-
-Testing with Vagrant
--------------------
-
-Windows/FreeBSD/OpenBSD testing is done with ``kitchen-salt``.
-
-Requirements
-^^^^^^^^^^^^
-
-* Ruby
-* Virtualbox
-* Vagrant
-
-Setup
-^^^^^
-
-.. code-block:: bash
-
-   $ gem install bundler
-   $ bundle install --with=vagrant
-   $ bin/kitchen test [platform]
-
-Where ``[platform]`` is the platform name defined in ``kitchen.vagrant.yml``,
-e.g. ``windows-81-latest-py3``.
-
-Note
-^^^^
-
-When testing using Vagrant you must set the environment variable ``KITCHEN_LOCAL_YAML`` to ``kitchen.vagrant.yml``.  For example:
-
-.. code-block:: bash
-
-   $ KITCHEN_LOCAL_YAML=kitchen.vagrant.yml bin/kitchen test      # Alternatively,
-   $ export KITCHEN_LOCAL_YAML=kitchen.vagrant.yml
-   $ bin/kitchen test
-
-Then run the following commands as needed.
-
-``bin/kitchen converge``
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-Creates the Vagrant instance and runs the ``php`` main states, ready for testing.
-
-``bin/kitchen verify``
-^^^^^^^^^^^^^^^^^^^^^^
-
-Runs the ``inspec`` tests on the actual instance.
-
-``bin/kitchen destroy``
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Removes the Vagrant instance.
-
-``bin/kitchen test``
-^^^^^^^^^^^^^^^^^^^^
-
-Runs all of the stages above in one go: i.e. ``destroy`` + ``converge`` + ``verify`` + ``destroy``.
-
-``bin/kitchen login``
-^^^^^^^^^^^^^^^^^^^^^
-
-Gives you RDP/SSH access to the instance for manual testing.
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-driver:
-  name: vagrant
-  cache_directory: false
-  customize:
-    usbxhci: 'off'
-  gui: false
-  ssh:
-    shell: /bin/sh
-  linked_clone: true
-  <% unless ENV['CI'] %>
-  synced_folders:
-    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
-      - '/vagrant'
-      - 'create: true, disabled: false'
-  <% end %>
-
-platforms:
-  - name: freebsd-130-master-py3
-    driver:
-      box: myii/freebsd-13.0-master-py3
-  - name: freebsd-123-master-py3
-    driver:
-      box: myii/freebsd-12.3-master-py3
-  - name: freebsd-130-3004-0-py3
-    driver:
-      box: myii/freebsd-13.0-3004.0-py3
-  - name: freebsd-123-3004-0-py3
-    driver:
-      box: myii/freebsd-12.3-3004.0-py3
--- a/kitchen.yml
+++ b/kitchen.yml
@ -6,7 +6,131 @@ driver:
  name: docker
  use_sudo: false
  privileged: true
-  run_command: /usr/lib/systemd/systemd
+  run_command: /lib/systemd/systemd
+
+# Make sure the platforms listed below match up with
+# the `env.matrix` instances defined in `.travis.yml`
+platforms:
+  ## SALT `master`
+  - name: debian-10-master-py3
+    driver:
+      image: saltimages/salt-master-py3:debian-10
+  - name: ubuntu-1804-master-py3
+    driver:
+      image: saltimages/salt-master-py3:ubuntu-18.04
+  - name: centos-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-8
+  - name: fedora-31-master-py3
+    driver:
+      image: saltimages/salt-master-py3:fedora-31
+  - name: opensuse-leap-151-master-py3
+    driver:
+      image: netmanagers/salt-master-py3:opensuse-leap-15.1
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-2-master-py3
+    driver:
+      image: saltimages/salt-master-py3:amazonlinux-2
+
+  ## SALT `2019.2`
+  - name: debian-10-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:debian-10
+  - name: debian-9-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:debian-9
+  - name: ubuntu-1804-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:ubuntu-18.04
+  - name: centos-8-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:centos-8
+  - name: fedora-31-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:fedora-31
+  - name: opensuse-leap-151-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: centos-7-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:centos-7
+  - name: amazonlinux-2-2019-2-py3
+    driver:
+      image: saltimages/salt-2019.2-py3:amazonlinux-2
+  - name: arch-base-latest-2019-2-py2
+    driver:
+      image: saltimages/salt-2019.2-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+
+  ## SALT `2018.3`
+  - name: fedora-30-2018-3-py3
+    driver:
+      image: netmanagers/salt-2018.3-py3:fedora-30
+  - name: debian-9-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:debian-9
+  - name: ubuntu-1604-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
+  - name: centos-7-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:centos-7
+  - name: opensuse-leap-151-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-1-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:amazonlinux-1
+      run_command: /sbin/init
+  - name: arch-base-latest-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+
+  ## SALT `2017.7`
+  - name: debian-8-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:debian-8
+  - name: ubuntu-1604-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:ubuntu-16.04
+  - name: centos-6-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:centos-6
+      run_command: /sbin/init
+  - name: fedora-30-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:fedora-30
+  - name: opensuse-leap-151-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+  - name: amazonlinux-1-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:amazonlinux-1
+      run_command: /sbin/init
+  - name: arch-base-latest-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd

 provisioner:
  name: salt_solo
@ -18,273 +142,26 @@ provisioner:
    - .kitchen
    - .git

-platforms:
-  ## SALT `tiamat`
-  - name: debian-11-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-11
-      run_command: /lib/systemd/systemd
-  - name: debian-10-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-stream8
-  - name: centos-7-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:centos-7
-  - name: amazonlinux-2-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:amazonlinux-2
-  - name: oraclelinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:oraclelinux-8
-  - name: oraclelinux-7-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:oraclelinux-7
-  - name: almalinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:almalinux-8
-  - name: rockylinux-8-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:rockylinux-8
-
-  ## SALT `master`
-  - name: debian-11-master-py3
-    driver:
-      image: saltimages/salt-master-py3:debian-11
-      run_command: /lib/systemd/systemd
-  - name: debian-10-master-py3
-    driver:
-      image: saltimages/salt-master-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-master-py3
-    driver:
-      image: saltimages/salt-master-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:centos-stream8
-  - name: centos-7-master-py3
-    driver:
-      image: saltimages/salt-master-py3:centos-7
-  - name: fedora-36-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-36
-  - name: fedora-35-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-35
-  - name: opensuse-leap-154-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.4
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-2-master-py3
-    driver:
-      image: saltimages/salt-master-py3:amazonlinux-2
-  - name: oraclelinux-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:oraclelinux-8
-  - name: oraclelinux-7-master-py3
-    driver:
-      image: saltimages/salt-master-py3:oraclelinux-7
-  - name: arch-base-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:arch-base-latest
-  - name: gentoo-stage3-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-systemd
-  - name: almalinux-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:almalinux-8
-  - name: rockylinux-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:rockylinux-8
-
-  ## SALT `3004.1`
-  - name: debian-11-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:debian-11
-      run_command: /lib/systemd/systemd
-  - name: debian-10-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: centos-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:centos-7
-  - name: fedora-36-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: fedora-35-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: amazonlinux-2-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-7
-  - name: arch-base-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:almalinux-8
-  - name: rockylinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:rockylinux-8
-
-  ## SALT `3004.0`
-  - name: opensuse-leap-154-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-
-  ## SALT `3003.4`
-  - name: debian-10-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-7-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:centos-7
-  - name: amazonlinux-2-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-7
-  - name: almalinux-8-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:almalinux-8
-
 verifier:
  # https://www.inspec.io/
  name: inspec
  sudo: true
+  # cli, documentation, html, progress, json, json-min, json-rspec, junit
  reporter:
-    # cli, documentation, html, progress, json, json-min, json-rspec, junit
    - cli

 suites:
  - name: debian
    includes:
-      - debian-11-tiamat-py3
-      - debian-10-tiamat-py3
-      - debian-9-tiamat-py3
-      - debian-11-master-py3
      - debian-10-master-py3
-      - debian-9-master-py3
-      - debian-11-3004-1-py3
-      - debian-10-3004-1-py3
-      - debian-9-3004-1-py3
-      - debian-10-3003-4-py3
-      - debian-9-3003-4-py3
+      - debian-10-2019-2-py3
+      - debian-9-2019-2-py3
+      - debian-9-2018-3-py2
+      - debian-8-2017-7-py2
    provisioner:
      state_top:
        base:
          '*':
-            - php._mapdata
            - php.repo
            - php.fpm.install
            - php.fpm.config
@ -303,22 +180,14 @@ suites:
        - path: test/integration/default
  - name: ubuntu
    includes:
-      - ubuntu-2204-tiamat-py3
-      - ubuntu-2004-tiamat-py3
-      - ubuntu-1804-tiamat-py3
-      - ubuntu-2204-master-py3
-      - ubuntu-2004-master-py3
      - ubuntu-1804-master-py3
-      - ubuntu-2204-3004-1-py3
-      - ubuntu-2004-3004-1-py3
-      - ubuntu-1804-3004-1-py3
-      - ubuntu-2004-3003-4-py3
-      - ubuntu-1804-3003-4-py3
+      - ubuntu-1804-2019-2-py3
+      - ubuntu-1604-2018-3-py2
+      - ubuntu-1604-2017-7-py2
    provisioner:
      state_top:
        base:
          '*':
-            - php._mapdata
            - php.repo
            - php.fpm.install
            - php.fpm.config
@ -339,42 +208,23 @@ suites:
        - path: test/integration/default
  - name: redhat
    includes:
-      - centos-stream8-tiamat-py3
-      - centos-7-tiamat-py3
-      - amazonlinux-2-tiamat-py3
-      - oraclelinux-8-tiamat-py3
-      - oraclelinux-7-tiamat-py3
-      - almalinux-8-tiamat-py3
-      - rockylinux-8-tiamat-py3
-      - centos-stream8-master-py3
-      - centos-7-master-py3
-      - fedora-36-master-py3
-      - fedora-35-master-py3
+      - centos-8-master-py3
+      - fedora-31-master-py3
      - amazonlinux-2-master-py3
-      - oraclelinux-8-master-py3
-      - oraclelinux-7-master-py3
-      - almalinux-8-master-py3
-      - rockylinux-8-master-py3
-      - centos-stream8-3004-1-py3
-      - centos-7-3004-1-py3
-      - fedora-36-3004-1-py3
-      - fedora-35-3004-1-py3
-      - amazonlinux-2-3004-1-py3
-      - oraclelinux-8-3004-1-py3
-      - oraclelinux-7-3004-1-py3
-      - almalinux-8-3004-1-py3
-      - rockylinux-8-3004-1-py3
-      - centos-stream8-3003-4-py3
-      - centos-7-3003-4-py3
-      - amazonlinux-2-3003-4-py3
-      - oraclelinux-8-3003-4-py3
-      - oraclelinux-7-3003-4-py3
-      - almalinux-8-3003-4-py3
+      - centos-8-2019-2-py3
+      - fedora-31-2019-2-py3
+      - amazonlinux-2-2019-2-py3
+      - centos-7-2019-2-py2
+      - fedora-30-2018-3-py3
+      - centos-7-2018-3-py2
+      - amazonlinux-1-2018-3-py2
+      - centos-6-2017-7-py2
+      - fedora-30-2017-7-py2
+      - amazonlinux-1-2017-7-py2
    provisioner:
      state_top:
        base:
          '*':
-            - php._mapdata
            - php
      pillars:
        top.sls:
@ -388,15 +238,14 @@ suites:
        - path: test/integration/default
  - name: suse
    includes:
-      - opensuse-leap-154-master-py3
-      - opensuse-tmbl-latest-master-py3
-      - opensuse-leap-154-3004-0-py3
-      - opensuse-tmbl-latest-3004-0-py3
+      - opensuse-leap-151-master-py3
+      - opensuse-leap-151-2019-2-py3
+      - opensuse-leap-151-2018-3-py2
+      - opensuse-leap-151-2017-7-py2
    provisioner:
      state_top:
        base:
          '*':
-            - php._mapdata
            - php
      pillars:
        top.sls:
@ -408,25 +257,3 @@ suites:
    verifier:
      inspec_tests:
        - path: test/integration/default
-  - name: freebsd
-    includes:
-      - freebsd-130-master-py3
-      - freebsd-123-master-py3
-      - freebsd-130-3004-0-py3
-      - freebsd-123-3004-0-py3
-    provisioner:
-      state_top:
-        base:
-          '*':
-            - php._mapdata
-            - php.composer
-      pillars:
-        top.sls:
-          base:
-            '*':
-              - php
-      pillars_from_files:
-        php.sls: test/salt/pillar/freebsd.sls
-    verifier:
-      inspec_tests:
-        - path: test/integration/default
--- a/php/_mapdata/_mapdata.jinja
+++ b/php/_mapdata/_mapdata.jinja
@ -1,13 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# {{ grains.get("osfinger", grains.os) }}
---
-{#- use salt.slsutil.serialize to avoid encoding errors on some platforms #}
-{{ salt["slsutil.serialize"](
-     "yaml",
-     map,
-     default_flow_style=False,
-     allow_unicode=True,
-   )
-   | regex_replace("^\s+'$", "'", multiline=True)
-   | trim
-}}
--- a/php/_mapdata/init.sls
+++ b/php/_mapdata/init.sls
@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=sls
---
-{#- Get the `tplroot` from `tpldir` #}
-{%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/map.jinja" import php with context %}
-
-{%- set _mapdata = {
-      "values": php,
-    } %}
-{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
-
-{%- set output_dir = "/temp" if grains.os_family == "Windows" else "/tmp" %}
-{%- set output_file = output_dir ~ "/salt_mapdata_dump.yaml" %}
-
-{{ tplroot }}-mapdata-dump:
-  file.managed:
-    - name: {{ output_file }}
-    - source: salt://{{ tplroot }}/_mapdata/_mapdata.jinja
-    - template: jinja
-    - context:
-        map: {{ _mapdata | yaml }}
--- a/php/composer.sls
+++ b/php/composer.sls
@ -12,9 +12,14 @@

 include:
  - php
-{%- for module in php.lookup.get('composer', {}).get('required_modules', []) %}
-  - php.{{ module }}
-{%- endfor %}
+{% if grains['os_family'] == 'FreeBSD' %}
+  - php.filter
+  - php.hash
+  - php.json
+  - php.mbstring
+  - php.openssl
+  - php.phar
+{% endif %}

 get-composer:
  file.managed:
@ -45,9 +50,9 @@ update-composer:
  cmd.run:
    - name: "{{ install_file }} selfupdate"
 {% if grains['os_family'] == 'FreeBSD' %}
-    - unless: test $(date -v+60d -j -f "%Y-%m-%d %H:%M:%S" "$({{ install_file }} --version --no-interaction | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
+    - unless: test $(date -v+60d -j -f "%Y-%m-%d %H:%M:%S" "$({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
 {% else %}
-    - unless: test $(date -d "60 days $({{ install_file }} --version --no-interaction | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
+    - unless: test $(date -d "60 days $({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
 {% endif %}
    - cwd: {{ php.lookup.pkgs.local_bin }}
    - env:
--- a/php/fpm/config.sls
+++ b/php/fpm/config.sls
@ -56,16 +56,12 @@ php_fpm_conf_config_{{ version }}:
 {%- set conf_settings = php.lookup.fpm.defaults %}
 {%- do conf_settings.update(php.fpm.config.conf.settings) %}

-{#-
-  FIX-LIBERTACASA: prevent conflicts with packaged PHP INI configurations, to-do: solve in default map instead:
-  https://github.com/saltstack-formulas/php-formula/pull/238#issuecomment-1445219305
 php_fpm_ini_config:
  {{ php_ini(php.lookup.fpm.ini,
             'php_fpm_ini_config',
             php.fpm.config.ini.opts,
             ini_settings
  ) }}
-#}

 php_fpm_conf_config:
  {{ php_ini(php.lookup.fpm.conf,
--- a/php/fpm/init.sls
+++ b/php/fpm/init.sls
@ -36,15 +36,15 @@ extend:
  php_fpm_service:
    service:
      - watch:
-#        - file: php_fpm_ini_config
+        - file: php_fpm_ini_config
        - file: php_fpm_conf_config
      - require:
        - sls: php.fpm.config

-#  php_fpm_ini_config:
-#    file:
-#      - require:
-#        - pkg: php_install_fpm
+  php_fpm_ini_config:
+    file:
+      - require:
+        - pkg: php_install_fpm

  php_fpm_conf_config:
    file:
--- a/php/map.jinja
+++ b/php/map.jinja
@ -79,7 +79,7 @@
                            'phpenmod_command': 'phpenmod -v' + php_version,
                            'pspell': 'php' + php_version + '-pspell',
                            'readline': 'php' + php_version + '-readline',
-                            'redis': 'php' + php_version + '-redis',
+                            'redis': 'php-redis',
                            'seclib': ['php-phpseclib', 'php-seclib'],
                            'snmp': 'php' + php_version + '-snmp',
                            'soap': 'php' + php_version + '-soap',
@ -772,7 +772,7 @@
                            'php': 'php',
                            'phpenmod_command': 'phpenmod',
                            'pspell': 'php-pspell',
-                            'redis': 'php' + php_version + '-redis',
+                            'redis': 'php-redis',
                            'seclib': ['php-phpseclib', 'php-seclib'],
                            'snmp': 'php-snmp',
                            'soap': 'php-soap',
@ -1165,7 +1165,7 @@
                            'php': 'php',
                            'phpenmod_command': 'phpenmod',
                            'pspell': 'php-pspell',
-                            'redis': 'php' + php_version + '-redis',
+                            'redis': 'php-redis',
                            'seclib': ['php-phpseclib', 'php-seclib'],
                            'snmp': 'php-snmp',
                            'soap': 'php-soap',
@ -1558,7 +1558,7 @@
                            'php': 'php',
                            'phpenmod_command': 'phpenmod',
                            'pspell': 'php-pspell',
-                            'redis': 'php' + php_version + '-redis',
+                            'redis': 'php-redis',
                            'seclib': ['php-phpseclib', 'php-seclib'],
                            'snmp': 'php-snmp',
                            'soap': 'php-soap',
@ -2387,7 +2387,7 @@
                            'phpenmod_command': 'phpenmod -v' + php_version,
                            'pspell': 'php' + php_version + '-pspell',
                            'readline': 'php' + php_version + '-readline',
-                            'redis': 'php' + php_version + '-redis',
+                            'redis': 'php-redis',
                            'seclib': ['php-phpseclib', 'php-seclib'],
                            'snmp': 'php' + php_version + '-snmp',
                            'soap': 'php' + php_version + '-soap',
@ -3000,43 +3000,47 @@
            },
            'Suse': {
                'pkgs': {
-                    'adodb': 'php8-dba',
-                    'apache2': 'apache2-mod_php8',
-                    'cli': 'php8',
-                    'curl': 'php8-curl',
-                    'fpm': 'php8-fpm',
-                    'gd': 'php8-gd',
-                    'imap': 'php8-imap',
-                    'intl': 'php8-intl',
-                    'json': 'php8-json',
-                    'ldap': 'php8-ldap',
-                    'mbstring': 'php8-mbstring',
-                    'mcrypt': 'php8-mcrypt',
-                    'mysql': 'php8-mysql',
-                    'oauth': 'php8-oauth',
-                    'pear': 'php8-pear',
-                    'pgsql': 'php8-pgsql',
-                    'php': 'php8',
-                    'snmp': 'php8-snmp',
-                    'soap': 'php8-soap',
-                    'sqlite': 'php8-sqlite',
-                    'suhosin': 'php8-suhosin',
-                    'xml': ['php8-xmlreader','php8-xmlwriter','php8-xmlrpc'],
-                    'zip': 'php8-zip',
+                    'adodb': 'php5-dba',
+                    'apache2': 'apache2-mod_php5',
+                    'cli': 'php5',
+                    'curl': 'php5-curl',
+                    'fpm': 'php5-fpm',
+                    'gd': 'php5-gd',
+                    'imap': 'php5-imap',
+                    'intl': 'php5-intl',
+                    'json': 'php5-json',
+                    'ldap': 'php5-ldap',
+                    'mbstring': 'php5-mbstring',
+                    'mcrypt': 'php5-mcrypt',
+                    'mysql': 'php5-mysql',
+                    'oauth': 'php5-oauth',
+                    'pear': 'php5-pear',
+                    'pgsql': 'php5-pgsql',
+                    'php': 'php5',
+                    'snmp': 'php5-snmp',
+                    'soap': 'php5-soap',
+                    'sqlite': 'php5-sqlite',
+                    'suhosin': 'php5-suhosin',
+                    'xml': ['php5-xmlreader','php5-xmlwriter','php5-xmlrpc'],
+                    'zip': 'php5-zip',
                },
                'fpm': {
-                    'conf': '/etc/php8/fpm/php-fpm.conf',
-                    'ini': '/etc/php8/conf.d/salt.ini',
-                    'pools': '/etc/php8/fpm/php-fpm.d',
+                    'conf': '/etc/php-fpm.conf',
+                    'ini': '/etc/php.ini',
+                    'pools': '/etc/php-fpm.d',
                    'service': 'php-fpm',
                    'user': 'root',
                    'group': 'root',
                    'defaults': {
-                        'include': '/etc/php8/fpm/php-fpm.d/*.conf',
+                        'global': {
+                            'pid': '/var/run/php-fpm/php-fpm.pid',
+                            'error_log': '/var/log/php-fpm/error.log',
+                        },
+                        'include': '/etc/php-fpm.d/*.conf',
                    },
                },
                'cli': {
-                    'ini': '/etc/php8/cli/php.ini',
+                    'ini': '/etc/php.ini',
                },
            },
            'Arch': {
@ -3098,18 +3102,8 @@
                'cli': {
                    'ini': '/usr/local/etc/php.ini'
                },
-                'composer': {
-                    'required_modules': [
-                      'filter',
-                      'json',
-                      'mbstring',
-                      'openssl',
-                      'phar',
-                    ],
-                },
                'pkgs': {
                    'apache2': 'mod_php' + freebsd_php_version,
-                    'bcmath': 'php' + freebsd_php_version + '-bcmath',
                    'composer_bin': 'composer',
                    'cli': 'php' + freebsd_php_version,
                    'ctype': 'php' + freebsd_php_version + '-ctype',
@ -3118,15 +3112,11 @@
                    'filter': 'php' + freebsd_php_version + '-filter',
                    'fileinfo': 'php' + freebsd_php_version + '-fileinfo',
                    'fpm': 'php' + freebsd_php_version,
-                    'gettext': 'php' + freebsd_php_version + '-gettext',
                    'gd': 'php' + freebsd_php_version + '-gd',
                    'hash': 'php' + freebsd_php_version + '-hash',
                    'iconv': 'php' + freebsd_php_version + '-iconv',
-                    'imagick': 'php' + freebsd_php_version + '-pecl-imagick',
-                    'imap': 'php' + freebsd_php_version + '-imap',
                    'intl': 'php' + freebsd_php_version + '-intl',
                    'json': 'php' + freebsd_php_version + '-json',
-                    'ldap': 'php' + freebsd_php_version + '-ldap',
                    'local_bin': '/usr/local/bin',
                    'memcached': 'php' + freebsd_php_version + '-pecl-memcached',
                    'mbstring': 'php' + freebsd_php_version + '-mbstring',
@ -3143,15 +3133,12 @@
                    'session': 'php' + freebsd_php_version + '-session',
                    'simplexml': 'php' + freebsd_php_version + '-simplexml',
                    'snmp': 'php' + freebsd_php_version + '-snmp',
-                    'soap': 'php' + freebsd_php_version + '-soap',
                    'temp_dir': '/tmp',
                    'tokenizer': 'php' + freebsd_php_version + '-tokenizer',
                    'xdebug': 'php' + freebsd_php_version + '-pecl-xdebug',
-                    'xml': ['php' + freebsd_php_version + '-xml','php' + freebsd_php_version + '-xmlreader','php' + freebsd_php_version + '-xmlrpc'],
+                    'xml': 'php' + freebsd_php_version + '-xml',
                    'xmlwriter': 'php' + freebsd_php_version + '-xmlwriter',
-                    'xsl': 'php' + freebsd_php_version + '-xsl',
                    'zip': 'php' + freebsd_php_version + '-zip',
-                    'zlib': 'php' + freebsd_php_version + '-zlib',
                },
                'fpm': {
                    'conf': '/usr/local/etc/php-fpm.conf',
--- a/php/zlib.sls
+++ b/php/zlib.sls
@ -1,2 +0,0 @@
-{% set state = 'zlib' %}
-{% include "php/installed.jinja" %}
--- a/pillar.example
+++ b/pillar.example
@ -74,16 +74,6 @@ php:
    cli:
      ini: /location/of/php-cli/php.ini

-    # php.composer
-    # Some OS need modules to be installed
-    composer:
-      required_modules:
-        - filter
-        - json
-        - mbstring
-        - openssl
-        - phar
-
  # php-fpm settings
  fpm:

--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA


 ###############################################################################
-# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst`
+# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
 ###############################################################################

-# Install `m2r2`
-pip3 install m2r2
+# Install `m2r`
+pip3 install m2r

 # Copy and then convert the `.md` docs
 cp ./*.md docs/
 cd docs/ || exit
-m2r2 --overwrite ./*.md
+m2r --overwrite ./*.md

 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
--- a/test/integration/default/controls/_mapdata.rb
+++ b/test/integration/default/controls/_mapdata.rb
@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-control 'php._mapdata' do
-  title '`map.jinja` should match the reference file'
-
-  ### Method
-  # The steps below for each file appear convoluted but they are both required
-  # and similar in nature:
-  # 1. The earliest method was to simply compare the files textually but this often
-  #    led to false positives due to inconsistencies (e.g. spacing, ordering)
-  # 2. The next method was to load the files back into YAML structures and then
-  #    compare but InSpec provided block diffs this way, unusable by end users
-  # 3. The final step was to dump the YAML structures back into a string to use
-  #    for the comparison; this both worked and provided human-friendly diffs
-
-  ### Comparison file for the specific platform
-  ### Static, adjusted as part of code contributions, as map data is changed
-  # Strip the `platform[:finger]` version number down to the "OS major release"
-  platform_finger = system.platform[:finger].split('.').first.to_s
-  # Use that to set the path to the file (relative to the InSpec suite directory)
-  mapdata_file_path = "_mapdata/#{platform_finger}.yaml"
-  # Load the mapdata from profile, into a YAML structure
-  # https://docs.chef.io/inspec/profiles/#profile-files
-  mapdata_file_yaml = YAML.load(inspec.profile.file(mapdata_file_path))
-  # Dump the YAML back into a string for comparison
-  mapdata_file_dump = YAML.dump(mapdata_file_yaml)
-
-  ### Output file produced by running the `_mapdata` state
-  ### Dynamic, generated during Kitchen's `converge` phase
-  # Derive the location of the dumped mapdata (differs for Windows)
-  output_dir = platform[:family] == 'windows' ? '/temp' : '/tmp'
-  # Use that to set the path to the file (absolute path, i.e. within the container)
-  output_file_path = "#{output_dir}/salt_mapdata_dump.yaml"
-  # Load the output into a YAML structure using InSpec's `yaml` resource
-  # https://github.com/inspec/inspec/blob/49b7d10/lib/inspec/resources/yaml.rb#L29
-  output_file_yaml = yaml(output_file_path).params
-  # Dump the YAML back into a string for comparison
-  output_file_dump = YAML.dump(output_file_yaml)
-
-  describe 'File content' do
-    it 'should match profile map data exactly' do
-      expect(output_file_dump).to eq(mapdata_file_dump)
-    end
-  end
-end
--- a/test/integration/default/controls/config_spec.rb
+++ b/test/integration/default/controls/config_spec.rb
@ -1,9 +1,6 @@
-# frozen_string_literal: true
-
 control 'Php configuration' do
  title 'should match desired lines'

-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
  def test_debian
    describe file('/etc/php/5.6/fpm/pool.d/radius-admin.conf') do
      its('content') { should include '[radius-admin]' }
@ -23,19 +20,11 @@ control 'Php configuration' do
      its('content') { should include 'date.timezone = Europe/Paris' }
    end
  end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

-  def test_redhat; end
+  def test_redhat
+  end

-  def test_suse; end
-
-  def test_bsd
-    describe file('/usr/local/bin/composer') do
-      it { should be_file }
-      it { should be_owned_by 'root' }
-      it { should be_grouped_into 'wheel' }
-      its('mode') { should cmp '0755' }
-    end
+  def test_suse
  end

  case os[:family]
@ -45,7 +34,5 @@ control 'Php configuration' do
    test_redhat
  when 'suse'
    test_suse
-  when 'bsd'
-    test_bsd
  end
 end
--- a/test/integration/default/controls/package_spec.rb
+++ b/test/integration/default/controls/package_spec.rb
@ -1,22 +1,24 @@
-# frozen_string_literal: true
-
 control 'Php package' do
  title 'should be installed'

-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
  def test_debian
    describe package('php-imagick') do
      it { should be_installed }
    end

+    describe package('php-redis') do
+      it { should be_installed }
+    end
+
    describe package('php-xdebug') do
      it { should be_installed }
    end

    %w[
      bz2 cli curl fpm gd imap intl mbstring
-      mysql readline redis xml zip
+      mysql readline xml zip
    ].each do |pkg|
+
      describe package("php5.6-#{pkg}") do
        it { should be_installed }
      end
@ -26,7 +28,6 @@ control 'Php package' do
      end
    end
  end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize

  def test_redhat
    describe package('php') do
@ -35,21 +36,11 @@ control 'Php package' do
  end

  def test_suse
-    describe package('php8') do
+    describe package('php7') do
      it { should be_installed }
    end
  end

-  def test_bsd
-    %w[
-      php74 php74-filter php74-json php74-mbstring php74-openssl php74-phar
-    ].each do |pkg|
-      describe package(pkg) do
-        it { should be_installed }
-      end
-    end
-  end
-
  case os[:family]
  when 'debian'
    test_debian
@ -57,7 +48,5 @@ control 'Php package' do
    test_redhat
  when 'suse'
    test_suse
-  when 'bsd'
-    test_bsd
  end
 end
--- a/test/integration/default/controls/service_spec.rb
+++ b/test/integration/default/controls/service_spec.rb
@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 control 'Php service' do
  title 'should be running and enabled'

@ -15,11 +13,11 @@ control 'Php service' do
    end
  end

-  def test_redhat; end
+  def test_redhat
+  end

-  def test_suse; end
-
-  def test_bsd; end
+  def test_suse
+  end

  case os[:family]
  when 'debian'
@ -28,7 +26,5 @@ control 'Php service' do
    test_redhat
  when 'suse'
    test_suse
-  when 'bsd'
-    test_bsd
  end
 end
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# AlmaLinux-8
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Amazon Linux AMI-2018
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Amazon Linux-2
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# CentOS Linux-7
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# CentOS Linux-8
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@ -1,391 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Debian-10
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /var/run/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      igbinary: php-igbinary
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      msgpack: php-msgpack
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury repo
-    key_url: https://packages.sury.org/php/apt.gpg
-    name: deb https://packages.sury.org/php/ buster main
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@ -1,391 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Debian-11
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /var/run/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      igbinary: php-igbinary
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      msgpack: php-msgpack
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury repo
-    key_url: https://packages.sury.org/php/apt.gpg
-    name: deb https://packages.sury.org/php/ bullseye main
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@ -1,391 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Debian-9
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /var/run/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      igbinary: php-igbinary
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      msgpack: php-msgpack
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury repo
-    key_url: https://packages.sury.org/php/apt.gpg
-    name: deb https://packages.sury.org/php/ stretch main
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/files/_mapdata/fedora-30.yaml
+++ b/test/integration/default/files/_mapdata/fedora-30.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-30
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-31
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-32
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-33
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-34
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-35
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-36
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/freebsd-11.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-11.yaml
@ -1,305 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# FreeBSD-11
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /usr/local/etc/php.ini
-      module_config: /usr/local/etc/apache24/modules.d/050_mod_php.conf
-      name: apache24
-    cli:
-      ini: /usr/local/etc/php.ini
-    composer:
-      required_modules:
-      - filter
-      - json
-      - mbstring
-      - openssl
-      - phar
-    fpm:
-      conf: /usr/local/etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: log/php-fpm.log
-          pid: run/php-fpm.pid
-        include: /usr/local/etc/php-fpm.d/*.conf
-      group: wheel
-      ini: /usr/local/etc/php.ini
-      pools: /usr/local/etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      apache2: mod_php74
-      bcmath: php74-bcmath
-      cli: php74
-      composer_bin: composer
-      ctype: php74-ctype
-      curl: php74-curl
-      dom: php74-dom
-      fileinfo: php74-fileinfo
-      filter: php74-filter
-      fpm: php74
-      gd: php74-gd
-      hash: php74-hash
-      iconv: php74-iconv
-      intl: php74-intl
-      json: php74-json
-      local_bin: /usr/local/bin
-      mbstring: php74-mbstring
-      mcrypt: php74-mcrypt
-      memcached: php74-pecl-memcached
-      mysql: php74-mysqli
-      opcache: php74-opcache
-      openssl: php74-openssl
-      pdo: php74-pdo
-      pdo_mysql: php74-pdo_mysql
-      pear: php74-pear
-      phar: php74-phar
-      php: php74
-      posix: php74-posix
-      session: php74-session
-      simplexml: php74-simplexml
-      snmp: php74-snmp
-      soap: php74-soap
-      temp_dir: /tmp
-      tokenizer: php74-tokenizer
-      xdebug: php74-pecl-xdebug
-      xml: php74-xml
-      xmlwriter: php74-xmlwriter
-      xsl: php74-xsl
-      zip: php74-zip
-  version:
-  - '7.4'
-  - '8.0'
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-12.yaml
@ -1,313 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# FreeBSD-12
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /usr/local/etc/php.ini
-      module_config: /usr/local/etc/apache24/modules.d/050_mod_php.conf
-      name: apache24
-    cli:
-      ini: /usr/local/etc/php.ini
-    composer:
-      required_modules:
-      - filter
-      - json
-      - mbstring
-      - openssl
-      - phar
-    fpm:
-      conf: /usr/local/etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: log/php-fpm.log
-          pid: run/php-fpm.pid
-        include: /usr/local/etc/php-fpm.d/*.conf
-      group: wheel
-      ini: /usr/local/etc/php.ini
-      pools: /usr/local/etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      apache2: mod_php74
-      bcmath: php74-bcmath
-      cli: php74
-      composer_bin: composer
-      ctype: php74-ctype
-      curl: php74-curl
-      dom: php74-dom
-      fileinfo: php74-fileinfo
-      filter: php74-filter
-      fpm: php74
-      gd: php74-gd
-      gettext: php74-gettext
-      hash: php74-hash
-      iconv: php74-iconv
-      imagick: php74-pecl-imagick
-      imap: php74-imap
-      intl: php74-intl
-      json: php74-json
-      ldap: php74-ldap
-      local_bin: /usr/local/bin
-      mbstring: php74-mbstring
-      mcrypt: php74-mcrypt
-      memcached: php74-pecl-memcached
-      mysql: php74-mysqli
-      opcache: php74-opcache
-      openssl: php74-openssl
-      pdo: php74-pdo
-      pdo_mysql: php74-pdo_mysql
-      pear: php74-pear
-      phar: php74-phar
-      php: php74
-      posix: php74-posix
-      session: php74-session
-      simplexml: php74-simplexml
-      snmp: php74-snmp
-      soap: php74-soap
-      temp_dir: /tmp
-      tokenizer: php74-tokenizer
-      xdebug: php74-pecl-xdebug
-      xml:
-      - php74-xml
-      - php74-xmlreader
-      - php74-xmlrpc
-      xmlwriter: php74-xmlwriter
-      xsl: php74-xsl
-      zip: php74-zip
-      zlib: php74-zlib
-  version:
-  - '7.4'
-  - '8.0'
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/freebsd-13.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-13.yaml
@ -1,313 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# FreeBSD-13
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /usr/local/etc/php.ini
-      module_config: /usr/local/etc/apache24/modules.d/050_mod_php.conf
-      name: apache24
-    cli:
-      ini: /usr/local/etc/php.ini
-    composer:
-      required_modules:
-      - filter
-      - json
-      - mbstring
-      - openssl
-      - phar
-    fpm:
-      conf: /usr/local/etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: log/php-fpm.log
-          pid: run/php-fpm.pid
-        include: /usr/local/etc/php-fpm.d/*.conf
-      group: wheel
-      ini: /usr/local/etc/php.ini
-      pools: /usr/local/etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      apache2: mod_php74
-      bcmath: php74-bcmath
-      cli: php74
-      composer_bin: composer
-      ctype: php74-ctype
-      curl: php74-curl
-      dom: php74-dom
-      fileinfo: php74-fileinfo
-      filter: php74-filter
-      fpm: php74
-      gd: php74-gd
-      gettext: php74-gettext
-      hash: php74-hash
-      iconv: php74-iconv
-      imagick: php74-pecl-imagick
-      imap: php74-imap
-      intl: php74-intl
-      json: php74-json
-      ldap: php74-ldap
-      local_bin: /usr/local/bin
-      mbstring: php74-mbstring
-      mcrypt: php74-mcrypt
-      memcached: php74-pecl-memcached
-      mysql: php74-mysqli
-      opcache: php74-opcache
-      openssl: php74-openssl
-      pdo: php74-pdo
-      pdo_mysql: php74-pdo_mysql
-      pear: php74-pear
-      phar: php74-phar
-      php: php74
-      posix: php74-posix
-      session: php74-session
-      simplexml: php74-simplexml
-      snmp: php74-snmp
-      soap: php74-soap
-      temp_dir: /tmp
-      tokenizer: php74-tokenizer
-      xdebug: php74-pecl-xdebug
-      xml:
-      - php74-xml
-      - php74-xmlreader
-      - php74-xmlrpc
-      xmlwriter: php74-xmlwriter
-      xsl: php74-xsl
-      zip: php74-zip
-      zlib: php74-zlib
-  version:
-  - '7.4'
-  - '8.0'
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@ -1,275 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Leap-15
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php8/cli/php.ini
-    fpm:
-      conf: /etc/php8/fpm/php-fpm.conf
-      defaults:
-        include: /etc/php8/fpm/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php8/conf.d/salt.ini
-      pools: /etc/php8/fpm/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php8-dba
-      apache2: apache2-mod_php8
-      cli: php8
-      curl: php8-curl
-      fpm: php8-fpm
-      gd: php8-gd
-      imap: php8-imap
-      intl: php8-intl
-      json: php8-json
-      ldap: php8-ldap
-      mbstring: php8-mbstring
-      mcrypt: php8-mcrypt
-      mysql: php8-mysql
-      oauth: php8-oauth
-      pear: php8-pear
-      pgsql: php8-pgsql
-      php: php8
-      snmp: php8-snmp
-      soap: php8-soap
-      sqlite: php8-sqlite
-      suhosin: php8-suhosin
-      xml:
-      - php8-xmlreader
-      - php8-xmlwriter
-      - php8-xmlrpc
-      zip: php8-zip
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@ -1,275 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# openSUSE Tumbleweed-yyyymmdd
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php8/cli/php.ini
-    fpm:
-      conf: /etc/php8/fpm/php-fpm.conf
-      defaults:
-        include: /etc/php8/fpm/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php8/conf.d/salt.ini
-      pools: /etc/php8/fpm/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php8-dba
-      apache2: apache2-mod_php8
-      cli: php8
-      curl: php8-curl
-      fpm: php8-fpm
-      gd: php8-gd
-      imap: php8-imap
-      intl: php8-intl
-      json: php8-json
-      ldap: php8-ldap
-      mbstring: php8-mbstring
-      mcrypt: php8-mcrypt
-      mysql: php8-mysql
-      oauth: php8-oauth
-      pear: php8-pear
-      pgsql: php8-pgsql
-      php: php8
-      snmp: php8-snmp
-      soap: php8-soap
-      sqlite: php8-sqlite
-      suhosin: php8-suhosin
-      xml:
-      - php8-xmlreader
-      - php8-xmlwriter
-      - php8-xmlrpc
-      zip: php8-zip
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Oracle Linux Server-7
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Oracle Linux Server-8
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@ -1,324 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Rocky Linux-8
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings: {}
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings: {}
-    pools:
-      default.conf:
-        enabled: false
-        opts: {}
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    cli:
-      ini: /etc/php.ini
-    fpm:
-      conf: /etc/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php-fpm/error.log
-          pid: /var/run/php-fpm/php-fpm.pid
-        include: /etc/php-fpm.d/*.conf
-      group: root
-      ini: /etc/php.ini
-      pools: /etc/php-fpm.d
-      service: php-fpm
-      user: root
-    pkgs:
-      adodb: php-adodb
-      apc: php-pecl-apc
-      apcu: php-pecl-apcu
-      auth-sasl: php-pear-Auth-SASL
-      bcmath: php-bcmath
-      build_pkgs:
-      - openssl-devel
-      - gcc
-      cache-lite: php-pear-Cache-Lite
-      cgi: php-cgi
-      cli: php-cli
-      composer: composer
-      composer_bin: composer
-      console-table: php-pear-Console-Table
-      curl:
-      - php-common
-      - curl
-      dba:
-      - php-dba
-      - dba
-      dev: php-devel
-      ext_conf_path: /etc/php.d
-      fpm: php-fpm
-      gd: php-gd
-      geoip: php-pecl-geoip
-      geshi: php-geshi
-      gettext: php-php-gettext
-      http: php-pecl-http
-      imagick: php-pecl-imagick
-      imap: php-imap
-      intl: php-intl
-      json: php-common
-      ldap: php-ldap
-      local_bin: /usr/local/bin
-      mail: php-pear-Mail
-      mbstring: php-mbstring
-      mcrypt: php-mcrypt
-      memcache: php-pecl-memcache
-      memcached: php-pecl-memcached
-      mysql: php-mysql
-      mysqlnd: php-mysqlnd
-      net-smtp: php-pear-Net-SMTP
-      net4: php-pear-Net-IPv4
-      oauth: php-pecl-oauth
-      opcache: php-pecl-zendopcache
-      pear: php-pear
-      pgsql: php-pgsql
-      php: php
-      pspell: php-pspell
-      redis: php-pecl-redis
-      seclib: php-phpseclib
-      snmp: php-snmp
-      soap: php-soap
-      sqlite: php-pdo
-      ssh2: php-pecl-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php-tidy
-      uuid: php-pecl-uuid
-      xcache: php-xcache
-      xdebug: php-pecl-xdebug
-      xml:
-      - php-xml
-      - php-xmlrpc
-      xsl: php-xml
-      zip: php
-    xcache:
-      ini: /etc/php.d/xcache.ini
-  xcache:
-    ini:
-      defaults:
-        xcache:
-          xcache.cacher: 'On'
-          xcache.coredump_directory: '""'
-          xcache.coredump_type: '0'
-          xcache.count: '1'
-          xcache.disable_on_crash: 'Off'
-          xcache.experimental: 'Off'
-          xcache.gc_interval: '0'
-          xcache.mmap_path: '"/dev/zero"'
-          xcache.optimizer: 'Off'
-          xcache.readonly_protection: 'Off'
-          xcache.shm_scheme: '"mmap"'
-          xcache.size: 60M
-          xcache.slots: 8K
-          xcache.stat: 'On'
-          xcache.ttl: '0'
-          xcache.var_count: '1'
-          xcache.var_gc_interval: '300'
-          xcache.var_maxttl: '0'
-          xcache.var_namespace: '""'
-          xcache.var_namespace_mode: '0'
-          xcache.var_size: 4M
-          xcache.var_slots: 8K
-          xcache.var_ttl: '0'
-        xcache-common:
-          extension: xcache.so
-        xcache.admin:
-          xcache.admin.enable_auth: 'On'
-        xcache.coverager:
-          xcache.coveragedump_directory: '""'
-          xcache.coverager: 'Off'
-          xcache.coverager_autostart: 'On'
-      opts: {}
-      settings: {}
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@ -1,390 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Ubuntu-16.04
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /run/php/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury ppa
-    key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
-    name: deb http://ppa.launchpad.net/ondrej/php/ubuntu xenial main
-  use_external_repo: true
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@ -1,390 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Ubuntu-18.04
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /run/php/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury ppa
-    key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
-    name: deb http://ppa.launchpad.net/ondrej/php/ubuntu bionic main
-  use_external_repo: true
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@ -1,390 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Ubuntu-20.04
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /run/php/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury ppa
-    key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
-    name: deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main
-  use_external_repo: true
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/files/_mapdata/ubuntu-22.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml
@ -1,390 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Ubuntu-22.04
---
-values:
-  apache2:
-    ini:
-      opts: {}
-      settings: {}
-  cli:
-    ini:
-      opts: {}
-      settings:
-        Assertion:
-          zend.assertions: -1
-        Date:
-          date.timezone: Europe/Paris
-        PHP:
-          default_charset: UTF-8
-  fpm:
-    config:
-      conf:
-        opts: {}
-        settings: {}
-      ini:
-        opts: {}
-        settings:
-          Assertion:
-            zend.assertions: -1
-          Date:
-            date.timezone: Europe/Paris
-          PHP:
-            cgi.fix_pathinfo: 0
-            default_charset: UTF-8
-            expose_php: 'Off'
-    pools:
-      ldap-admin.conf:
-        enabled: true
-        phpversion: '7.3'
-        settings:
-          ldap-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-ldap-admin2.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-      radius-admin.conf:
-        enabled: true
-        phpversion: '5.6'
-        settings:
-          radius-admin:
-            catch_workers_output: 'yes'
-            group: www-data
-            listen: /tmp/php-fpm-radius-admin.sock
-            listen.mode: '0666'
-            php_admin_value[date.timezone]: Europe/Paris
-            ping.path: /php-ping
-            pm: static
-            pm.max_children: 3
-            pm.max_requests: 500
-            pm.status_path: /php-status
-            security.limit_extensions: .php
-            user: www-data
-    service:
-      enabled: true
-      opts: {}
-  hhvm:
-    config:
-      php:
-        opts: {}
-        settings: {}
-      server:
-        opts: {}
-        settings: {}
-    service:
-      enabled: true
-      opts: {}
-  ini:
-    defaults:
-      CLI Server:
-        cli_server.color: 'On'
-      Date:
-        date.timezone: America/New_York
-      Interbase:
-        ibase.allow_persistent: 1
-        ibase.dateformat: '"%Y-%m-%d"'
-        ibase.max_links: -1
-        ibase.max_persistent: -1
-        ibase.timeformat: '"%H:%M:%S"'
-        ibase.timestampformat: '"%Y-%m-%d %H:%M:%S"'
-      MSSQL:
-        mssql.allow_persistent: 'On'
-        mssql.compatibility_mode: 'Off'
-        mssql.max_links: -1
-        mssql.max_persistent: -1
-        mssql.min_error_severity: 10
-        mssql.min_message_severity: 10
-        mssql.secure_connection: 'Off'
-      MySQL:
-        mysql.allow_local_infile: 'On'
-        mysql.allow_persistent: 'On'
-        mysql.cache_size: '2000'
-        mysql.connect_timeout: 60
-        mysql.max_links: -1
-        mysql.max_persistent: -1
-        mysql.trace_mode: 'Off'
-      MySQLi:
-        mysqli.allow_persistent: 'On'
-        mysqli.cache_size: 2000
-        mysqli.default_port: 3306
-        mysqli.max_links: -1
-        mysqli.max_persistent: -1
-        mysqli.reconnect: 'Off'
-      ODBC:
-        odbc.allow_persistent: 'On'
-        odbc.check_persistent: 'On'
-        odbc.defaultbinmode: 1
-        odbc.defaultlrl: 4096
-        odbc.max_links: '-1'
-        odbc.max_persistent: '-1'
-      PHP:
-        allow_url_fopen: 'On'
-        allow_url_include: 'Off'
-        asp_tags: 'Off'
-        auto_globals_jit: 'On'
-        default_mimetype: '"text/html"'
-        default_socket_timeout: 60
-        disable_functions:
-        - pcntl_alarm
-        - pcntl_fork
-        - pcntl_waitpid
-        - pcntl_wait
-        - pcntl_wifexited
-        - pcntl_wifstopped
-        - pcntl_wifsignaled
-        - pcntl_wexitstatus
-        - pcntl_wtermsig
-        - pcntl_wstopsig
-        - pcntl_signal
-        - pcntl_signal_dispatch
-        - pcntl_get_last_error
-        - pcntl_strerror
-        - pcntl_sigprocmask
-        - pcntl_sigwaitinfo
-        - pcntl_sigtimedwait
-        - pcntl_exec
-        - pcntl_getpriority
-        - pcntl_setpriority
-        display_errors: 'Off'
-        display_startup_errors: 'Off'
-        enable_dl: 'Off'
-        engine: 'On'
-        error_reporting:
-        - E_ALL
-        - ~E_DEPRECATED
-        - ~E_STRICT
-        expose_php: 'On'
-        file_uploads: 'On'
-        html_errors: 'On'
-        ignore_repeated_errors: 'Off'
-        ignore_repeated_source: 'Off'
-        implicit_flush: 'Off'
-        log_errors: 'On'
-        log_errors_max_len: 1024
-        max_execution_time: 30
-        max_file_uploads: 20
-        max_input_nesting_level: 64
-        max_input_time: 60
-        max_input_vars: 1000
-        memory_limit: 128M
-        output_buffering: 4096
-        post_max_size: 8M
-        precision: 14
-        register_argc_argv: 'Off'
-        report_memleaks: 'On'
-        request_order: GP
-        serialize_precision: 17
-        short_open_tag: 'Off'
-        track_errors: 'Off'
-        upload_max_filesize: 2M
-        variables_order: GPCS
-        zend.enable_gc: 'On'
-        zlib.output_compression: 'Off'
-      Pdo_mysql:
-        pdo_mysql.cache_size: 2000
-      PostgreSQL:
-        pgsql.allow_persistent: 'On'
-        pgsql.auto_reset_persistent: 'Off'
-        pgsql.ignore_notice: 0
-        pgsql.log_notice: 0
-        pgsql.max_links: -1
-        pgsql.max_persistent: -1
-      SQL:
-        sql.safe_mode: 'Off'
-      Session:
-        session.auto_start: 0
-        session.bug_compat_42: 'Off'
-        session.bug_compat_warn: 'Off'
-        session.cache_expire: '180'
-        session.cache_limiter: nocache
-        session.cookie_lifetime: 0
-        session.cookie_path: /
-        session.gc_divisor: 1000
-        session.gc_maxlifetime: 1440
-        session.gc_probability: 0
-        session.hash_bits_per_character: 5
-        session.hash_function: 0
-        session.name: PHPSESSID
-        session.save_handler: files
-        session.serialize_handler: php
-        session.use_cookies: 1
-        session.use_only_cookies: 1
-        session.use_strict_mode: 0
-        session.use_trans_sid: 0
-        url_rewriter.tags: '"a=href,area=href,frame=src,input=src,form=fakeentry"'
-      Sybase-CT:
-        sybct.allow_persistent: 'On'
-        sybct.max_links: -1
-        sybct.max_persistent: -1
-        sybct.min_client_severity: 10
-        sybct.min_server_severity: 10
-      Tidy:
-        tidy.clean_output: 'Off'
-      bcmath:
-        bcmath.scale: 0
-      ldap:
-        ldap.max_links: -1
-      mail function:
-        SMTP: localhost
-        mail.add_x_header: 'On'
-      mysqlnd:
-        mysqlnd.collect_memory_statistics: 'Off'
-        mysqlnd.collect_statistics: 'On'
-      soap:
-        soap.wsdl_cache_dir: '"/tmp"'
-        soap.wsdl_cache_enabled: 1
-        soap.wsdl_cache_limit: 5
-        soap.wsdl_cache_ttl: 86400
-  lookup:
-    apache2:
-      ini: /etc/php/5.6/apache2/php.ini
-    cli:
-      ini: /etc/php/5.6/cli/php.ini
-    fpm:
-      conf: /etc/php/5.6/fpm/php-fpm.conf
-      defaults:
-        global:
-          error_log: /var/log/php5.6-fpm.log
-          pid: /run/php/php5.6-fpm.pid
-        include: /etc/php/5.6/fpm/pool.d/*.conf
-      group: root
-      ini: /etc/php/5.6/fpm/php.ini
-      pools: /etc/php/5.6/fpm/pool.d
-      service: php5.6-fpm
-      user: root
-    hhvm:
-      conf: /etc/hhvm/server.ini
-      defaults: {}
-      ini: /etc/hhvm/php.ini
-      php:
-        hhvm.log.always_log_unhandled_exceptions: 'true'
-        hhvm.log.level: Warning
-        hhvm.log.runtime_error_reporting_level: '8191'
-        hhvm.mysql.typed_results: 'false'
-        session.gc_maxlifetime: '1440'
-        session.save_handler: files
-        session.save_path: /var/lib/hhvm/sessions
-      server:
-        hhvm.log.file: /var/log/hhvm/error.log
-        hhvm.log.use_log_file: 'true'
-        hhvm.repo.central.path: /var/run/hhvm/hhvm.hhbc
-        hhvm.server.default_document: index.php
-        hhvm.server.port: '9000'
-        hhvm.server.type: fastcgi
-        pid: /var/run/hhvm/pid
-      service: hhvm
-    pkgs:
-      adodb: libphp-adodb
-      apache2: libapache2-mod-php5.6
-      apc: php-apcu
-      apcu: php-apcu-bc
-      auth-sasl: php-auth-sasl
-      bcmath: php5.6-bcmath
-      build_pkgs:
-      - libssl-dev
-      - libcurl4-openssl-dev
-      - pkg-config
-      - libsslcommon2-dev
-      - gcc
-      - make
-      - autoconf
-      - libc-dev
-      - pkg-config
-      bz2: php5.6-bz2
-      cache-lite: php-cache-lite
-      cgi: php5.6-cgi
-      cli: php5.6-cli
-      composer_bin: composer
-      console-table: php-console-table
-      curl: php5.6-curl
-      dba: php5.6-dba
-      dev: php5.6-dev
-      ext_conf_path: /etc/php/5.6/mods-available
-      fpm: php5.6-fpm
-      gd: php5.6-gd
-      gearman: php-gearman
-      geoip: php-geoip
-      geshi: php-geshi
-      gettext: php5.6
-      gmp: php5.6-gmp
-      hhvm: hhvm
-      imagick: php-imagick
-      imap: php5.6-imap
-      intl: php5.6-intl
-      json: php5.6-json
-      ldap: php5.6-ldap
-      local_bin: /usr/local/bin
-      mail: php-mail
-      mbstring: php5.6-mbstring
-      mcrypt: php5.6-mcrypt
-      memcache: php-memcache
-      memcached: php-memcached
-      mongo: php-mongo
-      mongodb: php-mongodb
-      mysql: php5.6-mysql
-      mysqlnd: php5.6-mysql
-      net-smtp: php-net-smtp
-      net4: php-net-ipv4
-      net6: php-net-ipv6
-      oauth: php-oauth
-      odbc: php-odbc
-      opcache: php5.6-opcache
-      pear: php-pear
-      pgsql: php5.6-pgsql
-      php: php5.6
-      phpenmod_command: phpenmod -v5.6
-      pspell: php5.6-pspell
-      readline: php5.6-readline
-      redis: php5.6-redis
-      seclib:
-      - php-phpseclib
-      - php-seclib
-      snmp: php5.6-snmp
-      soap: php5.6-soap
-      sqlite: php5.6-sqlite3
-      ssh2: php-ssh2
-      suhosin5_ext: suhosin.so
-      suhosin5_repo: https://github.com/sektioneins/suhosin
-      suhosin7_ext: suhosin7.so
-      suhosin7_repo: https://github.com/sektioneins/suhosin7
-      sybase: php5.6-sybase
-      tcpdf: php-tcpdf
-      temp_dir: /tmp
-      tidy: php5.6-tidy
-      xdebug: php-xdebug
-      xml:
-      - php5.6-xml
-      - php5.6-xmlrpc
-      xsl: php5.6-xsl
-      zip: php5.6-zip
-  modules:
-  - bz2
-  - cli
-  - curl
-  - gd
-  - imagick
-  - imap
-  - intl
-  - mbstring
-  - mysql
-  - readline
-  - redis
-  - xdebug
-  - xml
-  - zip
-  repo:
-    file: /etc/apt/sources.list.d/php-sury.list
-    humanname: php-sury ppa
-    key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c
-    name: deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main
-  use_external_repo: true
-  version:
-  - '5.6'
-  - '7.3'
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@ -6,9 +6,6 @@ title: php formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
 summary: Verify that the php formula is setup and configured correctly
-depends:
-  - name: share
-    path: test/integration/share
 supports:
  - platform-name: debian
  - platform-name: ubuntu
@ -17,12 +14,5 @@ supports:
  - platform-name: opensuse
  - platform-name: suse
  - platform-name: freebsd
-  - platform-name: openbsd
  - platform-name: amazon
-  - platform-name: oracle
  - platform-name: arch
-  - platform-name: gentoo
-  - platform-name: almalinux
-  - platform-name: rocky
-  - platform-name: mac_os_x
-  - platform: windows
--- a/test/integration/share/README.md
+++ b/test/integration/share/README.md
@ -1,22 +0,0 @@
-# InSpec Profile: `share`
-
-This shows the implementation of the `share` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
-
-Its goal is to share the libraries between all profiles.
-
-## Libraries
-
-### `system`
-
-The `system` library provides easy access to system dependent information:
-
- `system.platform`: based on `inspec.platform`, modify to values that are more consistent from a SaltStack perspective
-  - `system.platform[:family]` provide a family name for Arch and Gentoo
-  - `system.platform[:name]` append `linux` to both `amazon` and `oracle`; ensure Windows platforms are resolved as simply `windows`
-  - `system.platform[:release]` tweak Arch, Amazon Linux, Gentoo, openSUSE and Windows:
-    - `Arch` is always `base-latest`
-    - `Amazon Linux` release `2018` is resolved as `1`
-    - `Gentoo` release is trimmed to its major version number and then the init system is appended (i.e. `sysv` or `sysd`)
-    - `openSUSE` is resolved as `tumbleweed` if the `platform[:release]` is in date format
-    - `Windows` uses the widely-used release number (e.g. `8.1` or `2019-server`) in place of the actual system release version
-  - `system.platform[:finger]` is the concatenation of the name and the major release number (except for Ubuntu, which gives `ubuntu-20.04` for example)
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-name: share
-title: InSpec shared resources
-maintainer: SaltStack Formulas
-license: Apache-2.0
-summary: shared resources
-supports:
-  - platform-name: debian
-  - platform-name: ubuntu
-  - platform-name: centos
-  - platform-name: fedora
-  - platform-name: opensuse
-  - platform-name: suse
-  - platform-name: freebsd
-  - platform-name: openbsd
-  - platform-name: amazon
-  - platform-name: oracle
-  - platform-name: arch
-  - platform-name: gentoo
-  - platform-name: almalinux
-  - platform-name: rocky
-  - platform-name: mac_os_x
-  - platform: windows
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@ -1,138 +0,0 @@
-# frozen_string_literal: true
-
-# system.rb -- InSpec resources for system values
-# Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
-# Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
-
-# rubocop:disable Metrics/ClassLength
-class SystemResource < Inspec.resource(1)
-  name 'system'
-
-  attr_reader :platform
-
-  def initialize
-    super
-    @platform = build_platform
-  end
-
-  private
-
-  def build_platform
-    {
-      family: build_platform_family,
-      name: build_platform_name,
-      release: build_platform_release,
-      finger: build_platform_finger,
-      codename: build_platform_codename
-    }
-  end
-
-  def build_platform_family
-    case inspec.platform[:name]
-    when 'arch', 'gentoo'
-      inspec.platform[:name]
-    else
-      inspec.platform[:family]
-    end
-  end
-
-  def build_platform_name
-    case inspec.platform[:name]
-    when 'amazon', 'oracle', 'rocky'
-      "#{inspec.platform[:name]}linux"
-    when /^windows_/
-      inspec.platform[:family]
-    else
-      inspec.platform[:name]
-    end
-  end
-
-  # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
-  def build_platform_release
-    case inspec.platform[:name]
-    when 'amazon'
-      # `2018` relase is named `1` in `kitchen.yml`
-      inspec.platform[:release].gsub(/2018.*/, '1')
-    when 'arch'
-      'base-latest'
-    when 'gentoo'
-      "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
-    when 'mac_os_x'
-      inspec.command('sw_vers -productVersion').stdout.to_s
-    when 'opensuse'
-      # rubocop:disable Style/NumericLiterals,Layout/LineLength
-      inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
-      # rubocop:enable Style/NumericLiterals,Layout/LineLength
-    when 'windows_8.1_pro'
-      '8.1'
-    when 'windows_server_2022_datacenter'
-      '2022-server'
-    when 'windows_server_2019_datacenter'
-      '2019-server'
-    when 'windows_server_2016_datacenter'
-      '2016-server'
-    else
-      inspec.platform[:release]
-    end
-  end
-  # rubocop:enable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
-
-  def derive_gentoo_init_system
-    inspec.command('systemctl').exist? ? 'sysd' : 'sysv'
-  end
-
-  def build_platform_finger
-    "#{build_platform_name}-#{build_finger_release}"
-  end
-
-  def build_finger_release
-    case inspec.platform[:name]
-    when 'ubuntu'
-      build_platform_release.split('.').slice(0, 2).join('.')
-    else
-      build_platform_release.split('.')[0]
-    end
-  end
-
-  # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
-  def build_platform_codename
-    case build_platform_finger
-    when 'ubuntu-22.04'
-      'jammy'
-    when 'ubuntu-20.04'
-      'focal'
-    when 'ubuntu-18.04'
-      'bionic'
-    when 'debian-11'
-      'bullseye'
-    when 'debian-10'
-      'buster'
-    when 'debian-9'
-      'stretch'
-    when 'almalinux-8'
-      "AlmaLinux #{build_platform_release} (Arctic Sphynx)"
-    when 'amazonlinux-2'
-      'Amazon Linux 2'
-    when 'arch-base-latest'
-      'Arch Linux'
-    when 'centos-7'
-      'CentOS Linux 7 (Core)'
-    when 'centos-8'
-      'CentOS Stream 8'
-    when 'opensuse-tumbleweed'
-      'openSUSE Tumbleweed'
-    when 'opensuse-15'
-      "openSUSE Leap #{build_platform_release}"
-    when 'oraclelinux-8', 'oraclelinux-7'
-      "Oracle Linux Server #{build_platform_release}"
-    when 'gentoo-2-sysd', 'gentoo-2-sysv'
-      'Gentoo/Linux'
-    when 'rockylinux-8'
-      "Rocky Linux #{build_platform_release} (Green Obsidian)"
-    else
-      ''
-    end
-  end
-  # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity
-end
-# rubocop:enable Metrics/ClassLength
--- a/test/salt/pillar/freebsd.sls
+++ b/test/salt/pillar/freebsd.sls
@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-php:
-  version:
-    # - '7.3'
-    - '7.4'
-    - '8.0'
--- a/test/salt/pillar/suse.sls
+++ b/test/salt/pillar/suse.sls
@ -4,4 +4,4 @@
 php:
  lookup:
    pkgs:
-      php: php8
+      php: php7