replace Silex with Symfony

Author: othillo

.env

@@ -0,0 +1,21 @@
+# In all environments, the following files are loaded if they exist,
+# the latter taking precedence over the former:
+#
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
+
+APP_ENV=dev
+APP_SECRET="I'm on a boat"
+APP_DEBUG=true
+TOGGLE__ALLOWED_ORIGINS='["127.0.0.1"]'
+TOGGLE__REDIS_DSN="tcp://127.0.0.1:6379"
+TOGGLE__PREFIX="feature_toggle"

.env.dist

@@ -0,0 +1,4 @@
+# define your env variables for the test env here
+APP_ENV=test
+APP_DEBUG=false
+KERNEL_CLASS='Qandidate\Application\Toggle\Kernel'

.env.test

@@ -43,8 +43,6 @@ jobs:
         run: "composer validate --strict --no-interaction --ansi"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
-      - name: "Use default environment variables"
-        run: "cp .env.dist .env"
       - name: "Run tests"
         run: "make test"
 
@@ -61,8 +59,6 @@ jobs:
           coverage: "none"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
-      - name: "Use default environment variables"
-        run: "cp .env.dist .env"
       - name: "Check coding standards"
         run: "make php-cs-fixer-ci"
 
@@ -79,7 +75,5 @@ jobs:
           coverage: "none"
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
-      - name: "Use default environment variables"
-        run: "cp .env.dist .env"
       - name: "Run PHPStan"
         run: "make phpstan"

.github/workflows/ci.yml

@@ -3,5 +3,9 @@ composer.lock
 composer.phar
 /vendor/
 /config.json
-.env
 .php-cs-fixer.cache
+.phpunit.result.cache
+/var/
+/.env.local
+/.env.local.php
+/.env.*.local

.gitignore

@@ -5,9 +5,9 @@
 $config->setFinder(
     \PhpCsFixer\Finder::create()
         ->in([
-            __DIR__ . '/app',
+            __DIR__ . '/src',
             __DIR__ . '/test',
-            __DIR__ . '/web',
+            __DIR__ . '/public',
         ])
 );
 

.php-cs-fixer.php

@@ -21,7 +21,7 @@ php-cs-fixer-ci:
 
 PHONY: phpstan
 phpstan:
-	vendor/bin/phpstan analyse --level=max app/ web/
+	vendor/bin/phpstan analyse --level=max src/ public/
 
 .PHONY: changelog
 changelog:

Makefile

