From d723b7b87cb07aa5204e228618d9698a3e89fabc Mon Sep 17 00:00:00 2001
From: Kurt Bendlin <kurt@bendlin.de>
Date: Thu, 21 May 2015 11:26:30 +0200
Subject: [PATCH 1/3] require packages curl and cli. This also prevents the
 installing of apache on apt-get-systems

---
 php/composer.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/php/composer.sls b/php/composer.sls
index 530c723..b3bd307 100644
--- a/php/composer.sls
+++ b/php/composer.sls
@@ -2,7 +2,8 @@
 {% set install_file = php.local_bin + '/composer' %}
 
 include:
-  - php
+  - php.cli
+  - php.ng.curl
 
 get-composer:
   cmd.run:
@@ -10,7 +11,8 @@ get-composer:
     - unless: test -f {{ install_file }}
     - cwd: {{ php.temp_dir }}
     - require:
-      - pkg: php
+      - pkg: {{ php.cli_pkg }}
+      - pkg: {{ php.curl_pkg }}
 
 install-composer:
   cmd.wait:

From f51fe7ccb798ef40dac16009bbcbe105fd8560d0 Mon Sep 17 00:00:00 2001
From: Kurt Bendlin <kurt@bendlin.de>
Date: Thu, 21 May 2015 11:35:06 +0200
Subject: [PATCH 2/3] add oauth in php.ng

---
 php/ng/map.jinja | 3 +++
 php/ng/oauth.sls | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/php/ng/map.jinja b/php/ng/map.jinja
index 3c5f0fa..e2d6f2b 100644
--- a/php/ng/map.jinja
+++ b/php/ng/map.jinja
@@ -7,6 +7,7 @@
                 'apcu': 'php5-apcu',
                 'cgi': 'php5-cgi',
                 'cli': 'php5-cli',
+                'oauth': 'php5-oauth',
                 'apache2': 'libapache2-mod-php5',
                 'curl': 'php5-curl',
                 'fpm': 'php5-fpm',
@@ -58,6 +59,7 @@
                 'apcu': 'php-pecl-apcu',
                 'cgi': 'php-cgi',
                 'cli': 'php-cli',
+                'oauth': 'php-oauth',
                 'curl': ['php-common', 'curl'],
                 'fpm': 'php-fpm',
                 'gd': 'php-gd',
@@ -103,6 +105,7 @@
                 'php': 'php5',
                 'apache2': 'apache2-mod_php5',
                 'cli': 'php5',
+                'oauth': 'php5-oauth',
                 'curl': 'php5-curl',
                 'fpm': 'php5-fpm',
                 'gd': 'php5-gd',
diff --git a/php/ng/oauth.sls b/php/ng/oauth.sls
index c89b1ae..b100074 100644
--- a/php/ng/oauth.sls
+++ b/php/ng/oauth.sls
@@ -1,5 +1,2 @@
-{% from "php/map.jinja" import php with context %}
-
-php-oauth:
-  pkg.installed:
-    - name: {{ php.oauth_pkg }}
+{% set state = 'oauth' %}
+{% include "php/ng/installed.jinja" %}

From ef5d8ef20409d41d68b7f945fae5c04286c9e5dd Mon Sep 17 00:00:00 2001
From: Kurt Bendlin <kurt@bendlin.de>
Date: Thu, 21 May 2015 11:49:27 +0200
Subject: [PATCH 3/3] don't change composer.sls in oauth-branch

---
 php/composer.sls | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/php/composer.sls b/php/composer.sls
index b3bd307..530c723 100644
--- a/php/composer.sls
+++ b/php/composer.sls
@@ -2,8 +2,7 @@
 {% set install_file = php.local_bin + '/composer' %}
 
 include:
-  - php.cli
-  - php.ng.curl
+  - php
 
 get-composer:
   cmd.run:
@@ -11,8 +10,7 @@ get-composer:
     - unless: test -f {{ install_file }}
     - cwd: {{ php.temp_dir }}
     - require:
-      - pkg: {{ php.cli_pkg }}
-      - pkg: {{ php.curl_pkg }}
+      - pkg: php
 
 install-composer:
   cmd.wait: