saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
606 Commits 5 Branches 33 Tags 1.2 MiB
50ac4bfc22
Commit Graph

606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Imran Iqbal
46ad65e39e
refactor(map): use top-level values: key in map.jinja dumps 
* Semi-automated using https://github.com/myii/ssf-formula/pull/284
 2020-12-23 16:54:51 +00:00
Imran Iqbal
71dbf345d6
ci(pre-commit): enable rubocop linter after fix 
`rubocop` violations fixed in 1a4d20877c.

* Automated using https://github.com/myii/ssf-formula/pull/284
 2020-12-23 16:54:43 +00:00
semantic-release-bot
f1f94d48ce chore(release): 1.3.3 [skip ci] 
## [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](6ea8950307))
* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([992e934](992e9348c7))

### Tests

* fix rubocop violations ([1a4d208](1a4d20877c))
* **_mapdata:** generate verification files ([f88fdf7](f88fdf784a))
* **map:** verify `map.jinja` dump using `_mapdata` state ([e9591db](e9591db355))
 2020-12-22 15:18:32 +00:00
Imran Iqbal
18a33700d5
Merge pull request #221 from myii/test/manage-map.jinja-verification 
test(map): verify `map.jinja` dump using `_mapdata` state
 2020-12-22 15:11:23 +00:00
Imran Iqbal
1a4d20877c
test: fix rubocop violations 
Use method:

1. `rubocop -a --safe`
2. `rubocop -A --safe`
3. Use `rubocop:disable`

```
Offenses:

test/integration/default/controls/config_spec.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string literal
comment.
control 'Php configuration' do
^
test/integration/default/controls/config_spec.rb:4:3: C: Metrics/AbcSize: Assignment Branch Condition size for
test_debian is too high. [<0, 26, 0> 26/17]
(http://c2.com/cgi/wiki?AbcMetric, https://en.wikipedia.org/wiki/ABC_Software_Metric)
  def test_debian ...
  ^^^^^^^^^^^^^^^
test/integration/default/controls/config_spec.rb:4:3: C: Metrics/MethodLength: Method has too many lines. [14/10]
(https://rubystyle.guide#short-methods)
  def test_debian ...
  ^^^^^^^^^^^^^^^
test/integration/default/controls/config_spec.rb:24:3: C: Style/EmptyMethod: Put empty method definitions on a single
line. (https://rubystyle.guide#no-single-line-methods)
  def test_redhat ...
  ^^^^^^^^^^^^^^^
test/integration/default/controls/config_spec.rb:27:3: C: Style/EmptyMethod: Put empty method definitions on a single
line. (https://rubystyle.guide#no-single-line-methods)
  def test_suse ...
  ^^^^^^^^^^^^^
test/integration/default/controls/package_spec.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string
literal comment.
control 'Php package' do
^
test/integration/default/controls/package_spec.rb:4:3: C: Metrics/AbcSize: Assignment Branch Condition size for
test_debian is too high. [<1, 26, 1> 26.04/17] (http://c2.com/cgi/wiki?AbcMetric,
https://en.wikipedia.org/wiki/ABC_Software_Metric)
  def test_debian ...
  ^^^^^^^^^^^^^^^
test/integration/default/controls/package_spec.rb:4:3: C: Metrics/MethodLength: Method has too many lines. [20/10]
(https://rubystyle.guide#short-methods)
  def test_debian ...
  ^^^^^^^^^^^^^^^
test/integration/default/controls/package_spec.rb:21:1: C: Layout/EmptyLinesAroundBlockBody: Extra empty line detected
at block body beginning. (https://rubystyle.guide#empty-lines-around-bodies)
test/integration/default/controls/service_spec.rb:1:1: C: Style/FrozenStringLiteralComment: Missing frozen string
literal comment.
control 'Php service' do
^
test/integration/default/controls/service_spec.rb:16:3: C: Style/EmptyMethod: Put empty method definitions on a single
line. (https://rubystyle.guide#no-single-line-methods)
  def test_redhat ...
  ^^^^^^^^^^^^^^^
test/integration/default/controls/service_spec.rb:19:3: C: Style/EmptyMethod: Put empty method definitions on a single
line. (https://rubystyle.guide#no-single-line-methods)
  def test_suse ...
  ^^^^^^^^^^^^^

7 files inspected, 12 offenses detected, 8 offenses auto-correctable
```
 2020-12-22 15:02:31 +00:00
Imran Iqbal
f88fdf784a
test(_mapdata): generate verification files 2020-12-22 14:38:56 +00:00
Imran Iqbal
e9591db355
test(map): verify map.jinja dump using _mapdata state 
* Automated using https://github.com/myii/ssf-formula/pull/283
 2020-12-22 14:30:35 +00:00
