Merge pull request #39 from whikloj/symfony-flex

Convert from Silex to Symfony 4 flex

Author: acoburn

.env.dev

@@ -0,0 +1,2 @@
+# TRELLIS_SOURCE_DIR=''
+TRELLIS_CONFIG_DIR='../'

.env.dist

@@ -0,0 +1,2 @@
+# TRELLIS_SOURCE_DIR='/path/to/files/to/serve'
+# TRELLIS_CONFIG_DIR='/path/to/directory/with/settings.yml'

.env.test

@@ -0,0 +1 @@
+TRELLIS_CONFIG_DIR='./test/resources/config'

.gitignore

@@ -1,5 +1,6 @@
 vendor/
 config/settings.yml
+settings.yml
 composer.lock
 .buildpath
 .project
@@ -8,3 +9,18 @@ composer.phar
 coverage.xml
 .DS_Store
 
+###> symfony/phpunit-brige ###
+/bin/.phpunit
+###< symfony/phpunit-bridge ###
+
+###> symfony/framework-bundle ###
+/.env.local
+/.env.*.local
+/public/bundles/
+/var/
+/vendor/
+###< symfony/framework-bundle ###
+
+###> symfony/web-server-bundle ###
+/.web-server-pid
+###< symfony/web-server-bundle ###

appveyor.yml

@@ -7,6 +7,9 @@ init:
     - SET PATH=C:\Program Files\OpenSSL;C:\tools\php71;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
 
+environment:
+    TRELLIS_CONFIG_DIR: test/resources/config/
+
 install:
     - ps: Set-Service wuauserv -StartupType Manual
     - cinst -y OpenSSL.Light

bin/console

@@ -0,0 +1,40 @@
+#!/usr/bin/env php
+<?php
+
+use App\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
+set_time_limit(0);
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Application::class)) {
+    throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
+}
+
+$input = new ArgvInput();
+if (null !== $_ENV['APP_ENV'] = $input->getParameterOption(['--env', '-e'], null, true)) {
+    putenv('APP_ENV='.$_ENV['APP_ENV']);
+    // force loading .env files when --env is defined
+    $_SERVER['APP_ENV'] = null;
+}
+
+if ($input->hasParameterOption('--no-debug', true)) {
+    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+}
+
+require dirname(__DIR__).'/src/.bootstrap.php';
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], $_SERVER['APP_DEBUG']);
+$application = new Application($kernel);
+$application->run($input);

bin/phpunit

@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+
+if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
+    echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
+    exit(1);
+}
+
+if (false === getenv('SYMFONY_PHPUNIT_VERSION')) {
+    putenv('SYMFONY_PHPUNIT_VERSION=6.5');
+}
+if (false === getenv('SYMFONY_PHPUNIT_REMOVE')) {
+    putenv('SYMFONY_PHPUNIT_REMOVE=');
+}
+if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
+    putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
+}
+
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';

composer.json

@@ -7,26 +7,71 @@
     "license": "Apache-2.0",
     "require": {
         "php": ">=7.1.0",
-        "silex/silex": "^2.0",
-        "symfony/config": "^3.4",
-        "symfony/yaml": "^3.4",
+        "ext-ctype": "*",
+        "ext-iconv": "*",
+        "symfony/console": "4.1.*",
+        "symfony/flex": "^1.1",
+        "symfony/framework-bundle": "4.1.*",
+        "symfony/yaml": "4.1.*",
         "easyrdf/easyrdf": "^0.9.1",
         "ml/json-ld": "^1.1",
-        "twig/twig": "^1.33"
+        "symfony/twig-bundle": "4.1.*"
     },
     "require-dev": {
+        "symfony/dotenv": "4.1.*",
+        "symfony/web-server-bundle": "4.1.*",
         "squizlabs/php_codesniffer": "^3.2",
-        "symfony/browser-kit": "^3.4",
-        "phpunit/phpunit": "^5.7"
+        "symfony/browser-kit": "4.1.*",
+        "symfony/phpunit-bridge": "4.1.*"
+    },
+    "config": {
+        "preferred-install": {
+            "*": "dist"
+        },
+        "sort-packages": true
     },
     "autoload": {
-        "psr-4": {"Trellis\\StaticLdp\\": "src/"}
+        "psr-4": {
+            "App\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "App\\Tests\\": "test/"
+        }
+    },
+    "replace": {
+        "paragonie/random_compat": "2.*",
+        "symfony/polyfill-ctype": "*",
+        "symfony/polyfill-iconv": "*",
+        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php56": "*"
     },
     "scripts": {
-        "check": "phpcs --standard=PSR2 src test index.php",
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+        },
+        "post-install-cmd": [
+            "@auto-scripts"
+        ],
+        "post-update-cmd": [
+            "@auto-scripts"
+        ],
+        "check": "phpcs --standard=PSR2 src test",
         "test": [
             "@check",
-            "phpunit"
+            "php ./bin/phpunit"
         ]
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
+    "extra": {
+        "symfony": {
+            "allow-contrib": false,
+            "require": "4.1.*"
+        }
     }
 }