Skip to content

Commit 3dd529b

Browse files
author
nb
committed
fix: prevent running of states deprecated in v1.0.0 
1 parent 08cd563 commit 3dd529b

37 files changed

+70
-0
lines changed

‎php/adodb.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-adodb:

‎php/apc.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-apc:

‎php/apcu.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-apcu:

‎php/bcmath.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-bcmath:

‎php/cgi.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-cgi:

‎php/cli.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-cli:

‎php/composer.sls

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
{%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
1212
1313
include:
14+
- php.deprecated
1415
- php
1516
1617
get-composer:

‎php/curl.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-curl:

‎php/deprecated.sls

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# -*- coding: utf-8 -*-
2+
# vim: ft=sls
3+
4+
php-deprecated-in-v1.0.0-test-fail:
5+
test.succeed_without_changes:
6+
- name: |
7+
################################################################################
8+
# #
9+
# WARNING: BREAKING CHANGES SINCE `v1.0.0` #
10+
# #
11+
################################################################################
12+
# #
13+
# Prior to `v1.0.0`, this formula provided two methods for managing php; the #
14+
# old method under `php` and the new method under `php.ng`. The old method #
15+
# has now been removed and `php.ng` has been promoted to be `PHP` in its #
16+
# place. #
17+
# #
18+
# If you are not in a position to migrate, please pin your repo to the final #
19+
# release tag before `v1.0.0`, i.e. `v0.37.1`. #
20+
# #
21+
# To migrate from `php.ng`, simply modify your pillar to promote the entire #
22+
# section under `php:ng` so that it is under `php` instead. So with the #
23+
# editor of your choice, highlight the entire section and then unindent one #
24+
# level. Finish by removing the `ng:` line. #
25+
# #
26+
# To migrate from the old `php`, first convert to `php.ng` under `v0.37.0` #
27+
# and then follow the steps laid out in the paragraph directly above. #
28+
# #
29+
################################################################################
30+
# - failhard: True

‎php/dev.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-dev:

‎php/fpm.sls

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{%- from "php/map.jinja" import php with context %}
22
3+
include:
4+
- php.deprecated
5+
36
php-fpm:
47
pkg.installed:
58
- name: {{ php.fpm_pkg }}

‎php/gd.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-gd:

‎php/imagick.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-imagick:

‎php/imap.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-imap:

‎php/init.sls

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{%- from "php/map.jinja" import php with context %}
22
3+
include:
4+
- php.deprecated
5+
36
{%- if not 'ng' in salt['pillar.get']('php', {}) %}
47
58
{%- if grains['os'] == "Ubuntu" %}

‎php/intl.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-intl:

‎php/json.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-json:

‎php/ldap.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-ldap:

‎php/mail.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-mail:

‎php/mbstring.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-mbstring:

‎php/mcrypt.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-mcrypt:

‎php/memcache.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-memcache:

‎php/memcached.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-memcached:

‎php/mongo.sls

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{%- set version = salt['pillar.get']('php:mongo_version', none) %}
44
55
include:
6+
- php.deprecated
67
- php
78
- php.xml
89
- php.dev

‎php/mysql.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-mysql:

‎php/mysqlnd.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-mysqlnd:

‎php/oauth.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-oauth:

‎php/pear.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-pear:

‎php/pgsql.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-pgsql:

‎php/readline.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-readline:

‎php/redis.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-redis:

‎php/soap.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-soap:

‎php/sqlite.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-sqlite:

‎php/suhosin.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
- php.dev
67

‎php/sybase.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-sybase:

‎php/xml.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-xml:

‎php/zip.sls

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{%- from "php/map.jinja" import php with context %}
22
33
include:
4+
- php.deprecated
45
- php
56
67
php-zip:

0 commit comments

Comments
 (0)