Hello Framework X!

.github/workflows/ci.yml

@@ -66,8 +66,8 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
       - run: composer install --no-dev
-      - run: docker run -d -v "$PWD":/home/frugal php:${{ matrix.php }}-fpm
-      - run: docker run -d -p 80:80 --link $(docker ps -qn1):php -v "$PWD":/home/frugal -v "$PWD"/examples/nginx/nginx.conf:/etc/nginx/conf.d/default.conf nginx:stable-alpine
+      - run: docker run -d -v "$PWD":/home/framework-x php:${{ matrix.php }}-fpm
+      - run: docker run -d -p 80:80 --link $(docker ps -qn1):php -v "$PWD":/home/framework-x -v "$PWD"/examples/nginx/nginx.conf:/etc/nginx/conf.d/default.conf nginx:stable-alpine
       - run: bash tests/await.sh http://localhost
       - run: bash tests/acceptance.sh http://localhost
 
@@ -88,7 +88,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
       - run: composer install --no-dev
-      - run: docker run -d -p 80:80 -v "$PWD":/home/frugal php:${{ matrix.php }}-apache sh -c "rmdir /var/www/html;ln -s /home/frugal/examples/apache /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
+      - run: docker run -d -p 80:80 -v "$PWD":/home/framework-x php:${{ matrix.php }}-apache sh -c "rmdir /var/www/html;ln -s /home/framework-x/examples/apache /var/www/html;ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled; apache2-foreground"
       - run: bash tests/await.sh http://localhost
       - run: bash tests/acceptance.sh http://localhost
 

README.md

@@ -1,13 +1,8 @@
-# Frugal
+# Framework X
 
