psx migration (#33)

Author: chriskapp

.env

@@ -0,0 +1,7 @@
+APP_URL=http://127.0.0.1
+APP_APPS_URL=http://127.0.0.1/apps
+APP_ENV=dev
+APP_DEBUG=true
+APP_CONNECTION=pdo-sqlite://:memory:
+APP_MAILER=native://default
+APP_MAIL_SENDER=

.github/workflows/ci.yml

@@ -12,29 +12,25 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           coverage: none
       - name: Composer install
         run: composer install --no-interaction --no-ansi --no-progress
       - name: Run Psalm
         run: vendor/bin/psalm --no-progress --shepherd --show-info=false --stats
   phpunit:
     needs: psalm
-    name: "PHPUnit (PHP: ${{ matrix.php-versions }}-${{ matrix.database }})"
+    name: "PHPUnit (PHP: ${{ matrix.php-version }}-${{ matrix.connection }})"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions:
-          - 8.0
+        php-version:
           - 8.1
-        database:
-          - sqlite
-          - postgres
-          - mysql
-        exclude:
-          # exclude PHP 8.0 mysql build which is really slow
-          - php-versions: 8.0
-            database: mysql
+          - 8.2
+        connection:
+          - 'pdo-sqlite://:memory:'
+          - 'pdo-pgsql://postgres:postgres@localhost/fusio'
+          - 'pdo-mysql://root:test1234@localhost/fusio'
     services:
       postgres:
         image: postgres
@@ -50,7 +46,7 @@ jobs:
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: ${{ matrix.php-version }}
           coverage: none
       - name: Setup MySQL
         run: |
@@ -61,9 +57,9 @@ jobs:
         run: composer install --no-interaction --no-ansi --no-progress
       - name: Wait for
         env:
-          DB: ${{ matrix.database }}
+          APP_CONNECTION: ${{ matrix.connection }}
         run: php bin/fusio system:wait_for
       - name: Run PHPUnit
         env:
-          DB: ${{ matrix.database }}
+          APP_CONNECTION: ${{ matrix.connection }}
         run: vendor/bin/phpunit

LICENSE

@@ -3,6 +3,33 @@ Fusio implementation
 
 # About
 
-Fusio is an open source API management platform which helps to build and manage 
-RESTful APIs. This repository contains the Fusio backend code. More information
-about Fusio at https://www.fusio-project.org/
+Fusio is an open source API management platform which helps to create innovative API solutions. This repository contains
+the Fusio backend code. More information about Fusio at https://www.fusio-project.org/
+
+# Status
+
+This overview shows all Fusio related composer dependencies and the build status:
+
+| Package                                                                             | Status                                                                                             |
+|-------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------|
+| [fusio/impl](https://github.com/apioo/fusio-impl)                                   | ![Status](https://github.com/apioo/fusio-impl/actions/workflows/ci.yml/badge.svg)                  |
+| [fusio/cli](https://github.com/apioo/fusio-cli)                                     | ![Status](https://github.com/apioo/fusio-cli/actions/workflows/ci.yml/badge.svg)                   |
+| [fusio/model](https://github.com/apioo/fusio-model)                                 | ![Status](https://github.com/apioo/fusio-model/actions/workflows/ci.yml/badge.svg)                 |
+| [fusio/engine](https://github.com/apioo/fusio-engine)                               | ![Status](https://github.com/apioo/fusio-engine/actions/workflows/ci.yml/badge.svg)                |
+| [fusio/adapter-amqp](https://github.com/apioo/fusio-adapter-amqp)                   | ![Status](https://github.com/apioo/fusio-adapter-amqp/actions/workflows/ci.yml/badge.svg)          |
+| [fusio/adapter-beanstalk](https://github.com/apioo/fusio-adapter-beanstalk)         | ![Status](https://github.com/apioo/fusio-adapter-beanstalk/actions/workflows/ci.yml/badge.svg)     |
+| [fusio/adapter-cli](https://github.com/apioo/fusio-adapter-cli)                     | ![Status](https://github.com/apioo/fusio-adapter-cli/actions/workflows/ci.yml/badge.svg)           |
+| [fusio/adapter-elasticsearch](https://github.com/apioo/fusio-adapter-elasticsearch) | ![Status](https://github.com/apioo/fusio-adapter-elasticsearch/actions/workflows/ci.yml/badge.svg) |
+| [fusio/adapter-fcgi](https://github.com/apioo/fusio-adapter-fcgi)                   | ![Status](https://github.com/apioo/fusio-adapter-fcgi/actions/workflows/ci.yml/badge.svg)          |
+| [fusio/adapter-file](https://github.com/apioo/fusio-adapter-file)                   | ![Status](https://github.com/apioo/fusio-adapter-file/actions/workflows/ci.yml/badge.svg)          |
+| [fusio/adapter-graphql](https://github.com/apioo/fusio-adapter-graphql)             | ![Status](https://github.com/apioo/fusio-adapter-graphql/actions/workflows/ci.yml/badge.svg)       |
+| [fusio/adapter-http](https://github.com/apioo/fusio-adapter-http)                   | ![Status](https://github.com/apioo/fusio-adapter-http/actions/workflows/ci.yml/badge.svg)          |
+| [fusio/adapter-memcache](https://github.com/apioo/fusio-adapter-memcache)           | ![Status](https://github.com/apioo/fusio-adapter-memcache/actions/workflows/ci.yml/badge.svg)      |
+| [fusio/adapter-mongodb](https://github.com/apioo/fusio-adapter-mongodb)             | ![Status](https://github.com/apioo/fusio-adapter-mongodb/actions/workflows/ci.yml/badge.svg)       |
+| [fusio/adapter-php](https://github.com/apioo/fusio-adapter-php)                     | ![Status](https://github.com/apioo/fusio-adapter-php/actions/workflows/ci.yml/badge.svg)           |
+| [fusio/adapter-redis](https://github.com/apioo/fusio-adapter-redis)                 | ![Status](https://github.com/apioo/fusio-adapter-redis/actions/workflows/ci.yml/badge.svg)         |
+| [fusio/adapter-smtp](https://github.com/apioo/fusio-adapter-smtp)                   | ![Status](https://github.com/apioo/fusio-adapter-smtp/actions/workflows/ci.yml/badge.svg)          |
+| [fusio/adapter-soap](https://github.com/apioo/fusio-adapter-soap)                   | ![Status](https://github.com/apioo/fusio-adapter-soap/actions/workflows/ci.yml/badge.svg)          |
+| [fusio/adapter-sql](https://github.com/apioo/fusio-adapter-sql)                     | ![Status](https://github.com/apioo/fusio-adapter-sql/actions/workflows/ci.yml/badge.svg)           |
+| [fusio/adapter-stripe](https://github.com/apioo/fusio-adapter-stripe)               | ![Status](https://github.com/apioo/fusio-adapter-stripe/actions/workflows/ci.yml/badge.svg)        |
+| [fusio/adapter-util](https://github.com/apioo/fusio-adapter-util)                   | ![Status](https://github.com/apioo/fusio-adapter-util/actions/workflows/ci.yml/badge.svg)          |

README.md

@@ -27,35 +27,27 @@ $files = array(
 
 $autoloadFile = null;
 
-foreach($files as $file)
-{
-    if(file_exists($file))
-    {
+foreach ($files as $file) {
+    if (file_exists($file)) {
         $autoloadFile = $file;
         break;
     }
 }
 
-if(!empty($autoloadFile))
-{
+if (!empty($autoloadFile)) {
     require_once($autoloadFile);
 
-    $containerFile = strstr($autoloadFile, 'autoload.php', true) . '../container.php';  
+    $containerFile = strstr($autoloadFile, 'autoload.php', true) . '../container.php';
 
-    if(is_file($containerFile))
-    {
+    if (is_file($containerFile)) {
         $container = require_once($containerFile);
 
-        PSX\Framework\Bootstrap::setupEnvironment($container->get('config'));
+        PSX\Framework\Bootstrap::setupEnvironment();
 
-        $container->get('console')->run();
-    }
-    else
-    {
+        $container->get(\Symfony\Component\Console\Application::class)->run();
+    } else {
         die('Could not find container at: ' . $containerFile);
     }
-}
-else
-{
+} else {
     die('You need to set up the project dependencies through composer');
 }

bin/fusio

@@ -2,7 +2,7 @@
   "name": "fusio/impl",
   "description": "Fusio implementation",
   "homepage": "https://www.fusio-project.org",
-  "license": "AGPL-3.0-only",
+  "license": "Apache-2.0",
   "authors": [
     {
       "name": "Christoph Kappestein",
@@ -15,33 +15,32 @@
     "psalm": "@php vendor/vimeo/psalm/psalm"
   },
   "require": {
-    "php": ">=8.0",
-    "psx/framework": "^6.0",
+    "php": ">=8.1",
+    "psx/framework": "^7.1",
     "psx/openssl": "^2.0",
     "psx/cloudevents": "^1.0",
-    "fusio/cli": "^2.0",
-    "fusio/model": "^2.0",
-    "fusio/engine": "^5.0",
-    "fusio/adapter-file": "^5.0",
-    "fusio/adapter-graphql": "^5.0",
-    "fusio/adapter-http": "^5.0",
-    "fusio/adapter-php": "^5.0",
-    "fusio/adapter-smtp": "^5.0",
-    "fusio/adapter-soap": "^5.0",
-    "fusio/adapter-sql": "^5.0",
-    "fusio/adapter-util": "^5.0",
-    "fusio/adapter-cli": "^5.0",
-    "fusio/adapter-fcgi": "^5.0",
-    "firebase/php-jwt": "^5.0",
-    "doctrine/migrations": "^2.3",
-    "symfony/filesystem": "^5.0|^6.0",
+    "fusio/cli": "^3.0",
+    "fusio/model": "^3.0",
+    "fusio/engine": "^6.0",
+    "fusio/adapter-file": "^6.0",
+    "fusio/adapter-graphql": "^6.0",
+    "fusio/adapter-http": "^6.0",
+    "fusio/adapter-php": "^6.0",
+    "fusio/adapter-smtp": "^6.0",
+    "fusio/adapter-soap": "^6.0",
+    "fusio/adapter-sql": "^6.0",
+    "fusio/adapter-util": "^6.0",
+    "fusio/adapter-cli": "^6.0",
+    "fusio/adapter-fcgi": "^6.0",
+    "firebase/php-jwt": "^6.0",
+    "symfony/filesystem": "^6.0",
     "symfony/mailer": "^6.0",
-    "packaged/thrift": "^0.15",
+    "apache/thrift": "^0.18",
     "dragonmantank/cron-expression": "^3.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^8.0",
-    "vimeo/psalm": "^4.0"
+    "phpunit/phpunit": "^9.0",
+    "vimeo/psalm": "^5.0"
   },
   "autoload": {
     "psr-4": {

composer.json

@@ -1,10 +1,13 @@
 <?php
 
-return array(
+use Monolog\Logger;
+use function Symfony\Component\DependencyInjection\Loader\Configurator\env;
+
+return [
 
     // This array contains a list of worker endpoints which can be used by Fusio to execute action code in different
     // programming languages. For more information please take a look at our worker documentation:
-    // https://www.fusio-project.org/documentation/worker
+    // https://docs.fusio-project.org/docs/concepts/worker_api/
     /*
     'fusio_worker'            => [
         'java'                => 'localhost:9090',
@@ -34,12 +37,8 @@
     // provider file for more information
     'fusio_provider'          => __DIR__ . '/provider.php',
 
-    // Settings of the internal mailer. More information s.
-    // https://symfony.com/doc/current/mailer.html#using-built-in-transports
-    'fusio_mailer'            => 'native://default',
-
     // Describes the default email which Fusio uses as from address
-    'fusio_mail_sender'       => null,
+    'fusio_mail_sender'       => env('APP_MAIL_SENDER')->string(),
 
     // Indicates whether the marketplace is enabled. If yes it is possible to download and install other apps through
     // the backend
@@ -49,83 +48,41 @@
     'fusio_marketplace_url'   => 'https://www.fusio-project.org/marketplace.yaml',
 
     // The public url to the apps folder (i.e. http://acme.com/apps or http://apps.acme.com)
-    'fusio_apps_url'          => 'http://127.0.0.1/apps',
+    'fusio_apps_url'          => env('APP_APPS_URL')->string(),
 
     // Location where the apps are persisted from the marketplace. By default this is the public dir to access the apps
     // directly, but it is also possible to specify a different folder
     'fusio_apps_dir'          => __DIR__ . '/apps',
 
-    // The public url to the public folder (i.e. http://acme.com/public or http://acme.com)
-    'psx_url'                 => 'http://127.0.0.1',
+    // The url to the psx public folder (i.e. http://api.acme.com or http://127.0.0.1/psx/public)
+    'psx_url'                 => env('APP_URL')->string(),
 
-    // To enable clean urls you need to set this to '' this works only in case mod rewrite is activated
+    // The input path 'index.php/' or '' if every request is served to the index.php file
     'psx_dispatch'            => '',
 
-    // The default timezone
-    'psx_timezone'            => 'UTC',
+    // Defines the current environment i.e. prod or dev
+    'psx_env'                 => env('APP_ENV')->string()->default('prod'),
 
-    // Whether PSX runs in debug mode or not. If not error reporting is set to 0 also several caches are used if the
-    // debug mode is false
-    'psx_debug'               => true,
+    // Whether the app runs in debug mode or not. If not error reporting is set to 0, also several caches are used if
+    // the debug mode is false
+    'psx_debug'               => env('APP_DEBUG')->bool()->default(false),
 
     // Database parameters which are used for the doctrine DBAL connection
     // http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html
-    'psx_connection'          => getConnectionParams(getenv('DB')),
+    'psx_connection'          => env('APP_CONNECTION')->string(),
+
+    // Mailer connection which is used to send mails
+    // https://symfony.com/doc/current/mailer.html#using-built-in-transports
+    'psx_mailer'              => env('APP_MAILER')->string(),
+
+    'psx_migration_namespace' => 'Fusio\\Impl\\Migrations',
+
+    'psx_log_level'           => Logger::ERROR,
 
     // Folder locations
     'psx_path_cache'          => __DIR__ . '/cache',
+    'psx_path_log'            => __DIR__ . '/log',
     'psx_path_public'         => __DIR__ . '/public',
     'psx_path_src'            => __DIR__ . '/src',
 
-    // Supported writers
-    'psx_supported_writer'    => [
-        \PSX\Data\Writer\Json::class,
-        \PSX\Data\Writer\Jsonp::class,
-        \PSX\Data\Writer\Jsonx::class,
-    ],
-
-    // Global middleware which are applied before and after every request. Must bei either a classname, closure or
-    // PSX\Http\FilterInterface instance
-    //'psx_filter_pre'          => [],
-    //'psx_filter_post'         => [],
-
-    // A closure which returns a symfony cache implementation. If null the filesystem cache is used. Please take a look
-    //'psx_cache_factory'       => null,
-
-    // Specify a specific log level
-    //'psx_log_level' => \Monolog\Logger::ERROR,
-
-    // A closure which returns a monolog handler implementation. If null the system handler is used
-    //'psx_logger_factory'      => null,
-
-);
-
-function getConnectionParams($db)
-{
-    switch ($db) {
-        case 'mysql':
-            return [
-                'dbname'   => 'fusio',
-                'user'     => 'root',
-                'password' => 'test1234',
-                'host'     => 'localhost',
-                'driver'   => 'pdo_mysql',
-            ];
-
-        case 'postgres':
-            return [
-                'dbname'   => 'fusio',
-                'user'     => 'postgres',
-                'password' => 'postgres',
-                'host'     => 'localhost',
-                'driver'   => 'pdo_pgsql',
-            ];
-
-        default:
-        case 'sqlite':
-            return [
-                'memory' => true,
-                'driver' => 'pdo_sqlite',
-            ];
-    }
-}
+];

configuration.php

@@ -1,13 +1,10 @@
 <?php
 
-/*
-This file returns the global DI container for the application. The DI container
-which gets returned must be compatible with the symfony DI container interface.
-If you want load an different configuration depending on the environment you can 
-change the "config.file" parameter.
-*/
-
-$container = new Fusio\Impl\Dependency\Container();
-$container->setParameter('config.file', __DIR__ . '/configuration.php');
-
-return $container;
+return \PSX\Framework\Dependency\ContainerBuilder::build(
+    __DIR__,
+    true,
+    __DIR__ . '/vendor/psx/framework/resources/container.php',
+    __DIR__ . '/resources/container.php',
+    __DIR__ . '/tests/test_container.php',
+    ...\Fusio\Impl\Adapter\AdapterFinder::getFiles(__DIR__ . '/provider.php')
+);

container.php

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/bootstrap.php">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <!--<env name="DB" value="mysql" />-->
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>