Replaced ConfigServiceProvider with Dotenv

.env.dist

@@ -0,0 +1,4 @@
+TOGGLE__DEBUG=true
+TOGGLE__ALLOWED_ORIGINS='["127.0.0.1"]'
+TOGGLE__REDIS_DSN="tcp://127.0.0.1:6379"
+TOGGLE__PREFIX="feature_toggle"

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 composer.phar
 /vendor/
 /config.json
+.env

.travis.yml

@@ -14,6 +14,8 @@ matrix:
     allow_failures:
         - php: hhvm-nightly
 
-before_script: composer install --dev
+before_script:
+    - composer install --dev
+    - cp .env.dist .env
 
 script: phpunit

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog for Qandidate toggle API
+
+## 0.3.x
+
+- Replaced `igorw/config-service-provider` with `vlucas/phpdotenv`. With this method there is [more flexibility to deploy] the API
+  `.env.dist` gives you the same configuration as `config.json.dist` gave you before.
+  But you will need to recreate your config if you adjusted the configuration.
+  Note that `TOGGLE__ALLOWED_ORIGINS` should be a JSON string and the name for the redis connection changed
+  from `uri` to `dsn` (`TOGGLE__REDIS_DSN`).
+
+[more flexibility to deploy]: http://12factor.net/config

README.md

@@ -19,10 +19,11 @@ Install the dependencies with composer:
 $ composer install
 ```
 
-The default configuration is mainly for local development. For running production you should create your own configuration file.
-
-Copy the `config.json.dist` to `config.json` and adjust where needed.
+Configuration is determined based on environment variables. Copy `.env.dist` to `.env` and adjust where needed. 
+You can override the values in the file with environment values.
+The default configuration is mainly for local development.
 
+The environment variable `TOGGLE__ALLOWED_ORIGINS` should be valid JSON. This is to allow arrays.
 
 ## Running the tests
 

app/bootstrap.php

@@ -23,12 +23,23 @@
 
 $app = new Application();
 
-$configFile = __DIR__ . '/../config.json';
-if (! file_exists($configFile)) {
-    $configFile = __DIR__ . '/../config.json.dist';
-}
+$env = new \Dotenv\Dotenv(__DIR__ . '/../');
+$env->load();
+$env->required(array(
+    'TOGGLE__DEBUG',
+    'TOGGLE__REDIS_DSN',
+    'TOGGLE__ALLOWED_ORIGINS',
+    'TOGGLE__PREFIX',
+));
 
-$app->register(new ConfigServiceProvider($configFile));
+$app['debug']                 = getenv('TOGGLE__DEBUG');
+$app['redis_dsn']             = getenv('TOGGLE__REDIS_DSN');
+$app['toggle.manager.prefix'] = getenv('TOGGLE__PREFIX');
+$app['allowed_origins']       = json_decode(getenv('TOGGLE__ALLOWED_ORIGINS'));
+
+if (JSON_ERROR_NONE !== json_last_error()) {
+    throw new RuntimeException('Failed to json_decode TOGGLE__ALLOWED_ORIGINS');
+}
 
 $app['env'] = getenv('env') ?: 'dev';
 
@@ -37,7 +48,7 @@
 }
 
 $app->register(new Predis\Silex\PredisServiceProvider(), array(
-    'predis.parameters' => $app['redis_uri'],
+    'predis.parameters' => $app['redis_dsn'],
 ));
 
 $app['toggle.manager.collection'] = $app->share(function ($app) {

composer.json

@@ -23,15 +23,14 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "silex/silex": "1.*",
-        "qandidate/toggle": "~0.1",
-        "predis/service-provider": "0.4.*",
-        "asm89/stack-cors": "~0.2.1",
-        "igorw/config-service-provider": "~1.2"
+        "silex/silex": "^1.0",
+        "qandidate/toggle": "^0.2@dev",
+        "predis/service-provider": "^0.4@dev",
+        "asm89/stack-cors": "^0.2.1@dev",
+        "vlucas/phpdotenv": "^2.0"
     },
     "require-dev": {
         "symfony/browser-kit": "~2.3"
     },
-    "minimum-stability": "dev",
     "prefer-stable": true
 }

web/index.php

@@ -17,7 +17,7 @@
 $app = require_once __DIR__ . '/../app/bootstrap.php';
 
 $stackedApp = new Cors($app, array(
-    'allowedOrigins' => $app['allowedOrigins'],
+    'allowedOrigins' => $app['allowed_origins'],
     'allowedMethods' => array('DELETE', 'GET', 'PUT', 'POST'),
     'allowedHeaders' => array('accept', 'content-type', 'origin', 'x-requested-with'),
 ));