wip

build.php

@@ -1,17 +1,35 @@
 <?php
 
-function runDir(String $base, String $dir, array &$lines): int
+function prioritySort(string $dir, array $entries, array $priority): array
+{
+    $result = array();
+    foreach ($priority as $file) {
+        if (dirname($file) == $dir) {
+            if (in_array(basename($file), $entries)) {
+                array_push($result, basename($file));
+            }
+        }
+    }
+    $entries = array_diff($entries, $result);
+    sort($entries);
+    foreach ($entries as $entry) {
+        array_push($result, $entry);
+    }
+    return $result;
+}
+
+function runDir(string $base, string $dir, array &$lines, array $priority): int
 {
     $count = 0;
     $entries = scandir($dir);
-    sort($entries);
+    $entries = prioritySort($dir, $entries, $priority);
     foreach ($entries as $entry) {
         if ($entry === '.' || $entry === '..') {
             continue;
         }
         $filename = "$base/$dir/$entry";
         if (is_dir($filename)) {
-            $count += runDir($base, "$dir/$entry", $lines);
+            $count += runDir($base, "$dir/$entry", $lines, $priority);
         }
     }
     foreach ($entries as $entry) {
@@ -21,6 +39,7 @@ function runDir(String $base, String $dir, array &$lines): int
                 continue;
             }
             $data = file_get_contents($filename);
+            $data = preg_replace('|/\*\*.*?\*/|s', '', $data);
             array_push($lines, "// file: $dir/$entry");
             foreach (explode("\n", $data) as $line) {
                 if (!preg_match('/^<\?php|^namespace |^use |spl_autoload_register|declare\s*\(\s*strict_types\s*=\s*1|^\s*\/\//', $line)) {
@@ -51,14 +70,12 @@ EOF;
     }
 }
 
-function run(String $base, String $dir, String $filename)
+function run(string $base, string $dir, string $filename, array $priority)
 {
     $lines = [];
     $start = microtime(true);
     addHeader($lines);
-    $count = runDir($base, 'src/Psr', $lines);
-    $count += runDir($base, 'src/Nyholm', $lines);
-    $count += runDir($base, 'src/Tqdev', $lines);
+    $count = runDir($base, 'src', $lines, $priority);
     $data = implode("\n", $lines);
     $data = preg_replace('/\n\s*\n\s*\n/', "\n\n", $data);
     file_put_contents('tmp_' . $filename, $data);
@@ -71,4 +88,4 @@ function run(String $base, String $dir, String $filename)
     echo sprintf("%d files combined in %d ms into '%s'\n", $count, $time, $filename);
 }
 
-run(__DIR__, 'src', 'api.php');
+run(__DIR__, 'src', 'api.php', ['src/Psr']);

src/Nyholm/Psr7/Factory/HttplugFactory.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Nyholm\Psr7\Factory;
-
-use Http\Message\{MessageFactory, StreamFactory, UriFactory};
-use Nyholm\Psr7\{Request, Response, Stream, Uri};
-use Psr\Http\Message\UriInterface;
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- * @author Martijn van der Ven <martijn@vanderven.se>
- */
-final class HttplugFactory implements MessageFactory, StreamFactory, UriFactory
-{
-    public function createRequest($method, $uri, array $headers = [], $body = null, $protocolVersion = '1.1')
-    {
-        return new Request($method, $uri, $headers, $body, $protocolVersion);
-    }
-
-    public function createResponse($statusCode = 200, $reasonPhrase = null, array $headers = [], $body = null, $version = '1.1')
-    {
-        return new Response((int) $statusCode, $headers, $body, $version, $reasonPhrase);
-    }
-
-    public function createStream($body = null)
-    {
-        return Stream::create($body ?? '');
-    }
-
-    public function createUri($uri = ''): UriInterface
-    {
-        if ($uri instanceof UriInterface) {
-            return $uri;
-        }
-
-        return new Uri($uri);
-    }
-}

src/Nyholm/Psr7/Request.php

@@ -1,12 +1,10 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace Nyholm\Psr7;
 
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamInterface;
-use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\{RequestInterface, StreamInterface, UriInterface};
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
@@ -27,7 +25,7 @@ final class Request implements RequestInterface
     public function __construct(string $method, $uri, array $headers = [], $body = null, string $version = '1.1')
     {
         if (!($uri instanceof UriInterface)) {
-            $uri = new Uri((string) $uri);
+            $uri = new Uri($uri);
         }
 
         $this->method = $method;

src/Nyholm/Psr7/ServerRequest.php

@@ -50,7 +50,7 @@ final class ServerRequest implements ServerRequestInterface
         $this->serverParams = $serverParams;
 
         if (!($uri instanceof UriInterface)) {
-            $uri = new Uri((string) $uri);
+            $uri = new Uri($uri);
         }
 
         $this->method = $method;

src/Tqdev/PhpCrudApi/Api.php

@@ -29,6 +29,7 @@ use Tqdev\PhpCrudApi\Middleware\XsrfMiddleware;
 use Tqdev\PhpCrudApi\OpenApi\OpenApiService;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
 use Tqdev\PhpCrudApi\Record\RecordService;
+use Tqdev\PhpCrudApi\ResponseUtils;
 
 class Api
 {
@@ -125,7 +126,7 @@ class Api
         } catch (\Throwable $e) {
             $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, $e->getMessage());
             if ($this->debug) {
-                $response->addExceptionHeaders($e);
+                $response = ResponseUtils::addExceptionHeaders($response, $e);
             }
         }
         return $response;

src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php

@@ -8,6 +8,7 @@ use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Record\ErrorCode;
 use Tqdev\PhpCrudApi\Record\PathTree;
+use Tqdev\PhpCrudApi\ResponseUtils;
 
 class SimpleRouter implements Router
 {
@@ -106,7 +107,7 @@ class SimpleRouter implements Router
                 $response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');
             }
             if ($this->debug) {
-                $response->addExceptionHeaders($e);
+                $response = ResponseUtils::addExceptionHeaders($response, $e);
             }
         }
         return $response;

