Drupal 9 testing and updates

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   test_php:
     working_directory: /srv
     docker:
-      - image: lastcallmedia/php:7.0-dev
+      - image: lastcallmedia/php:7.3-dev
     steps:
       - checkout
       - restore_cache:
@@ -28,13 +28,13 @@ jobs:
       - store_test_results:
           path: /phpunit
 
-  test_drupal_8.4.0:
+  test_drupal_8.9:
     working_directory: /srv
     docker:
-      - image: lastcallmedia/php:7.0-dev
+      - image: lastcallmedia/php:7.3-dev
     steps:
       - checkout
-      - run: composer require drupal/core:8.7.0 --no-update
+      - run: composer require drupal/core:8.9.10 --no-update
       - restore_cache:
           key: composer-v4-{{ checksum "composer.json" }}
       - run: composer install
@@ -47,19 +47,38 @@ jobs:
       - store_test_results:
           path: /phpunit
 
-  test_drupal_8.8.10:
+  test_drupal_9:
     working_directory: /srv
     docker:
-      - image: lastcallmedia/php:7.0-dev
+      - image: lastcallmedia/php:7.3-dev
     steps:
       - checkout
-      - run: composer require drupal/core:8.8.10 --no-update
+      - run: composer require drupal/core:9.0.x-dev --no-update
       - restore_cache:
           key: composer-v4-{{ checksum "composer.json" }}
       - run: composer install
       - save_cache:
           key: composer-v4-{{ checksum "composer.json" }}
-          paths: [vendor, composer.lock]
+          paths: [ vendor, composer.lock ]
+      - run: |
+          mkdir -p /phpunit
+          DRUPAL_ROOT=vendor/drupal vendor/bin/phpunit --testsuite=Drupal --log-junit=/phpunit/drupal.xml
+      - store_test_results:
+          path: /phpunit
+
+  test_drupal_9_latest:
+    working_directory: /srv
+    docker:
+      - image: lastcallmedia/php:7.3-dev
+    steps:
+      - checkout
+      - run: composer require drupal/core:9.1.x-dev --no-update
+      - restore_cache:
+          key: composer-v4-{{ checksum "composer.json" }}
+      - run: composer install
+      - save_cache:
+          key: composer-v4-{{ checksum "composer.json" }}
+          paths: [ vendor, composer.lock ]
       - run: |
           mkdir -p /phpunit
           DRUPAL_ROOT=vendor/drupal vendor/bin/phpunit --testsuite=Drupal --log-junit=/phpunit/drupal.xml
@@ -87,7 +106,7 @@ jobs:
   build_demo:
     working_directory: /srv
     docker:
-      - image: lastcallmedia/php:7.0-dev
+      - image: lastcallmedia/php:7.3-dev
     steps:
       - checkout
       - attach_workspace:
@@ -172,14 +191,15 @@ workflows:
   test_and_deploy:
     jobs:
       - test_php
-      - test_drupal_8.4.0
-      - test_drupal_8.8.10
+      - test_drupal_8.9
+      - test_drupal_9
+      - test_drupal_9_latest
       - test_ui
       - build_site
       - build_demo:
           requires: [test_ui]
       - deploy_split:
-          requires: [test_php, test_drupal_8.4.0, test_drupal_8.8.10]
+          requires: [test_php, test_drupal_8.9, test_drupal_9, test_drupal_9_latest]
       - deploy_ui:
           requires: [test_ui]
           filters:

.env

@@ -0,0 +1,14 @@
+# 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

.env.test

@@ -0,0 +1,4 @@
+# define your env variables for the test env here
+KERNEL_CLASS='App\Kernel'
+APP_SECRET='$ecretf0rt3st'
+SYMFONY_DEPRECATIONS_HELPER=999999

.gitignore

@@ -2,3 +2,19 @@ vendor/
 /cache/
 composer.lock
 .php_cs.cache
+
+###> friendsofphp/php-cs-fixer ###
+/.php_cs
+/.php_cs.cache
+###< friendsofphp/php-cs-fixer ###
+
+###> phpunit/phpunit ###
+/phpunit.xml
+.phpunit.result.cache
+###< phpunit/phpunit ###
+
+###> symfony/phpunit-bridge ###
+.phpunit
+.phpunit.result.cache
+/phpunit.xml
+###< symfony/phpunit-bridge ###

bin/console