Imran Iqbal
6ea8950307
ci(commitlint): ensure upstream/master uses main repo URL [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/278
 2020-12-20 18:48:36 +00:00
Imran Iqbal
992e9348c7
ci(gitlab-ci): add rubocop linter (with allow_failure) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/277
 2020-12-19 14:34:12 +00:00
semantic-release-bot
15b021bb0b chore(release): 1.3.2 [skip ci] 
## [1.3.2](https://github.com/saltstack-formulas/php-formula/compare/v1.3.1...v1.3.2) (2020-12-16)

### Continuous Integration

* **gemfile.lock:** add to repo with updated `Gemfile` [skip ci] ([8720cc1](8720cc1708))
* **gitlab-ci:** use GitLab CI as Travis CI replacement ([15ed749](15ed749de4))
* **kitchen:** use `saltimages` Docker Hub where available [skip ci] ([4cd9a3a](4cd9a3a213))
* **kitchen+travis:** remove `master-py2-arch-base-latest` [skip ci] ([8dd9c54](8dd9c545db))
* **pre-commit:** add to formula [skip ci] ([5d71e0b](5d71e0b24e))
* **pre-commit:** enable/disable `rstcheck` as relevant [skip ci] ([7f73dbb](7f73dbbf31))
* **pre-commit:** finalise `rstcheck` configuration [skip ci] ([ab6338e](ab6338e6d4))
* **travis:** add notifications => zulip [skip ci] ([b64b1c2](b64b1c2b08))
* **workflows/commitlint:** add to repo [skip ci] ([b30a6bd](b30a6bd8a7))

### Styles

* **libtofs.jinja:** use Black-inspired Jinja formatting [skip ci] ([1def34c](1def34c368))
 2020-12-16 07:19:54 +00:00
Imran Iqbal
15ed749de4
ci(gitlab-ci): use GitLab CI as Travis CI replacement 
* Automated using https://github.com/myii/ssf-formula/pull/275
 2020-12-16 06:38:15 +00:00
Imran Iqbal
b73fffa4b5
chore(gemfile+lock): update to latest gem versions (2020-W44) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/274
 2020-10-26 22:52:39 +00:00
Imran Iqbal
efcd71f14b
chore(gemfile+lock): update to latest gem versions (2020-W43) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/273
 2020-10-20 10:20:39 +01:00
Imran Iqbal
ab6338e6d4
ci(pre-commit): finalise rstcheck configuration [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/267
 2020-10-10 06:50:45 +01:00
Dafydd Jones
9989a8680c
chore(commitlint): add {body,footer,header}-max(-line)-length [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/265
 2020-10-07 09:08:49 +01:00
Imran Iqbal
f7f3fff189
chore(gemfile+lock): update to latest gem versions (2020-W41) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/263
 2020-10-07 00:07:08 +01:00
Imran Iqbal
7f73dbbf31
ci(pre-commit): enable/disable rstcheck as relevant [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/262
 2020-10-05 00:23:18 +01:00
Dafydd Jones
5d71e0b24e
ci(pre-commit): add to formula [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/259
 2020-10-03 10:51:57 +01:00
Imran Iqbal
1def34c368 style(libtofs.jinja): use Black-inspired Jinja formatting [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/237
 2020-07-19 23:28:01 +01:00
Imran Iqbal
9feedad399 chore(gemfile.lock): update to latest gem versions (2020-W27) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/235
 2020-07-06 14:30:04 +01:00
Imran Iqbal
e905b592a1 chore(gemfile.lock): update to latest gem versions (2020-W26) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/233
 2020-06-26 12:46:21 +01:00
Imran Iqbal
50800f0335 chore(gemfile.lock): update to latest gem versions (2020-W25) [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/229
 2020-06-21 12:58:39 +01:00
Imran Iqbal
4cd9a3a213 ci(kitchen): use saltimages Docker Hub where available [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/223
 2020-06-15 16:58:19 +01:00
Imran Iqbal
6a14832ce4 chore(gemfile.lock): update to latest gem versions [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/222
 2020-06-15 15:09:16 +01:00
Imran Iqbal
9ba0379dac chore(gemfile.lock): update to latest gem versions [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/221
 2020-06-05 22:18:55 +01:00
Imran Iqbal
b439346602 chore(gemfile.lock): update to latest gem versions [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/202
 2020-05-28 00:21:01 +01:00
Imran Iqbal
b64b1c2b08 ci(travis): add notifications => zulip [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/191
 2020-05-21 20:09:26 +01:00
Imran Iqbal
2533b3a52c chore(codeowners): add global codeowner [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/178
 2020-05-07 20:01:21 +01:00
Imran Iqbal
093ae2d95c chore(codeowners): update semantic-release related files [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/174
 2020-05-04 23:17:05 +01:00
Imran Iqbal
e35e76d9a6 chore(codeowners): add to repo [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/173
 2020-05-04 22:45:36 +01:00
Imran Iqbal
b30a6bd8a7 ci(workflows/commitlint): add to repo [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/172
 2020-05-04 09:31:07 +01:00
Imran Iqbal
8dd9c545db ci(kitchen+travis): remove master-py2-arch-base-latest [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/167
 2020-05-02 04:29:27 +01:00
Imran Iqbal
8720cc1708 ci(gemfile.lock): add to repo with updated Gemfile [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/163
 2020-04-21 22:09:20 +01:00
semantic-release-bot
80f9c94a32 chore(release): 1.3.1 [skip ci] 
## [1.3.1](https://github.com/saltstack-formulas/php-formula/compare/v1.3.0...v1.3.1) (2020-04-20)

### Documentation

* add example to use a specific php version when using multiple ones ([53068f7](53068f73b0))
 2020-04-20 09:00:08 +00:00
Yoda-BZH
53068f73b0
docs: add example to use a specific php version when using multiple ones 
Co-authored-by: Tristan Charbonneau <tcharbonneau@oceanet-technology.com>
 2020-04-20 09:50:35 +01:00
Imran Iqbal
02c507d667 chore(rubocop): use org-wide standard settings for Metrics/BlockLength [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/158
 2020-04-18 13:45:32 +01:00
semantic-release-bot
e8b1dd80b5 chore(release): 1.3.0 [skip ci] 
# [1.3.0](https://github.com/saltstack-formulas/php-formula/compare/v1.2.3...v1.3.0) (2020-02-27)

### Bug Fixes

* **libtofs:** “files_switch” mess up the variable exported by “map.jinja” [skip ci] ([dca51de](dca51de154))
* **map.jinja:** fix pid file location for debian ([393d69e](393d69eb0f))

### Continuous Integration

* **gemfile:** restrict `train` gem version until upstream fix [skip ci] ([d7c188e](d7c188e73c))
* **kitchen:** avoid using bootstrap for `master` instances [skip ci] ([dd796b0](dd796b070c))
* **travis:** use `major.minor` for `semantic-release` version [skip ci] ([109df07](109df0781d))

### Documentation

* **readme:** fix broken sub-heading [skip ci] ([51dd6e9](51dd6e9bf2))

### Features

* **odbc:** add odbc module support ([8b69034](8b69034c5b))
 2020-02-27 17:32:37 +00:00
Imran Iqbal
84846adb42
Merge pull request #211 from sylvainfaivre/master 
fix(map.jinja): fix pid file location for debian
 2020-02-27 17:19:53 +00:00
sylvainfaivre
393d69eb0f fix(map.jinja): fix pid file location for debian 
The PID file location for Debian changed recently
see https://www.patreon.com/posts/february-updates-34189046
and https://github.com/oerdnj/deb.sury.org/issues/1334
 2020-02-27 10:39:17 +01:00
Imran Iqbal
e6393c7a6e chore(gitignore): update from the template-formula [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/132
 2020-02-14 22:30:48 +00:00
Imran Iqbal
dca51de154 fix(libtofs): “files_switch” mess up the variable exported by “map.jinja” [skip ci] 
* Checked using https://github.com/myii/ssf-formula/pull/131
 2020-02-14 19:10:31 +00:00
Imran Iqbal
221994b5cf chore(rubocop): move LineLength cop from Metrics to Layout [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/129
 2020-02-14 12:52:16 +00:00
Imran Iqbal
dd796b070c ci(kitchen): avoid using bootstrap for master instances [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/124
 2020-02-05 14:07:18 +00:00
Imran Iqbal
109df0781d ci(travis): use major.minor for semantic-release version [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/112
 2019-12-22 01:00:45 +00:00
Imran Iqbal
d7c188e73c ci(gemfile): restrict train gem version until upstream fix [skip ci] 
* Automated using https://github.com/myii/ssf-formula/pull/110
 2019-12-16 13:43:41 +00:00
Imran Iqbal
51dd6e9bf2
docs(readme): fix broken sub-heading [skip ci] 2019-12-12 13:06:29 +00:00
Imran Iqbal
f5751f3a2f
Merge pull request #206 from netmanagers/master 
feat(odbc): add odbc module support
 2019-12-12 11:00:27 +00:00
Javier Bértoli
8b69034c5b feat(odbc): add odbc module support 2019-12-09 12:29:35 -03:00
semantic-release-bot
6492871770 chore(release): 1.2.3 [skip ci] 
## [1.2.3](https://github.com/saltstack-formulas/php-formula/compare/v1.2.2...v1.2.3) (2019-12-02)

### Bug Fixes

* **map.jinja:** fix useflags regex (gentoo) ([39b1307](39b1307671))
* **release.config.js:** use full commit hash in commit link [skip ci] ([d8f279f](d8f279f9cd))

### Continuous Integration

* **kitchen:** use `debian-10-master-py3` instead of `develop` [skip ci] ([fc9ad29](fc9ad29874))
* **kitchen:** use `develop` image until `master` is ready (`amazonlinux`) [skip ci] ([97b7a36](97b7a36aa7))
* **kitchen+travis:** upgrade matrix after `2019.2.2` release [skip ci] ([85e1f0e](85e1f0ec25))
* **travis:** apply changes from build config validation [skip ci] ([3862c37](3862c37d06))
* **travis:** opt-in to `dpl v2` to complete build config validation [skip ci] ([0bb68c5](0bb68c5b17))
* **travis:** quote pathspecs used with `git ls-files` [skip ci] ([0090c91](0090c91b60))
* **travis:** run `shellcheck` during lint job [skip ci] ([298a7d6](298a7d61c2))
* **travis:** update `salt-lint` config for `v0.0.10` [skip ci] ([5c7d1aa](5c7d1aa501))
* **travis:** use build config validation (beta) [skip ci] ([bcc0690](bcc0690c8a))
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([75f8d4d](75f8d4dcb8))

### Documentation

* **contributing:** remove to use org-level file instead [skip ci] ([8aee949](8aee949cab))
* **readme:** update link to `CONTRIBUTING` [skip ci] ([05d112f](05d112f63b))

### Performance Improvements

* **travis:** improve `salt-lint` invocation [skip ci] ([56d7314](56d73148b3))
 2019-12-02 22:08:16 +00:00
Mark Gomersbach
39b1307671 fix(map.jinja): fix useflags regex (gentoo) 
* fix(map.jinja): fix useflags regex

When using version inside useflag, the sls_block macro with ebuildpkg regex result in a range error.
Replacing the version argument with uses seem to work as escapes don't really work there.

fix(map.jinja): replace all problematic lines
fix(map.jinja): update available targets

```
----------
          ID: php_install_imagick_dev-php-pecl-imagick
    Function: pkg.installed
        Name: dev-php/pecl-imagick
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib64/python3.6/site-packages/salt/state.py", line 1933, in call
                  **cdata['kwargs'])
                File "/usr/lib64/python3.6/site-packages/salt/loader.py", line 1951, in wrapper
                  return f(*args, **kwargs)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 1563, in installed
                  **kwargs)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 651, in _find_install_targets
                  for name, version in desired.items()
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 652, in <listcomp>
                  if not (name in cur_pkgs and (version is None or _fulfills_version_string(cur_pkgs[name], version)))
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 216, in _fulfills_version_string
                  fullfills_all = fullfills_all and _fulfills_version_spec([installed_version], operator, version_string, ignore_epoch=ignore_epoch)
                File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 234, in _fulfills_version_spec
                  if (oper == '==' and fnmatch.fnmatch(ver, desired_version)) \
                File "/usr/lib64/python3.6/fnmatch.py", line 36, in fnmatch
                  return fnmatchcase(name, pat)
                File "/usr/lib64/python3.6/fnmatch.py", line 70, in fnmatchcase
                  match = _compile_pattern(pat)
                File "/usr/lib64/python3.6/fnmatch.py", line 46, in _compile_pattern
                  return re.compile(res).match
                File "/usr/lib64/python3.6/re.py", line 233, in compile
                  return _compile(pattern, flags)
                File "/usr/lib64/python3.6/re.py", line 301, in _compile
                  p = sre_compile.compile(pattern, flags)
                File "/usr/lib64/python3.6/sre_compile.py", line 562, in compile
                  p = sre_parse.parse(p, flags)
                File "/usr/lib64/python3.6/sre_parse.py", line 855, in parse
                  p = _parse_sub(source, pattern, flags & SRE_FLAG_VERBOSE, 0)
                File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
                  not nested and not items))
                File "/usr/lib64/python3.6/sre_parse.py", line 765, in _parse
                  p = _parse_sub(source, state, sub_verbose, nested + 1)
                File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
                  not nested and not items))
                File "/usr/lib64/python3.6/sre_parse.py", line 553, in _parse
                  raise source.error(msg, len(this) + 1 + len(that))
              sre_constants.error: bad character range 7-3 at position 20
     Started: 14:28:26.927898
    Duration: 6321.149 ms
     Changes:
```

* Use single-quoting

Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>
 2019-12-02 21:54:41 +00:00