fix: prevent running of states deprecated in v1.0.0

Author: nb

php/adodb.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-adodb:
-  pkg.installed:
-    - name: {{ php.adodb_pkg }}
+  - php.deprecated

php/apc.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-apc:
-  pkg.installed:
-    - name: {{ php.apc_pkg }}
+  - php.deprecated

php/apcu.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-apcu:
-  pkg.installed:
-    - name: {{ php.apcu_pkg }}
+  - php.deprecated

php/bcmath.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-bcmath:
-  pkg.installed:
-    - name: {{ php.bcmath_pkg }}
+  - php.deprecated

php/cgi.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-cgi:
-  pkg.installed:
-    - name: {{ php.cgi_pkg }}
+  - php.deprecated

php/cli.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-cli:
-  pkg.installed:
-    - name: {{ php.cli_pkg }}
+  - php.deprecated

php/composer.sls

@@ -1,53 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-{%- set install_file = php.local_bin + '/' + php.composer_bin %}
-
-{%- if not salt['config.get']('sudo_user') %}
-  {%- set salt_user = salt['config.get']('user', 'root') %}
-{%- else %}
-  {%- set salt_user = salt['config.get']('sudo_user', 'root') %}
-{%- endif %}
-
-{%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
-
 include:
-  - php
-
-get-composer:
-  file.managed:
-    - name: {{ php.temp_dir }}/installer
-    - mode: 0755
-    - unless: test -f {{ install_file }}
-    - source: https://getcomposer.org/installer
-    - source_hash: https://composer.github.io/installer.sig
-    - require:
-      - pkg: php
-
-install-composer:
-  cmd.run:
-    - name: php {{ php.temp_dir }}/installer --filename={{ php.composer_bin }} --install-dir={{ php.local_bin }}
-    - unless: test -f {{ install_file }}
-    - env:
-      - HOME: {{ salt_user_home }}
-    - require:
-      - file: get-composer
-
-# Get composer version date and check if older than 60day (defaultvalue of COMPOSER_DEV_WARNING_TIME)
-# then it's time to run `composer selfupdate`
-#
-# It would be nice if composer had a command line switch to get this, but it doesn't,
-# and so we just grep for it.
-#
-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 | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
-{% else %}
-    - unless: test $(date -d "60 days $({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
-{% endif %}
-    - cwd: {{ php.local_bin }}
-    - env:
-      - HOME: {{ salt_user_home }}
-    - require:
-      - cmd: install-composer
+  - php.deprecated

php/curl.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-curl:
-  pkg.installed:
-    - name: {{ php.curl_pkg }}
+  - php.deprecated

php/deprecated.sls

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+php-deprecated-in-v1.0.0-test-fail:
+  test.fail_without_changes:
+    - name: |
+        ################################################################################
+        #                                                                              #
+        #                   WARNING: BREAKING CHANGES SINCE `v1.0.0`                   #
+        #                                                                              #
+        ################################################################################
+        #                                                                              #
+        # Prior to `v1.0.0`, this formula provided two methods for managing php; the   #
+        # old method under `php` and the new method under `php.ng`. The old method     #
+        # has now been removed and `php.ng` has been promoted to be `PHP` in its       #
+        # place.                                                                       #
+        #                                                                              #
+        # If you are not in a position to migrate, please pin your repo to the final   #
+        # release tag before `v1.0.0`, i.e. `v0.37.1`.                                 #
+        #                                                                              #
+        # To migrate from `php.ng`, simply modify your pillar to promote the entire    #
+        # section under `php:ng` so that it is under `php` instead. So with the        #
+        # editor of your choice, highlight the entire section and then unindent one    #
+        # level. Finish by removing the `ng:` line.                                    #
+        #                                                                              #
+        # To migrate from the old `php`, first convert to `php.ng` under `v0.37.0`     #
+        # and then follow the steps laid out in the paragraph directly above.          #
+        #                                                                              #
+        ################################################################################
+    - failhard: True

php/dev.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-dev:
-  pkg.installed:
-    - name: {{ php.dev_pkg }}
+  - php.deprecated

php/fpm.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-php-fpm:
-  pkg.installed:
-    - name: {{ php.fpm_pkg }}
-  service.running:
-    - name: {{ php.fpm_service }}
-    - enable: True
+include:
+  - php.deprecated

php/gd.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-gd:
-  pkg.installed:
-    - name: {{ php.gd_pkg }}
+  - php.deprecated

php/imagick.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-imagick:
-  pkg.installed:
-    - name: {{ php.imagick_pkg }}
+  - php.deprecated

php/imap.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-imap:
-  pkg.installed:
-    - name: {{ php.imap_pkg }}
+  - php.deprecated

php/init.sls

@@ -1,30 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-{%- if not 'ng' in salt['pillar.get']('php', {}) %}
-
-  {%- if grains['os'] == "Ubuntu" %}
-    {%- set use_external_repo = salt['pillar.get']('php:use_external_repo', False) %}
-
-    {%- if use_external_repo %}
-      {%- set external_repo_name = salt['pillar.get']('php:external_repo_name', 'ondrej/php') %}
-
-php_from_ppa:
-  pkgrepo.managed:
-    - ppa: {{ external_repo_name }}
-    - env:
-      - LC_ALL: "C.UTF-8"
-    - require_in:
-      - pkg: php_from_ppa
-  pkg.latest:
-    - name: {{ php.php_pkg }}
-    - refresh: True
-
-    {%- endif %}
-
-  {%- endif %}
-
-php:
-  pkg.installed:
-    - name: {{ php.php_pkg }}
-
-{%- endif %}
+include:
+  - php.deprecated

php/intl.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-intl:
-  pkg.installed:
-    - name: {{ php.intl_pkg }}
+  - php.deprecated

php/json.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-json:
-  pkg.installed:
-    - name: {{ php.json_pkg }}
+  - php.deprecated

php/ldap.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-ldap:
-  pkg.installed:
-    - name: {{ php.ldap_pkg }}
+  - php.deprecated

php/mail.sls

@@ -1,8 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
 include:
-  - php
-
-php-mail:
-  pkg.installed:
-    - name : {{ php.mail_pkg }}
+  - php.deprecated