@@ -19,7 +19,7 @@ Install the dependencies with composer:
 make dependencies
 ```
 
-Configuration is determined based on environment variables. Copy `.env.dist` to `.env` and adjust where needed. 
+Configuration is determined based on environment variables. See the `.env.*` files.
 You can override the values in the file with environment values.
 The default configuration is mainly for local development.
 
@@ -36,7 +36,7 @@ make test
 
 ## Running the app
 
-With your favorite webserver (or with `php -S` for local testing) point your document root to the web folder.
+With your favorite webserver (or with `php -S 127.0.0.1:1337 -t public` for local testing) point your document root to the `public` folder.
 
 ## Endpoints
 

README.md

@@ -1,43 +1,63 @@
 {
-    "name": "qandidate/toggle-api",
-    "description": "Api interface for your toggles.",
-    "keywords": ["feature", "flipping", "flip", "switch", "bits", "trigger", "toggle", "api"],
-    "license": "MIT",
-    "authors": [
-      {
-        "name": "Alexander",
-        "email": "[email protected]"
-      },
-      {
-        "name": "othillo",
-        "email": "[email protected]"
-      },
-      {
-        "name": "Willem-Jan",
-        "email": "[email protected]"
-      },
-      {
-        "name": "Qandidate.com",
-        "homepage": "http://labs.qandidate.com/"
-      }
-    ],
-    "require": {
-        "php": ">=7.2",
-        "ext-json": "*",
-        "silex/silex": "^2.0",
-        "qandidate/toggle": "^2.0",
-        "predis/service-provider": "^2.0",
-        "asm89/stack-cors": "^2.0",
-        "vlucas/phpdotenv": "^5.0"
+  "name": "qandidate/toggle-api",
+  "description": "Api interface for your toggles.",
+  "keywords": [
+    "feature",
+    "flipping",
+    "flip",
+    "switch",
+    "bits",
+    "trigger",
+    "toggle",
+    "api"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Alexander",
+      "email": "[email protected]"
     },
-    "require-dev": {
-        "symfony/browser-kit": "^4.4",
-        "phpunit/phpunit": "^7.0",
-        "broadway/coding-standard": "^1.2",
-        "phpstan/phpstan": "@stable"
+    {
+      "name": "othillo",
+      "email": "[email protected]"
     },
-    "prefer-stable": true,
-    "autoload-dev": {
-      "psr-0": {"Qandidate\\Application\\Toggle": "test/"}
+    {
+      "name": "Willem-Jan",
+      "email": "[email protected]"
+    },
+    {
+      "name": "Qandidate.com",
+      "homepage": "http://labs.qandidate.com/"
+    }
+  ],
+  "require": {
+    "php": ">=7.2",
+    "ext-json": "*",
+    "qandidate/toggle": "^2.0",
+    "asm89/stack-cors": "^2.0",
+    "symfony/http-foundation": "^5.2",
+    "symfony/http-kernel": "^5.2",
+    "symfony/framework-bundle": "^5.2",
+    "qandidate/toggle-bundle": "^1.4",
+    "symfony/security-bundle": "^5.2",
+    "predis/predis": "^1.1",
+    "symfony/dotenv": "^5.2",
+    "symfony/dependency-injection": "^5.2"
+  },
+  "require-dev": {
+    "symfony/browser-kit": "^5.2",
+    "phpunit/phpunit": "^8.0",
+    "broadway/coding-standard": "^1.2",
+    "phpstan/phpstan": "@stable"
+  },
+  "autoload": {
+    "psr-4": {
+      "Qandidate\\Application\\Toggle\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Qandidate\\Application\\Toggle\\": "test/"
     }
+  }
 }

app/bootstrap.php

@@ -0,0 +1,2 @@
+parameters:
+	checkMissingIterableValueType: false

composer.json

@@ -8,22 +8,21 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./vendor/autoload.php"
+         bootstrap="./test/bootstrap.php"
 >
   <testsuites>
     <testsuite name="Qandidate Toggle Api Test Suite">
-      <directory>./test/Qandidate/</directory>
+      <directory>./test/</directory>
     </testsuite>
   </testsuites>
 
   <filter>
     <whitelist>
-      <directory suffix=".php">./app/</directory>
+      <directory suffix=".php">./src/</directory>
     </whitelist>
   </filter>
 
   <php>
-    <env name="env" value="test" />
+    <env name="APP_ENV" value="test" force="true"/>
   </php>
 </phpunit>

phpstan.neon

@@ -14,19 +14,22 @@
 require_once __DIR__.'/../vendor/autoload.php';
 
 use Asm89\Stack\Cors;
+use Qandidate\Application\Toggle\Kernel;
+use Symfony\Component\Dotenv\Dotenv;
 use Symfony\Component\HttpFoundation\Request;
 
-$app = require_once __DIR__.'/../app/bootstrap.php';
+(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
 
-$stackedApp = new Cors($app, [
-    'allowedOrigins' => $app['allowed_origins'],
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+
+$stackedApp = new Cors($kernel, [
+    'allowedOrigins' => $_SERVER['TOGGLE__ALLOWED_ORIGINS'] ? json_decode((string) $_SERVER['TOGGLE__ALLOWED_ORIGINS'], true) : [],
     'allowedMethods' => ['DELETE', 'GET', 'PUT', 'POST'],
     'allowedHeaders' => ['accept', 'content-type', 'origin', 'x-requested-with'],
 ]);
 
 $request = Request::createFromGlobals();
-
 $response = $stackedApp->handle($request);
-$response->send();
 
-$app->terminate($request, $response);
+$response->send();
+$kernel->terminate($request, $response);