Showing with 13,393 additions and 107 deletions.
  1. +17 −12 .github/CONTRIBUTING.md
  2. +1 −1 .msync.yml
  3. +50 −40 .rubocop.yml
  4. +15 −16 .travis.yml
  5. +36 −1 CHANGELOG.md
  6. +15 −10 Gemfile
  7. +222 −0 HISTORY.md
  8. +40 −6 Rakefile
  9. +105 −0 docs/Puppet/Parser/Functions.html
  10. +369 −0 docs/_index.html
  11. +8 −0 docs/css/common.css
  12. +58 −0 docs/css/full_list.css
  13. +492 −0 docs/css/style.css
  14. +340 −0 docs/file.README.html
  15. +17 −0 docs/frames.html
  16. +340 −0 docs/index.html
  17. +248 −0 docs/js/app.js
  18. +216 −0 docs/js/full_list.js
  19. +4 −0 docs/js/jquery.js
  20. +209 −0 docs/puppet_class_list.html
  21. +906 −0 docs/puppet_classes/php.html
  22. +182 −0 docs/puppet_classes/php_3A_3Aapache_config.html
  23. +182 −0 docs/puppet_classes/php_3A_3Acli.html
  24. +302 −0 docs/puppet_classes/php_3A_3Acomposer.html
  25. +246 −0 docs/puppet_classes/php_3A_3Acomposer_3A_3Aauto_update.html
  26. +216 −0 docs/puppet_classes/php_3A_3Adev.html
  27. +244 −0 docs/puppet_classes/php_3A_3Aembedded.html
  28. +482 −0 docs/puppet_classes/php_3A_3Afpm.html
  29. +596 −0 docs/puppet_classes/php_3A_3Afpm_3A_3Aconfig.html
  30. +245 −0 docs/puppet_classes/php_3A_3Afpm_3A_3Aservice.html
  31. +175 −0 docs/puppet_classes/php_3A_3Aglobal.html
  32. +384 −0 docs/puppet_classes/php_3A_3Aglobals.html
  33. +232 −0 docs/puppet_classes/php_3A_3Apackages.html
  34. +490 −0 docs/puppet_classes/php_3A_3Aparams.html
  35. +258 −0 docs/puppet_classes/php_3A_3Apear.html
  36. +248 −0 docs/puppet_classes/php_3A_3Aphpunit.html
  37. +189 −0 docs/puppet_classes/php_3A_3Aphpunit_3A_3Aauto_update.html
  38. +169 −0 docs/puppet_classes/php_3A_3Arepo.html
  39. +312 −0 docs/puppet_classes/php_3A_3Arepo_3A_3Adebian.html
  40. +177 −0 docs/puppet_classes/php_3A_3Arepo_3A_3Aredhat.html
  41. +175 −0 docs/puppet_classes/php_3A_3Arepo_3A_3Asuse.html
  42. +177 −0 docs/puppet_classes/php_3A_3Arepo_3A_3Aubuntu.html
  43. +104 −0 docs/puppet_defined_type_list.html
  44. +223 −0 docs/puppet_defined_types/php_3A_3Aapache_vhost.html
  45. +174 −0 docs/puppet_defined_types/php_3A_3Aconfig.html
  46. +226 −0 docs/puppet_defined_types/php_3A_3Aconfig_3A_3Asetting.html
  47. +460 −0 docs/puppet_defined_types/php_3A_3Aextension.html
  48. +418 −0 docs/puppet_defined_types/php_3A_3Aextension_3A_3Aconfig.html
  49. +356 −0 docs/puppet_defined_types/php_3A_3Aextension_3A_3Ainstall.html
  50. +935 −0 docs/puppet_defined_types/php_3A_3Afpm_3A_3Apool.html
  51. +71 −0 docs/puppet_function_list.html
  52. +259 −0 docs/puppet_functions_ruby3x/ensure_prefix.html
  53. +224 −0 docs/puppet_functions_ruby3x/to_hash_settings.html
  54. +71 −0 docs/puppet_provider_list.html
  55. +129 −0 docs/puppet_providers_package/pear.html
  56. +129 −0 docs/puppet_providers_package/pecl.html
  57. +98 −0 docs/top-level-namespace.html
  58. +2 −0 lib/puppet/provider/package/pecl.rb
  59. +9 −1 manifests/fpm.pp
  60. +3 −3 manifests/fpm/pool.pp
  61. +3 −1 manifests/fpm/service.pp
  62. +1 −1 manifests/globals.pp
  63. +6 −0 manifests/init.pp
  64. +1 −1 manifests/repo.pp
  65. +5 −5 metadata.json
  66. +0 −1 spec/acceptance/nodesets/docker/debian-7.yml
  67. +0 −1 spec/acceptance/nodesets/docker/debian-8.yml
  68. +20 −0 spec/acceptance/nodesets/docker/debian-9.yml
  69. +1 −1 spec/acceptance/nodesets/docker/ubuntu-14.04.yml
  70. +1 −1 spec/acceptance/nodesets/docker/ubuntu-16.04.yml
  71. +34 −0 spec/classes/php_fpm_service_spec.rb
  72. +7 −0 spec/classes/php_fpm_spec.rb
  73. +27 −0 spec/classes/php_repo_spec.rb
  74. +1 −2 spec/spec_helper.rb
  75. +4 −1 spec/unit/provider/package/pear_spec.rb
  76. +1 −1 types/provider.pp
  77. +1 −1 types/sapi.pp
