Symfony 4.4 upgrade

Author: whikloj

.env.test

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

.gitignore

@@ -1,6 +1,6 @@
 vendor/
 config/settings.yml
-settings.yml
+/settings.yml
 composer.lock
 .buildpath
 .project

.travis.yml

@@ -11,7 +11,7 @@ before_install:
   - composer install
 
 env:
-    TRELLIS_CONFIG_DIR=test/resources/config/
+    TRELLIS_CONFIG_DIR=tests/resources/config/
 
 script:
   - composer test

appveyor.yml

@@ -8,7 +8,7 @@ init:
     - SET COMPOSER_NO_INTERACTION=1
 
 environment:
-    TRELLIS_CONFIG_DIR: test/resources/config/
+    TRELLIS_CONFIG_DIR: tests/resources/config/
     SYMFONY_DEPRECATIONS_HELPER: weak
 
 install:

bin/console

@@ -4,7 +4,11 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+use Symfony\Component\ErrorHandler\Debug;
+
+if (false === in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.\PHP_SAPI.' SAPI'.\PHP_EOL;
+}
 
 set_time_limit(0);
 
@@ -15,17 +19,15 @@ if (!class_exists(Application::class)) {
 }
 
 $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 (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
+    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
 }
 
 if ($input->hasParameterOption('--no-debug', true)) {
     putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
 }
 
-require dirname(__DIR__).'/src/.bootstrap.php';
+require dirname(__DIR__).'/config/bootstrap.php';
 
 if ($_SERVER['APP_DEBUG']) {
     umask(0000);
@@ -35,6 +37,6 @@ if ($_SERVER['APP_DEBUG']) {
     }
 }
 
-$kernel = new Kernel($_SERVER['APP_ENV'], $_SERVER['APP_DEBUG']);
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
 $application = new Application($kernel);
 $application->run($input);

bin/phpunit

@@ -1,19 +1,13 @@
 #!/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";
+if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+    echo "Unable to find the `simple-phpunit.php` 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';
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';

composer.json

@@ -9,20 +9,19 @@
         "php": ">=7.1.0",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "symfony/console": "4.2.*",
-        "symfony/flex": "^1.1",
-        "symfony/framework-bundle": "4.2.*",
-        "symfony/yaml": "4.2.*",
         "easyrdf/easyrdf": "^0.9.1",
         "ml/json-ld": "^1.1",
-        "symfony/twig-bundle": "4.2.*"
+        "symfony/console": "4.4.*",
+        "symfony/flex": "^1.3.1",
+        "symfony/framework-bundle": "4.4.*",
+        "symfony/twig-bundle": "4.4.*",
+        "symfony/yaml": "4.4.*"
     },
     "require-dev": {
-        "symfony/dotenv": "4.2.*",
-        "symfony/web-server-bundle": "4.2.*",
+        "symfony/dotenv": "4.4.*",
         "squizlabs/php_codesniffer": "^3.2",
-        "symfony/browser-kit": "4.2.*",
-        "symfony/phpunit-bridge": "4.2.*"
+        "symfony/phpunit-bridge": "4.4.*",
+        "symfony/browser-kit": "4.4.*"
     },
     "config": {
         "preferred-install": {
@@ -37,7 +36,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\Tests\\": "test/"
+            "App\\Tests\\": "tests/"
         }
     },
     "replace": {
@@ -59,7 +58,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "check": "phpcs --standard=PSR2 src test",
+        "check": "php ./vendor/bin/phpcs --standard=PSR2 src tests",
         "test": [
             "@check",
             "php ./bin/phpunit"
@@ -71,7 +70,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "4.2.*"
+            "require": "4.4.*"
         }
     }
 }