@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+
+use App\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\ErrorHandler\Debug;
+
+if (!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);
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Application::class)) {
+    throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
+}
+
+$input = new ArgvInput();
+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__).'/config/bootstrap.php';
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_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=symfony/yaml');
+}
+if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
+    putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
+}
+
+require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit';

composer.json

@@ -17,22 +17,26 @@
     },
     "require": {
         "php": ">7.0",
-        "symfony/console": "^2.7 ||^3.0",
-        "symfony/filesystem": "^2.7 ||^3.0",
-        "symfony/process": "^2.7 ||^3.0",
-        "silex/silex": ">=2.0 <2.3",
+        "symfony/console": "^3.0 ||^4.0",
+        "symfony/filesystem": "^3.0 ||^4.0",
+        "symfony/process": "^3.0 ||^4.0",
         "pimple/pimple": "^3.0",
-        "symfony/yaml": "^2.7 ||^3.0",
+        "symfony/yaml": "^3.0 ||^4.0",
         "symfony/finder": "^2.7 ||^3.0",
-        "twig/twig": "^1.3.0",
+        "twig/twig": "^1.41.0 ||^2.12.0",
         "psr/cache": "~1.0",
         "sebastian/version": "^1.0 || ^2.0",
-        "symfony/expression-language": "^2.7 ||^3.0",
-        "symfony/asset": "^2.7 || ^3.0",
-        "symfony/cache": "^3.3"
+        "symfony/expression-language": "^3.0 ||^4.0",
+        "symfony/asset": "^3.0 ||^4.0",
+        "symfony/cache": "^3.3",
+        "symfony/flex": "^1.10",
+        "symfony/http-foundation": "^3.4 ||^4.4",
+        "symfony/http-kernel": "^3.4 ||^4.4",
+        "symfony/routing": "^3.4 ||^4.4",
+        "symfony/web-link": "^3.4 ||^4.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.1",
+        "phpunit/phpunit": "^7.0",
         "friendsofphp/php-cs-fixer": "^2.3",
         "symfony/phpunit-bridge": "^2.7 || ^3.3",
         "mikey179/vfsStream": "^1.6"

config/bootstrap.php

@@ -0,0 +1,23 @@
+<?php
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Dotenv::class)) {
+    throw new LogicException('Please run "composer require symfony/dotenv" to load the ".env" files configuring the application.');
+}
+
+// Load cached env vars if the .env.local.php file exists
+// Run "composer dump-env prod" to create it (requires symfony/flex >=1.2)
+if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env['APP_ENV']) || ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? $env['APP_ENV']) === $env['APP_ENV'])) {
+    (new Dotenv(false))->populate($env);
+} else {
+    // load all the .env files
+    (new Dotenv(false))->loadEnv(dirname(__DIR__).'/.env');
+}
+
+$_SERVER += $_ENV;
+$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';
+$_SERVER['APP_DEBUG'] = $_SERVER['APP_DEBUG'] ?? $_ENV['APP_DEBUG'] ?? 'prod' !== $_SERVER['APP_ENV'];
+$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = (int) $_SERVER['APP_DEBUG'] || filter_var($_SERVER['APP_DEBUG'], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';

config/packages/prod/routing.yaml

@@ -0,0 +1,3 @@
+framework:
+    router:
+        strict_requirements: null

config/packages/routing.yaml

@@ -0,0 +1,7 @@
+framework:
+    router:
+        utf8: true
+
+        # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
+        # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+        #default_uri: http://localhost

config/routes.yaml

@@ -0,0 +1,3 @@
+#index:
+#    path: /
+#    controller: App\Controller\DefaultController::index

config/routes/annotations.yaml

@@ -0,0 +1,7 @@
+controllers:
+    resource: ../../src/Controller/
+    type: annotation
+
+kernel:
+    resource: ../../src/Kernel.php
+    type: annotation

src/Core/AppArgumentValueResolver.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace LastCall\Mannequin\Core;
+
+use Application\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Controller\ArgumentValueResolverInterface;
+use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
+
+class AppArgumentValueResolver implements ArgumentValueResolverInterface
+{
+    private $app;
+
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports(Request $request, ArgumentMetadata $argument)
+    {
+        return null !== $argument->getType() && (Application::class === $argument->getType() || is_subclass_of($argument->getType(), Application::class));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolve(Request $request, ArgumentMetadata $argument)
+    {
+        yield $this->app;
+    }
+}