29 changes: 17 additions & 12 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This module has grown over time based on a range of contributions from
people using it. If you follow these contributing guidelines your patch
will likely make it into a release a little quicker.
will likely make it into a release a little more quickly.

## Contributing

Expand Down Expand Up @@ -65,6 +65,10 @@ add tests if you're adding new functionality. If you've not used
[rspec-puppet](http://rspec-puppet.com/) before then feel free to ask
about how best to test your new feature.

To run the linter, the syntax checker and the unit tests:

bundle exec rake test

To run your all the unit tests

bundle exec rake spec SPEC_OPTS='--format documentation'
Expand All @@ -73,10 +77,6 @@ To run a specific spec test set the `SPEC` variable:

bundle exec rake spec SPEC=spec/foo_spec.rb

To run the linter, the syntax checker and the unit tests:

bundle exec rake test

## Integration tests

The unit tests just check the code runs, not that it does exactly what
Expand All @@ -89,15 +89,20 @@ with:

bundle exec rake acceptance

This will run the tests on an Ubuntu 12.04 virtual machine. You can also
run the integration tests against Centos 6.6 with.
This will run the tests on the module's default nodeset. You can override the
nodeset used, e.g.,

BEAKER_set=centos-7-x64 bundle exec rake acceptance

There are default rake tasks for the various acceptance test modules, e.g.,

BEAKER_set=centos-66-x64 bundle exec rake acceptances
bundle exec rake beaker:centos-7-x64
bundle exec rake beaker:ssh:centos-7-x64

If you don't want to have to recreate the virtual machine every time you
can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.
If you don't want to have to recreate the virtual machine every time you can
use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
created virtual machines will be in `.vagrant/beaker_vagrant_files`.

The easiest way to debug in a docker container is to open a shell:

Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.21.3'
modulesync_config_version: '1.4.1'
90 changes: 50 additions & 40 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ AllCops:
- Gemfile
- Rakefile
- Guardfile
- Vagrantfile
Lint/ConditionPosition:
Enabled: True

Expand Down Expand Up @@ -45,13 +46,16 @@ Style/HashSyntax:
Style/RedundantReturn:
Enabled: True

Style/EndOfLine:
Enabled: False

Lint/AmbiguousOperator:
Enabled: True

Lint/AssignmentInCondition:
Enabled: True

Style/SpaceBeforeComment:
Layout/SpaceBeforeComment:
Enabled: True

Style/AndOr:
Expand Down Expand Up @@ -119,7 +123,7 @@ Lint/UselessAssignment:
Lint/Void:
Enabled: True

Style/AccessModifierIndentation:
Layout/AccessModifierIndentation:
Enabled: True

Style/AccessorMethodName:
Expand All @@ -128,13 +132,13 @@ Style/AccessorMethodName:
Style/Alias:
Enabled: True

Style/AlignArray:
Layout/AlignArray:
Enabled: True

Style/AlignHash:
Layout/AlignHash:
Enabled: True

Style/AlignParameters:
Layout/AlignParameters:
Enabled: True

Metrics/BlockNesting:
Expand All @@ -152,7 +156,7 @@ Style/BracesAroundHashParameters:
Style/CaseEquality:
Enabled: True

Style/CaseIndentation:
Layout/CaseIndentation:
Enabled: True

Style/CharacterLiteral:
Expand Down Expand Up @@ -186,64 +190,64 @@ Style/WordArray:
Style/UnneededPercentQ:
Enabled: True

Style/Tab:
Layout/Tab:
Enabled: True

Style/SpaceBeforeSemicolon:
Layout/SpaceBeforeSemicolon:
Enabled: True

Style/TrailingBlankLines:
Layout/TrailingBlankLines:
Enabled: True

Style/SpaceInsideBlockBraces:
Layout/SpaceInsideBlockBraces:
Enabled: True

Style/SpaceInsideBrackets:
Layout/SpaceInsideBrackets:
Enabled: True

Style/SpaceInsideHashLiteralBraces:
Layout/SpaceInsideHashLiteralBraces:
Enabled: True

Style/SpaceInsideParens:
Layout/SpaceInsideParens:
Enabled: True

Style/LeadingCommentSpace:
Layout/LeadingCommentSpace:
Enabled: True

Style/SpaceBeforeFirstArg:
Layout/SpaceBeforeFirstArg:
Enabled: True

Style/SpaceAfterColon:
Layout/SpaceAfterColon:
Enabled: True

Style/SpaceAfterComma:
Layout/SpaceAfterComma:
Enabled: True

Style/SpaceAfterMethodName:
Layout/SpaceAfterMethodName:
Enabled: True

Style/SpaceAfterNot:
Layout/SpaceAfterNot:
Enabled: True

Style/SpaceAfterSemicolon:
Layout/SpaceAfterSemicolon:
Enabled: True

Style/SpaceAroundEqualsInParameterDefault:
Layout/SpaceAroundEqualsInParameterDefault:
Enabled: True

Style/SpaceAroundOperators:
Layout/SpaceAroundOperators:
Enabled: True

Style/SpaceBeforeBlockBraces:
Layout/SpaceBeforeBlockBraces:
Enabled: True

Style/SpaceBeforeComma:
Layout/SpaceBeforeComma:
Enabled: True

Style/CollectionMethods:
Enabled: True

Style/CommentIndentation:
Layout/CommentIndentation:
Enabled: True

Style/ColonMethodCall:
Expand All @@ -268,7 +272,7 @@ Style/DefWithParentheses:
Style/PreferredHashMethods:
Enabled: True

Style/DotPosition:
Layout/DotPosition:
EnforcedStyle: trailing

Style/DoubleNegation:
Expand All @@ -277,25 +281,25 @@ Style/DoubleNegation:
Style/EachWithObject:
Enabled: True

Style/EmptyLineBetweenDefs:
Layout/EmptyLineBetweenDefs:
Enabled: True

Style/IndentArray:
Layout/IndentArray:
Enabled: True

Style/IndentHash:
Layout/IndentHash:
Enabled: True

Style/IndentationConsistency:
Layout/IndentationConsistency:
Enabled: True

Style/IndentationWidth:
Layout/IndentationWidth:
Enabled: True

Style/EmptyLines:
Layout/EmptyLines:
Enabled: True

Style/EmptyLinesAroundAccessModifier:
Layout/EmptyLinesAroundAccessModifier:
Enabled: True

Style/EmptyLiteral:
Expand All @@ -314,7 +318,7 @@ Style/MethodDefParentheses:
Style/LineEndConcatenation:
Enabled: True

Style/TrailingWhitespace:
Layout/TrailingWhitespace:
Enabled: True

Style/StringLiterals:
Expand Down Expand Up @@ -466,9 +470,6 @@ Metrics/ParameterLists:
Lint/RequireParentheses:
Enabled: True

Style/SpaceBeforeFirstArg:
Enabled: True

Style/ModuleFunction:
Enabled: True

Expand All @@ -484,7 +485,7 @@ Style/Encoding:
Style/BlockDelimiters:
Enabled: True

Style/MultilineBlockLayout:
Layout/MultilineBlockLayout:
Enabled: True

# 'Complexity' is very relative
Expand All @@ -498,7 +499,7 @@ Metrics/PerceivedComplexity:
Lint/UselessAssignment:
Enabled: True

Style/ClosingParenthesisIndentation:
Layout/ClosingParenthesisIndentation:
Enabled: True

# RSpec
Expand Down Expand Up @@ -527,9 +528,18 @@ RSpec/NestedGroups:
Enabled: False

# this is broken on ruby1.9
Style/IndentHeredoc:
Layout/IndentHeredoc:
Enabled: False

# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
Security/YAMLLoad:
Enabled: false

# This affects hiera interpolation, as well as some configs that we push.
Style/FormatStringToken:
Enabled: false

# This is useful, but sometimes a little too picky about where unit tests files
# are located.
RSpec/FilePath:
Enabled: false
31 changes: 15 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,28 @@ matrix:
fast_finish: true
include:
- rvm: 2.1.9
bundler_args: --without system_tests development
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.2.7
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.3.4
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=test
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
- rvm: 2.4.1
bundler_args: --without system_tests development
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
- rvm: 2.4.2
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
- rvm: 2.4.2
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
- rvm: 2.4.2
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
branches:
only:
- master
- /^v\d/
notifications:
email: false
irc:
on_success: always
on_failure: always
channels:
- "chat.freenode.org#voxpupuli-notifications"
deploy:
provider: puppetforge
user: puppet
Expand Down
37 changes: 36 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,38 @@
# Changelog

## 2017-08-02 Release [5.0.0]
All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v5.1.0](https://github.com/voxpupuli/puppet-php/tree/v5.1.0) (2017-11-10)

[Full Changelog](https://github.com/voxpupuli/puppet-php/compare/v5.0.0...v5.1.0)

**Fixed bugs:**

- Fix syntax issues with data types [\#385](https://github.com/voxpupuli/puppet-php/pull/385) ([craigwatson](https://github.com/craigwatson))
- fix ubuntu 17.04 version for php7 [\#383](https://github.com/voxpupuli/puppet-php/pull/383) ([arudat](https://github.com/arudat))
- Fix OS fact comparison for Ubuntu 12 and 14 [\#375](https://github.com/voxpupuli/puppet-php/pull/375) ([dbeckham](https://github.com/dbeckham))
- Fix OS facts usage when selecting repo class for Ubuntu systems [\#374](https://github.com/voxpupuli/puppet-php/pull/374) ([dbeckham](https://github.com/dbeckham))
- Confine pecl provider to where pear command is available [\#364](https://github.com/voxpupuli/puppet-php/pull/364) ([walkamongus](https://github.com/walkamongus))
- fix default value of php::fpm::pool::access\_log\_format [\#361](https://github.com/voxpupuli/puppet-php/pull/361) ([lesinigo](https://github.com/lesinigo))

**Closed issues:**

- Debian repository classes are being selected on Ubuntu systems [\#373](https://github.com/voxpupuli/puppet-php/issues/373)
- Changes in \#357 break Ubuntu version dependent resources [\#372](https://github.com/voxpupuli/puppet-php/issues/372)

**Merged pull requests:**

- Proposed fix for failing parallel spec tests [\#386](https://github.com/voxpupuli/puppet-php/pull/386) ([wyardley](https://github.com/wyardley))
- update dependencies in metadata [\#379](https://github.com/voxpupuli/puppet-php/pull/379) ([mmoll](https://github.com/mmoll))
- Bump metadata.json version to 5.0.1-rc [\#377](https://github.com/voxpupuli/puppet-php/pull/377) ([dhollinger](https://github.com/dhollinger))
- bump dep on puppet/archive to '\< 3.0.0' [\#376](https://github.com/voxpupuli/puppet-php/pull/376) ([costela](https://github.com/costela))
- Release 5.0.0 [\#371](https://github.com/voxpupuli/puppet-php/pull/371) ([hunner](https://github.com/hunner))
- Backport of \#355 remove example42/yum dependency on puppet3 branch [\#366](https://github.com/voxpupuli/puppet-php/pull/366) ([LEDfan](https://github.com/LEDfan))
- Add missing php-fpm user and group class param docs [\#346](https://github.com/voxpupuli/puppet-php/pull/346) ([dbeckham](https://github.com/dbeckham))

## [v5.0.0](https://github.com/voxpupuli/puppet-php/tree/v5.0.0) (2017-08-07)
### Summary
This backwards-incompatible release drops puppet 3, PHP 5.5 on Ubuntu, and the deprecated `php::extension` parameter `pecl_source`. It improves much of the internal code quality, and adds several useful features the most interesting of which is probably the `php::extension` parameter `ini_prefix`.

Expand Down Expand Up @@ -222,3 +254,6 @@ Initial release

[4.1.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v4.0.0...v4.1.0
[4.0.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v3.4.2...v4.0.0


\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
Loading