Merge pull request #54 from haydenk/master

Update Composer state file to not use curl

php/composer.sls

@@ -1,23 +1,24 @@
 {% from "php/map.jinja" import php with context %}
-{% set install_file = php.local_bin + '/composer' %}
+{% set install_file = php.local_bin + '/' + php.composer_bin %}
 
 include:
   - php
 
 get-composer:
-  cmd.run:
-    - name: 'CURL=`which curl`; $CURL -sS https://getcomposer.org/installer | php'
+  file.managed:
+    - name: {{ php.temp_dir }}/installer
+    - mode: 0755
     - unless: test -f {{ install_file }}
-    - cwd: {{ php.temp_dir }}
+    - source: https://getcomposer.org/installer
+    - source_hash: {{ php.composer_hash }}
     - require:
       - pkg: php
 
 install-composer:
   cmd.wait:
-    - name: mv {{ php.temp_dir }}/composer.phar {{ install_file }}
-    - cwd: {{ php.temp_dir }}
+    - name: {{ php.temp_dir }}/installer --filename={{ php.composer_bin }} --install-dir={{ php.local_bin }}
     - watch:
-      - cmd: get-composer
+      - file: get-composer
 
 # Get COMPOSER_DEV_WARNING_TIME from the installed composer, and if that time has passed
 # then it's time to run `composer selfupdate`
@@ -29,6 +30,6 @@ update-composer:
   cmd.run:
     - name: "{{ install_file }} selfupdate"
     - unless: test $(grep --text COMPOSER_DEV_WARNING_TIME {{ install_file }} | egrep '^\s*define' | sed -e 's,[^[:digit:]],,g') \> $(php -r 'echo time();')
-    - cwd: {{ php.temp_dir }}
+    - cwd: {{ php.local_bin }}
     - require:
       - cmd: install-composer

php/map.jinja

@@ -36,6 +36,8 @@
         'ext_conf_path': '/etc/php5/mods-available',
         'local_bin': '/usr/local/bin',
         'temp_dir': '/tmp',
+        'composer_bin': 'composer',
+        'composer_hash': 'sha256=6a1ba6495f0bdb8e7735a7a76948b61c54b4a57b56837a9e9f93b4a0ac1f83a5',
     },
     'RedHat': {
         'php_pkg': 'php',
@@ -74,6 +76,8 @@
         'ext_conf_path': '/etc/php5/conf.d',
         'local_bin': '/usr/local/bin',
         'temp_dir': '/tmp',
+        'composer_bin': 'composer',
+        'composer_hash': 'sha256=6a1ba6495f0bdb8e7735a7a76948b61c54b4a57b56837a9e9f93b4a0ac1f83a5',
     },
     'Suse': {
         'php_pkg': 'php5',
@@ -103,5 +107,7 @@
         'ext_conf_path': '/etc/php5/conf.d',
         'local_bin': '/usr/local/bin',
         'temp_dir': '/tmp',
+        'composer_bin': 'composer',
+        'composer_hash': 'sha256=6a1ba6495f0bdb8e7735a7a76948b61c54b4a57b56837a9e9f93b4a0ac1f83a5',
     },
 }, merge=salt['pillar.get']('php:lookup')) %}