Merge pull request #130 from saltstack-formulas/revert-129-master

Revert "Move state php_{{ phpng_version }}_link to cli/install.sls "

php/ng/cli/install.sls

@@ -1,13 +1,2 @@
 {% set state = 'cli' %}
 {% include "php/ng/installed.jinja" %}
-
-
-php_{{ phpng_version }}_link:
-  alternatives.set:
-    - name: php
-    - path: /usr/bin/php{{ phpng_version }}
-    - require_in:
-      - pkg: php_install_{{ state }}
-    - onlyif:
-      - which php
-      - test {{ current_php }} != $(which php{{ phpng_version }})

php/ng/installed.jinja

@@ -47,6 +47,16 @@ php_ppa_{{ state }}:
     - onchanges:
       - pkgrepo: php_ppa_{{ state }}
 
+php_{{ phpng_version }}_link:
+  alternatives.set:
+    - name: php
+    - path: /usr/bin/php{{ phpng_version }}
+    - require_in:
+      - pkg: php_install_{{ state }}
+    - onlyif:
+      - which php
+      - test {{ current_php }} != $(which php{{ phpng_version }})
+
   {% endif %}
 {% endif %}