Separates available_data from data/default keys

Author: jtreminio

src/Puphpet/MainBundle/Extension/Manager.php

@@ -40,13 +40,12 @@ public function addExtension($name)
         $available = is_array($available) ? $available : [];
 
         $mergedData = array_replace_recursive($data, $defaults);
-        $mergedData = array_merge($mergedData, $available);
-        $data       = array_merge($data, $available);
 
         $this->extensions[$name] = [
-            'defaults' => $defaults,
-            'data'     => $data,
-            'merged'   => $mergedData,
+            'available' => $available,
+            'data'      => $data,
+            'defaults'  => $defaults,
+            'merged'    => $mergedData,
         ];
 
         return $this;
@@ -82,6 +81,17 @@ public function getExtensionData($name)
         return $this->extensions[$name]['data'];
     }
 
+    /**
+     * @param string $name
+     * @return array
+     */
+    public function getExtensionAvailableData($name)
+    {
+        $name = str_replace('-', '_', $name);
+
+        return $this->extensions[$name]['available'];
+    }
+
     /**
      * @param array $data
      * @return string

src/Puphpet/MainBundle/Resources/config/apache/available.yml

@@ -33,7 +33,7 @@ empty_files_match:
     sethandler: 'proxy:fcgi://127.0.0.1:9000'
     custom_fragment: ''
 
-available_modules:
+modules:
     - cache
     - cgid
     - dav

src/Puphpet/MainBundle/Resources/config/drush/available.yml

@@ -1,4 +1,4 @@
-available_versions:
+versions:
     - 7.0.0-alpha3
     - 7.0.0-alpha2
     - 7.0.0-alpha1

src/Puphpet/MainBundle/Resources/config/elastic-search/available.yml

@@ -1,4 +1,4 @@
-available_versions:
+versions:
     - 1.4.1
     - 1.3.6
     - 1.2.3

src/Puphpet/MainBundle/Resources/config/hhvm/available.yml

@@ -1,8 +1,8 @@
-available_ini:
+ini:
     display_errors:
     error_reporting:
 
-available_timezones:
+timezones:
     Africa:
         - Africa/Abidjan
         - Africa/Accra

src/Puphpet/MainBundle/Resources/config/mailcatcher/available.yml

@@ -1 +0,0 @@
-available_settings:

src/Puphpet/MainBundle/Resources/config/mysql/available.yml

@@ -1,8 +1,8 @@
-available_versions:
+versions:
     - 5.6
     - 5.5
 
-available_privileges:
+privileges:
     "Give all":
         - ALL
     "or, Give some":

src/Puphpet/MainBundle/Resources/config/php/available.yml

@@ -1,4 +1,4 @@
-available_modules:
+modules:
     php:
         - bcmath
         - cgi
@@ -603,7 +603,7 @@ available_modules:
             - xmlwriter
             - xslcache
 
-available_ini:
+ini:
     allow_url_fopen:
     allow_url_include:
     always_populate_raw_post_data:

src/Puphpet/MainBundle/Resources/config/postgresql/available.yml

@@ -1,9 +1,15 @@
-available_privileges:
+privileges:
     - ALL
     - CREATE
     - CONNECT
     - TEMPORARY
 
+versions:
+    - "9.3"
+    - "9.2"
+    - "9.1"
+    - "8.4"
+
 empty_user:
     username: ~
     password: ~
@@ -17,9 +23,3 @@ empty_grant:
     privilege: ~
     db: ~
     role: ~
-
-available_versions:
-    - "9.3"
-    - "9.2"
-    - "9.1"
-    - "8.4"

src/Puphpet/MainBundle/Resources/config/python/available.yml

@@ -1,4 +1,4 @@
-available_versions:
+versions:
     - 2.6.9
     - 2.7.6
     - 3.1.5

src/Puphpet/MainBundle/Resources/config/ruby/available.yml

@@ -1,4 +1,4 @@
-available_versions:
+versions:
     - 1.8.6-p420
     - 1.8.7-p374
     - 1.9.1-p431

src/Puphpet/MainBundle/Resources/config/solr/available.yml

@@ -1,4 +1,4 @@
-available_versions:
+versions:
     - 4.10.2
     - 4.10.1
     - 4.10.0

src/Puphpet/MainBundle/Resources/config/users-groups/available.yml

@@ -1,3 +0,0 @@
-groups: []
-
-users: []

src/Puphpet/MainBundle/Resources/config/vagrantfile-aws/available.yml

@@ -1,10 +1,4 @@
-empty_synced_folder:
-    source: ~
-    target: ~
-    id: ~
-    nfs: false
-
-available_images:
+images:
 # US East (Northern Virginia) Region
     us-east-1:
         -
@@ -173,7 +167,7 @@ available_images:
                 - 5.4
                 - HHVM
 
-available_instance_types:
+instance_types:
     t1.micro: up to 2 ECUs, 1 vCPUs, 0.613 GiB memory, EBS only
     m1.small: 1 ECUs, 1 vCPUs, 1.7 GiB memory, 1 x 160 GiB Storage Capacity
     m1.medium: 2 ECUs, 1 vCPUs, 3.7 GiB memory, 1 x 410 GiB Storage Capacity
@@ -187,7 +181,7 @@ available_instance_types:
     c1.medium: 5 ECUs, 2 vCPUs, 1.7 GiB memory, 1 x 350 GiB Storage Capacity
     c1.xlarge: 20 ECUs, 8 vCPUs, 7 GiB memory, 4 x 420 GiB Storage Capacity
 
-available_regions:
+regions:
     ap-northeast-1: Asia Pacific (Tokyo) Region
     ap-southeast-1: Asia Pacific (Singapore) Region
     ap-southeast-2: Asia Pacific (Sydney) Region
@@ -196,3 +190,9 @@ available_regions:
     us-east-1: US East (Northern Virginia) Region
     us-west-1: US West (Northern California) Region
     us-west-2: US West (Oregon) Region
+
+empty_synced_folder:
+    source: ~
+    target: ~
+    id: ~
+    nfs: false

src/Puphpet/MainBundle/Resources/config/vagrantfile-digitalocean/available.yml

@@ -1,10 +1,4 @@
-empty_synced_folder:
-    source: ~
-    target: ~
-    id: ~
-    nfs: false
-
-available_images:
+images:
     -
         image: centos-7-0-x64
         long_name: CentOS 7 x64
@@ -36,7 +30,7 @@ available_images:
             - 5.4
             - HHVM
 
-available_sizes:
+sizes:
     512mb: 512MB / 1 CPU / 20GB SSD DISK / 1TB TRANSFER
     1gb: 1GB / 1 CPU / 30GB SSD DISK / 2TB TRANSFER
     2gb: 2GB / 2 CPUS / 40GB SSD DISK / 3TB TRANSFER
@@ -47,7 +41,7 @@ available_sizes:
     48gb: 48GB / 16 CPUS / 480GB SSD DISK / 8TB TRANSFER
     64gb: 64GB / 20 CPUS / 640GB SSD DISK / 9TB TRANSFER
 
-available_regions:
+regions:
     nyc1: New York 1
     nyc2: New York 2
     nyc3: New York 3
@@ -57,3 +51,9 @@ available_regions:
     ams3: Amsterdam 3
     sgp1: Singapore 1
     lon1: London 1
+
+empty_synced_folder:
+    source: ~
+    target: ~
+    id: ~
+    nfs: false

src/Puphpet/MainBundle/Resources/config/vagrantfile-gce/available.yml

@@ -1,10 +1,4 @@
-empty_synced_folder:
-    source: ~
-    target: ~
-    id: ~
-    nfs: false
-
-available_images:
+images:
     -
         image: debian-7-wheezy-v20141205
         long_name: Debian Wheezy 7 x64
@@ -28,7 +22,7 @@ available_images:
             - 5.4
             - HHVM
 
-available_machine_types:
+machine_types:
     f1-micro: 1 vCPU, 0.6 GB memory
     g1-small: 1 vCPU, 1.7 GB memory
     n1-standard-1: 1 vCPU, 3.75 GB memory
@@ -45,7 +39,7 @@ available_machine_types:
     n1-highcpu-8: 8 vCPU, 7.2 GB memory
     n1-highcpu-16: 16 vCPU, 14.4 GB memory
 
-available_zones:
+zones:
     asia-east1-a: asia-east1-a
     asia-east1-b: asia-east1-b
     asia-east1-c: asia-east1-c
@@ -55,3 +49,9 @@ available_zones:
     us-central1-a: us-central1-a
     us-central1-b: us-central1-b
     us-central1-f: us-central1-f
+
+empty_synced_folder:
+    source: ~
+    target: ~
+    id: ~
+    nfs: false

src/Puphpet/MainBundle/Resources/config/vagrantfile-ikoulacloud/available.yml

@@ -1,10 +1,4 @@
-empty_synced_folder:
-    source: ~
-    target: ~
-    id: ~
-    nfs: false
-
-available_images:
+images:
 #  Zone 3 France Direct Routing (Z03-R0-IKDC01-FR)
     'Zone 3 France Direct Routing (Z03-R0-IKDC01-FR)':
         -
@@ -18,13 +12,19 @@ available_images:
                 - 5.5
                 - HHVM
 
-available_service_offering_names:
+service_offering_names:
     t1.pico: 0.5 vCPUs, 0.512 GiB memory, 50 GiB
     t1.micro: 1 vCPUs, 1 GiB memory, 100 GiB
     m1.small: 1 vCPUs, 1.7 GiB memory, 100 GiB
     m1.medium: 2 vCPUs, 3.75 GiB memory, 100 GiB
     m1.large: 4 vCPUs, 7.5 GiB memory, 100 GiB
     m1.extralarge: 8 vCPUs, 15 GiB memory, 100 GiB
 
-available_zone_names:
+zone_names:
     'Zone 3 France Direct Routing (Z03-R0-IKDC01-FR)': 'Zone 3 France Direct Routing (Z03-R0-IKDC01-FR)'
+
+empty_synced_folder:
+    source: ~
+    target: ~
+    id: ~
+    nfs: false

src/Puphpet/MainBundle/Resources/config/vagrantfile-linode/available.yml

@@ -1,10 +1,4 @@
-empty_synced_folder:
-    source: ~
-    target: ~
-    id: ~
-    nfs: false
-
-available_distributions:
+distributions:
     -
         distribution: Debian 7
         long_name: Debian Wheezy 7.x x64
@@ -21,7 +15,7 @@ available_distributions:
             - 5.5
             - HHVM
 
-available_plans:
+plans:
     1024: 1GB / 1 CPU / 24GB SSD DISK / 2TB TRANSFER
     2048: 2GB / 2 CPU / 48GB SSD DISK / 3TB TRANSFER
     4096: 4GB / 4 CPUS / 96GB SSD DISK / 4TB TRANSFER
@@ -32,10 +26,16 @@ available_plans:
     65536: 64GB / 20 CPUS / 1536GB SSD DISK / 20TB TRANSFER
     98304: 96GB / 20 CPUS / 1920GB SSD DISK / 20TB TRANSFER
 
-available_datacenters:
+datacenters:
     newark: Newark
     atlanta: Atlanta
     fremont: Fremont
     dallas: Dallas
     london: London
     tokyo: Tokyo
+
+empty_synced_folder:
+    source: ~
+    target: ~
+    id: ~
+    nfs: false

src/Puphpet/MainBundle/Resources/config/vagrantfile-local/available.yml

@@ -1,25 +1,4 @@
-empty_synced_folder:
-    source: ~
-    target: ~
-    id: vagrant-root
-    sync_type: default
-    owner: 'www-data'
-    group: 'www-data'
-    rsync:
-        args:
-            - '--verbose'
-            - '--archive'
-            - '-z'
-        exclude:
-            - '.vagrant/'
-            - '.git/'
-        auto: true
-
-empty_forwarded_port:
-    host: ~
-    guest: ~
-
-available_providers:
+providers:
     -
         name: virtualbox
         long_name: VirtualBox
@@ -63,7 +42,7 @@ available_providers:
         performance: 3
         default_ip: 192.168.58.101
 
-available_boxes:
+boxes:
     -
         url: puphpet/centos65-x64
         os: centos
@@ -111,3 +90,24 @@ available_boxes:
             - 5.5
             - 5.4
             - HHVM
+
+empty_synced_folder:
+    source: ~
+    target: ~
+    id: vagrant-root
+    sync_type: default
+    owner: 'www-data'
+    group: 'www-data'
+    rsync:
+        args:
+            - '--verbose'
+            - '--archive'
+            - '-z'
+        exclude:
+            - '.vagrant/'
+            - '.git/'
+        auto: true
+
+empty_forwarded_port:
+    host: ~
+    guest: ~