-[![CI status](https://github.com/clue/frugalphp-incubator/workflows/CI/badge.svg)](https://github.com/clue/frugalphp-incubator/actions)
+[![CI status](https://github.com/clue-access/framework-x/workflows/CI/badge.svg)](https://github.com/clue-access/framework-x/actions)
 
-Lightweight microframework for fast, event-driven and async-first web applications, built on top of ReactPHP.
-
-[…]
-
-> TODO: Introduction text, start with the why. List some noticeable features.
-  Take a look at https://ninenines.eu/docs/en/cowboy/2.6/guide/modern_web/
+Framework X – the simple and fast micro framework for building reactive web applications that run anywhere.
 
 * [Quickstart](#quickstart)
 * [Documentation](#documentation)
@@ -20,26 +15,21 @@ First manually change your `composer.json` to include these lines:
 
 ```json
 {
-    …,
     "repositories": [
         {
             "type": "vcs",
-            "url": "https://github.com/clue-engineering/frugal"
+            "url": "https://github.com/clue-access/framework-x"
         }
     ]
 }
 ```
 
-> TODO: Change package name and register on Packagist.
-
-Simply install FrugalPHP:
+Simply install Framework X:
 
 ```bash
-$ composer require clue/frugal:dev-main
+$ composer require clue/framework-x:dev-main
 ```
 
-> TODO: Tagged release.
-
 Once everything is installed, you can now use this example to get started with
 a new `app.php` file:
 
@@ -49,7 +39,7 @@ a new `app.php` file:
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$app = new Frugal\App($loop);
+$app = new FrameworkX\App($loop);
 
 $app->get('/', function () {
     return new React\Http\Message\Response(

composer.json

@@ -1,8 +1,8 @@
 {
-    "name": "clue/frugal",
-    "description": "Lightweight microframework for fast, event-driven and async-first web applications, built on top of ReactPHP.",
-    "keywords": ["microframework", "web", "event-driven", "async", "ReactPHP"],
-    "homepage": "https://github.com/clue/frugalphp-incubator",
+    "name": "clue/framework-x",
+    "description": "Framework X – the simple and fast micro framework for building reactive web applications that run anywhere.",
+    "keywords": ["microframework", "micro", "framework", "web", "http", "event-driven", "async", "ReactPHP"],
+    "homepage": "https://framework-x.clue.engineering/",
     "license": "MIT",
     "authors": [
         {
@@ -21,12 +21,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Frugal\\": "src/"
+            "FrameworkX\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Frugal\\Tests\\": "tests/"
+            "FrameworkX\\Tests\\": "tests/"
         }
     }
 }

docs/api/app.md

@@ -12,7 +12,7 @@ to do its magic, hence you have to create it like this:
 require __DIR__ . '/vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$app = 🚀🚀🚀\App($loop);
+$app = FrameworkX\App($loop);
 
 // Register routes here, see routing…
 
@@ -30,7 +30,7 @@ $loop->run();
 >
 > require __DIR__ . '/vendor/autoload.php';
 >
-> $app = 🚀🚀🚀\App();
+> $app = FrameworkX\App();
 >
 > // Register routes here, see routing…
 >

docs/api/middleware.md

@@ -75,7 +75,7 @@ use Acme\Todo\AdminMiddleware;
 use Acme\Todo\UserController;
 
 $loop = React\EventLoop\Factory::create();
-$app = new 🚀🚀🚀\App($loop, new AdminMiddleware());
+$app = new FrameworkX\App($loop, new AdminMiddleware());
 
 $app->get('/user', new UserController());
 

docs/best-practices/controllers.md

@@ -14,7 +14,7 @@ To get started, let's take a look at the following simple closure definitions:
 require __DIR__ . '/vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$app = new Frugal\App($loop);
+$app = new FrameworkX\App($loop);
 
 $app->get('/', function () {
     return new React\Http\Message\Response(
@@ -50,7 +50,7 @@ definition into three even simpler files:
 require __DIR__ . '/vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$app = new Frugal\App($loop);
+$app = new FrameworkX\App($loop);
 
 $app->get('/', new Acme\Todo\HelloController());
 $app->get('/users/{name}', new Acme\Todo\UserController());

docs/getting-started/quickstart.md

@@ -23,7 +23,7 @@ You can use this example to get started by creating a new `app.php` file in your
 require __DIR__ . '/vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$app = new Frugal\App($loop);
+$app = new FrameworkX\App($loop);
 
 $app->get('/', function () {
     return new React\Http\Message\Response(
@@ -57,7 +57,7 @@ Next, we need to install X and its dependencies to actually run this project.
 >     "repositories": [
 >         {
 >             "type": "vcs",
->             "url": "https://github.com/clue-engineering/frugal"
+>             "url": "https://github.com/clue-access/framework-x"
 >         }
 >     ]
 > }
@@ -79,7 +79,7 @@ Thanks to [Composer](https://getcomposer.org/), this installation only requires
 In your project directory, simply run the following command:
 
 ```bash
-$ composer require clue/frugal:dev-main
+$ composer require clue/framework-x:-main
 ```
 
 This isn't NPM, so this should only take a moment or two.

examples/index.php

@@ -7,7 +7,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = Factory::create();
-$app = new Frugal\App($loop);
+$app = new FrameworkX\App($loop);
 
 $app->get('/', function () {
     return new React\Http\Message\Response(
@@ -101,8 +101,8 @@
 
 //$app->cgi('/adminer.php', __DIR__ . '/adminer.php');
 
-$app->get('/LICENSE', new Frugal\FilesystemHandler(dirname(__DIR__) . '/LICENSE'));
-$app->get('/source/{path:.*}', new Frugal\FilesystemHandler(dirname(__DIR__)));
+$app->get('/LICENSE', new FrameworkX\FilesystemHandler(dirname(__DIR__) . '/LICENSE'));
+$app->get('/source/{path:.*}', new FrameworkX\FilesystemHandler(dirname(__DIR__)));
 $app->redirect('/source', '/source/');
 
 $app->any('/method', function (ServerRequestInterface $request) {

examples/nginx/nginx.conf

@@ -1,5 +1,5 @@
 server {
-    root /home/frugal/examples/nginx/public;
+    root /home/framework-x/examples/nginx/public;
     index index.php index.html;
 
     location / {

phpunit.xml.dist

@@ -7,7 +7,7 @@
          colors="true"
          cacheResult="false">
     <testsuites>
-        <testsuite name="Frugal test suite">
+        <testsuite name="Framework X test suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

phpunit.xml.legacy

@@ -6,7 +6,7 @@
          bootstrap="vendor/autoload.php"
          colors="true">
     <testsuites>
-        <testsuite name="Frugal test suite">
+        <testsuite name="Framework X test suite">
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>

src/App.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Frugal;
+namespace FrameworkX;
 
 use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;

src/FilesystemHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Frugal;
+namespace FrameworkX;
 
 use Psr\Http\Message\ServerRequestInterface;
 use React\Http\Message\Response;

tests/AppTest.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Frugal\Tests;
+namespace FrameworkX\Tests;
 
 use FastRoute\Dispatcher;
 use FastRoute\RouteCollector;
-use Frugal\App;
+use FrameworkX\App;
+use FrameworkX\Tests\Stub\InvalidHandlerStub;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -14,7 +15,6 @@
 use React\Promise\PromiseInterface;
 use ReflectionMethod;
 use ReflectionProperty;
-use Frugal\Tests\Stub\InvalidHandlerStub;
 
 class AppTest extends TestCase
 {
@@ -712,7 +712,7 @@ public function testHandleRequestWithDispatcherWithRouteFoundReturnsInternalServ
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals(500, $response->getStatusCode());
         $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
-        $this->assertEquals("500 (Internal Server Error): <code>Frugal\Tests\Stub\InvalidHandlerStub</code> (<code title=\"See " . __DIR__ . DIRECTORY_SEPARATOR . "Stub" . DIRECTORY_SEPARATOR . "InvalidHandlerStub.php line $line\">InvalidHandlerStub.php:$line</code>) returned invalid value (<code>null</code>)\n", (string) $response->getBody());
+        $this->assertEquals("500 (Internal Server Error): <code>FrameworkX\Tests\Stub\InvalidHandlerStub</code> (<code title=\"See " . __DIR__ . DIRECTORY_SEPARATOR . "Stub" . DIRECTORY_SEPARATOR . "InvalidHandlerStub.php line $line\">InvalidHandlerStub.php:$line</code>) returned invalid value (<code>null</code>)\n", (string) $response->getBody());
     }
 
     public function testHandleRequestWithDispatcherWithRouteFoundReturnsInternalServerErrorResponseWhenClassMethodHandlerReturnsStringValue()
@@ -737,7 +737,7 @@ public function testHandleRequestWithDispatcherWithRouteFoundReturnsInternalServ
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals(500, $response->getStatusCode());
         $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
-        $this->assertEquals("500 (Internal Server Error): <code>Frugal\Tests\Stub\InvalidHandlerStub::index()</code> (<code title=\"See " . __DIR__ . DIRECTORY_SEPARATOR . "Stub" . DIRECTORY_SEPARATOR . "InvalidHandlerStub.php line $line\">InvalidHandlerStub.php:$line</code>) returned invalid value (<code>null</code>)\n", (string) $response->getBody());
+        $this->assertEquals("500 (Internal Server Error): <code>FrameworkX\Tests\Stub\InvalidHandlerStub::index()</code> (<code title=\"See " . __DIR__ . DIRECTORY_SEPARATOR . "Stub" . DIRECTORY_SEPARATOR . "InvalidHandlerStub.php line $line\">InvalidHandlerStub.php:$line</code>) returned invalid value (<code>null</code>)\n", (string) $response->getBody());
     }
 
     public function testHandleRequestWithDispatcherWithRouteFoundReturnsInternalServerErrorResponseWhenStaticClassMethodHandlerReturnsStringValue()
@@ -762,7 +762,7 @@ public function testHandleRequestWithDispatcherWithRouteFoundReturnsInternalServ
         $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertEquals(500, $response->getStatusCode());
         $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
-        $this->assertEquals("500 (Internal Server Error): <code>Frugal\Tests\Stub\InvalidHandlerStub::static()</code> (<code title=\"See " . __DIR__ . DIRECTORY_SEPARATOR . "Stub" . DIRECTORY_SEPARATOR . "InvalidHandlerStub.php line $line\">InvalidHandlerStub.php:$line</code>) returned invalid value (<code>null</code>)\n", (string) $response->getBody());
+        $this->assertEquals("500 (Internal Server Error): <code>FrameworkX\Tests\Stub\InvalidHandlerStub::static()</code> (<code title=\"See " . __DIR__ . DIRECTORY_SEPARATOR . "Stub" . DIRECTORY_SEPARATOR . "InvalidHandlerStub.php line $line\">InvalidHandlerStub.php:$line</code>) returned invalid value (<code>null</code>)\n", (string) $response->getBody());
     }
 
     public function testHandleRequestWithDispatcherWithRouteFoundReturnsInternalServerErrorResponseWhenGlobalFunctionHandlerReturnsStringValue()

tests/FilesystemHandlerTest.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Frugal\Tests;
+namespace FrameworkX\Tests;
 
-use Frugal\FilesystemHandler;
+use FrameworkX\FilesystemHandler;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use React\Http\Message\ServerRequest;

tests/Stub/InvalidHandlerStub.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Frugal\Tests\Stub;
+namespace FrameworkX\Tests\Stub;
 
 class InvalidHandlerStub
 {