src/clone.sh

@@ -12,6 +12,7 @@ git clone git@github.com:Nyholm/psr7.git
 mkdir -p Nyholm/Psr7
 cp -R psr7/src/* Nyholm/Psr7
 rm -Rf psr7
+rm Nyholm/Psr7/Factory/HttplugFactory.php
 
 git clone git@github.com:Nyholm/psr7-server.git
 mkdir -p Nyholm/Psr7Server

test.php

@@ -9,7 +9,7 @@ spl_autoload_register(function ($class) {
     include str_replace('\\', '/', "src\\$class.php");
 });
 
-function runDir(Config $config, String $dir, array $matches, String $category): array
+function runDir(Config $config, string $dir, array $matches, string $category): array
 {
     $success = 0;
     $total = 0;
@@ -40,7 +40,7 @@ function runDir(Config $config, String $dir, array $matches, String $category):
     return compact('total', 'success', 'failed');
 }
 
-function runTest(Config $config, String $file, String $category): int
+function runTest(Config $config, string $file, string $category): int
 {
     $title = ucwords(str_replace('_', ' ', $category)) . '/';
     $title .= ucwords(str_replace('_', ' ', substr(basename($file), 0, -4)));
@@ -78,7 +78,7 @@ function runTest(Config $config, String $file, String $category): int
     return $success;
 }
 
-function loadFixture(String $dir, Config $config)
+function loadFixture(string $dir, Config $config)
 {
     $driver = $config->getDriver();
     $filename = "$dir/fixtures/blog_$driver.sql";
@@ -113,7 +113,7 @@ function loadFixture(String $dir, Config $config)
     }
 }
 
-function run(array $drivers, String $dir, array $matches)
+function run(array $drivers, string $dir, array $matches)
 {
     foreach ($drivers as $driver) {
         if (isset($matches[0])) {