Merge a7ddf42 into d9a9b3a

byjg · Oct 16, 2022 · 81ef717 · 81ef717
2 parents d9a9b3a + a7ddf42
commit 81ef717
Show file tree

Hide file tree

Showing 16 changed files with 155 additions and 133 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -0,0 +1,41 @@
+name: PHPUnit
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - "*.*.*"
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: "0 8 * * 1"
+
+jobs:
+  Build:
+    runs-on: 'ubuntu-latest'
+    container: 'byjg/php:${{ matrix.php-version }}-cli'
+    strategy:
+      matrix:
+        php-version:
+          - "8.1"
+          - "8.0"
+          - "7.4"
+          - "7.3"
+          - "7.2"
+          - "7.1"
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: composer install
+      - run: ./vendor/bin/phpunit
+
+  Documentation:
+    runs-on: 'ubuntu-latest'
+    needs: Build
+    if: github.ref == 'refs/heads/master'
+    env:
+      DOC_GITHUB_TOKEN: '${{ secrets.DOC_TOKEN }}'
+    steps:
+      - uses: actions/checkout@v2
+      - run: curl https://opensource.byjg.com/add-doc.sh | bash /dev/stdin php restserver
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.lock
 vendor
 
 .idea
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,38 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug current Script in Console",
+            "type": "php",
+            "request": "launch",
+            "program": "${file}",
+            "cwd": "${fileDirname}",
+            "port": 0,
+            "runtimeArgs": [
+                "-dxdebug.start_with_request=yes"
+            ],
+            "env": {
+                "XDEBUG_MODE": "debug,develop",
+                "XDEBUG_CONFIG": "client_port=${port}"
+            }
+        },
+        {
+            "name": "PHPUnit Debug",
+            "type": "php",
+            "request": "launch",
+            "program": "${workspaceFolder}/vendor/bin/phpunit",
+            "cwd": "${workspaceFolder}",
+            "port": 0,
+            "runtimeArgs": [
+                "-dxdebug.start_with_request=yes"
+            ],
+            "env": {
+                "XDEBUG_MODE": "debug,develop",
+                "XDEBUG_CONFIG": "client_port=${port}"
+            }
+        }
+    ]
+}
diff --git a/README.md b/README.md
@@ -1,18 +1,22 @@
 # PHP Rest Server
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/byjg/restserver/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/byjg/restserver/?branch=master)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/40968662-27b2-4a31-9872-a29bdd68da2b/mini.png)](https://insight.sensiolabs.com/projects/40968662-27b2-4a31-9872-a29bdd68da2b)
-[![Build Status](https://travis-ci.com/byjg/restserver.svg?branch=master)](https://travis-ci.com/byjg/restserver)
+
+[![Build Status](https://github.com/byjg/restserver/actions/workflows/phpunit.yml/badge.svg?branch=master)](https://github.com/byjg/restserver/actions/workflows/phpunit.yml)
+[![Opensource ByJG](https://img.shields.io/badge/opensource-byjg-success.svg)](http://opensource.byjg.com)
+[![GitHub source](https://img.shields.io/badge/Github-source-informational?logo=github)](https://github.com/byjg/restserver/)
+[![GitHub license](https://img.shields.io/github/license/byjg/restserver.svg)](https://opensource.byjg.com/opensource/licensing.html)
+[![GitHub release](https://img.shields.io/github/release/byjg/restserver.svg)](https://github.com/byjg/restserver/releases/)
 
 
 Create RESTFull services with different and customizable output handlers (JSON, XML, Html, etc.).
 Auto-Generate routes from swagger.json definition.
 
-# Installation
+## Installation
 
 ```bash
 composer require "byjg/restserver=4.0.*"
 ```
-# Understanding the RestServer library
+
+## Understanding the RestServer library
 
 Basically the RestServer library enables you to create a full feature RESTFul 
 application on top of the well-known [FastRoute](https://github.com/nikic/FastRoute) library.
@@ -23,15 +27,15 @@ You can get this working in a few minutes. Just follow this steps:
     - Using Clousures (Easiest)
     - Using Classes
     - Using the OpenApi 2 (former Swagger) and OpenApi 3 documentation (the most reliable and for long-term and maintable applications)
-    
+
 2. Process the Request and output the Response
 
 Each "Path" or "Route" can have your own handle for output the response. 
 The are several handlers implemented and you can implement your own.
 
-# 1. Creating the Routes
+## 1. Creating the Routes
 
-## Using Closures
+### Using Closures
 
 ```php
 <?php
@@ -52,7 +56,7 @@ $restServer = new \ByJG\RestServer\HttpRequestHandler();
 $restServer->handle($routeDefinition);
 ```
 
-## Using Classes
+### Using Classes
 
 ```php
 <?php
@@ -94,7 +98,7 @@ class ClassName
 }
 ```
 
-## Auto-Generate from an OpenApi definition
+### Auto-Generate from an OpenApi definition
 
 [OpenApi](https://www.openapis.org/) is the world's largest framework of API developer tools for the 
 OpenAPI Specification(OAS), enabling development across the entire API lifecycle, from design and documentation, 
@@ -148,7 +152,7 @@ $restServer = new \ByJG\RestServer\HttpRequestHandler();
 $restServer->handle($routeDefinition);
 ```
 
-## Caching the Routes
+### Caching the Routes
 
 It is possible to cache the route by adding any PSR-16 instance on the second parameter of the constructor:
 
@@ -158,7 +162,7 @@ $routeDefinition = new \ByJG\RestServer\Route\OpenApiRouteDefinition(__DIR__ . '
 $routeDefinition->withCache(new \ByJG\Cache\Psr16\FileSystemCacheEngine());
 ```
 
-## Customizing the Handlers
+### Customizing the Handlers
 
 As the Swagger process is fully automated, you can define the handler by Mime Type or Route:
 
@@ -185,7 +189,7 @@ $routeDefinition->withOutputProcessorForRoute(
 );
 ```
 
-# 2. Processing the Request and Response
+## 2. Processing the Request and Response
 
 You need to implement a method, function or clousure with two parameters - Response and Request - in that order. 
 
@@ -222,7 +226,7 @@ informations to the requester.
 - addHeader($header, $value): Add an header entry;
 - setResponseCode($value): Set the HTTP response code (eg. 200, 401, etc)
 
-## Output your data 
+### Output your data
 
 To output your data you *have to* use the `$response->write($object)`. 
 The write method supports you output a object, stdclass, array or string. The Handler object will
@@ -279,7 +283,7 @@ The result will be something like:
 }
 ```
 
-# The OutputProcessors
+## The OutputProcessors
 
 An OutputProcessor will parse the `$response->write($obj)` and output in the proper format. 
 The available handlers are:
@@ -289,7 +293,7 @@ The available handlers are:
 - HtmlHandler
 - JsonCleanOutputProcessor
 
-## Using Custom Response Handler
+### Using Custom Response Handler
 
 The Default Response Handler will process all "$response->write" into a JSON.
 You can choose another Handlers. See below for a list of Available Response Handlers.
@@ -312,13 +316,10 @@ $restServer = new \ByJG\RestServer\HttpRequestHandler();
 $restServer->handle($routeDefinition);
 ```
 
-
-# Defining a Route
-
+## Defining a Route
 
 You can define route with constant and/or variable. For example:
 
-
 | Pattern                | Description |
 |------------------------|---------------------------------|
 | /myroute               | Matches exactly "/myroute"      |
@@ -340,28 +341,28 @@ all matches values can be obtained by
 $this->getRequest()->param('variable');
 ```
 
-# Running the rest server
+## Running the rest server
 
 You need to set up your restserver to handle ALL requests to a single PHP file. Normally is "app.php" 
 
-## PHP Built-in server
+### PHP Built-in server
 
-```
+```bash
 cd web
 php -S localhost:8080 app.php
 ```
 
-## Nginx 
+### Nginx
 
-```
+```nginx
 location / {
   try_files $uri $uri/ /app.php$is_args$args;
 }
 ```
 
-## Apache .htaccess
+### Apache .htaccess
 
-```
+```apache
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d

diff --git a/_config.yml b/_config.yml
diff --git a/composer.json b/composer.json
@@ -10,19 +10,19 @@
   "prefer-stable": true,
   "require": {
     "php": ">=5.6.0",
-    "byjg/serializer": "1.0.*",
+    "byjg/serializer": "dev-major_refactory",
     "byjg/singleton-pattern": "1.0.*",
     "nikic/fast-route": "v1.2.*",
-    "filp/whoops": "2.1.*",
+    "filp/whoops": "^2.14",
     "byjg/cache-engine": "4.0.*",
-    "byjg/webrequest": "^2.0.2",
+    "byjg/webrequest": "^5.0.0.x-dev",
     "ext-json": "*"
   },
   "suggest": {
     "ext-fileinfo": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.7.*|7.4.*"
+    "phpunit/phpunit": "5.7.*|7.4.*|^9.5"
   },
   "license": "MIT"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -11,8 +11,15 @@ and open the template in the editor.
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         testdox="true"
          stopOnFailure="false">
 
+    <php>
+        <ini name="display_errors" value="On" />
+        <ini name="display_startup_errors" value="On" />
+        <ini name="error_reporting" value="E_ALL" />
+    </php>
+
     <filter>
         <whitelist>
             <directory>./src</directory>

diff --git a/src/HttpRequestHandler.php b/src/HttpRequestHandler.php
@@ -44,7 +44,11 @@ protected function process(RouteDefinitionInterface $routeDefinition)
         // Get the URL parameters
         $httpMethod = $request->server('REQUEST_METHOD');
         $uri = parse_url($request->server('REQUEST_URI'), PHP_URL_PATH);
-        parse_str(parse_url($request->server('REQUEST_URI'), PHP_URL_QUERY), $queryStr);
+        $query = parse_url($request->server('REQUEST_URI'), PHP_URL_QUERY);
+        $queryStr = [];
+        if (!empty($query)) {
+            parse_str($query, $queryStr);
+        }
 
         // Generic Dispatcher for RestServer
         $dispatcher = $routeDefinition->getDispatcher();