Merge pull request #1 from Arul-/dev

Merging dev
Arul- · Dec 24, 2020 · 0a6eb47 · 0a6eb47
2 parents 1f5d855 + 7f0cad9
commit 0a6eb47
Show file tree

Hide file tree

Showing 125 changed files with 4,883 additions and 1,754 deletions.
diff --git a/api/bootstrap.php b/api/bootstrap.php
@@ -4,23 +4,19 @@
 
 use Auth\Client;
 use Auth\Server;
-use GraphQL\Type\Definition\Type as GraphQLType;
 use improved\Authors as ImprovedAuthors;
-use Luracast\Restler\Cache\HumanReadable;
+use Luracast\Restler\Data\ErrorResponse;
 use Luracast\Restler\Defaults;
 use Luracast\Restler\Filters\RateLimiter;
-use Luracast\Restler\GraphQL\GraphQL;
 use Luracast\Restler\MediaTypes\Html;
 use Luracast\Restler\MediaTypes\Json;
 use Luracast\Restler\MediaTypes\Upload;
 use Luracast\Restler\MediaTypes\Xml;
 use Luracast\Restler\Middleware\SessionMiddleware;
-use Luracast\Restler\Middleware\StaticFiles;
 use Luracast\Restler\OpenApi3\Explorer;
 use Luracast\Restler\Restler;
 use Luracast\Restler\Router;
 use Luracast\Restler\UI\Forms;
-use Luracast\Restler\Utils\Text;
 use ratelimited\Authors as RateLimitedAuthors;
 use SomeVendor\v1\BMI as VendorBMI1;
 use v1\BodyMassIndex as BMI1;
@@ -36,11 +32,6 @@
 Defaults::$implementations[HttpClientInterface::class] = [SimpleHttpClient::class];
 Router::setApiVersion(2);
 Html::$template = 'blade'; //'handlebar'; //'twig'; //'php';
-if (!Text::endsWith($_SERVER['SCRIPT_NAME'], 'index.php')) {
-    //when serving through apache or nginx, static files will be served direcly by apache / nginx
-    Restler::$middleware[] = new StaticFiles(BASE . '/' . 'public');
-}
-//Restler::$middleware[] = new SessionMiddleware('RESTLERSESSID', new ArrayCache(), [0, '', '', false, false]);
 Restler::$middleware[] = new SessionMiddleware();
 
 try {
@@ -84,7 +75,7 @@
     Router::mapApiClasses(
         [
             //utility api for running behat tests
-            '-storage-' => Storage::class,
+            'examples/-storage-' => Storage::class,
             //examples
             'examples/_001_helloworld/say' => Say::class,
             'examples/_002_minimal/math' => Math::class,
@@ -115,39 +106,13 @@
             //Explorer
             'explorer' => Explorer::class,
             //GraphQL
-            GraphQL::class,
+            //GraphQL::class,
         ]
     );
-    //
-    //---------------------------- GRAPHQL API ----------------------------
-    //
-    GraphQL::$queries['echo'] = [
-        'type' => GraphQLType::string(),
-        'args' => [
-            'message' => GraphQLType::nonNull(GraphQLType::string()),
-        ],
-        'resolve' => function ($root, $args) {
-            return $root['prefix'] . $args['message'];
-        }
-    ];
-    GraphQL::$mutations['sum'] = [
-        'type' => GraphQLType::int(),
-        'args' => [
-            'x' => ['type' => GraphQLType::int()],
-            'y' => ['type' => GraphQLType::int()],
-        ],
-        'resolve' => function ($calc, $args) {
-            return $args['x'] + $args['y'];
-        },
-    ];
-    GraphQL::mapApiClasses([
-        RateLimitedAuthors::class,
-        Say::class,
-    ]);
-    GraphQL::addMethod('', new ReflectionMethod(Math::class, 'add'));
+    require __DIR__ . '/examples/_017_graphql/routes.php';
 
 } catch (Throwable $t) {
-    die($t->getMessage());
+    die(json_encode((new ErrorResponse($t, true))->jsonSerialize(), JSON_PRETTY_PRINT));
 }
 
 

diff --git a/api/common/ReactHttpClient.php b/api/common/ReactHttpClient.php
@@ -1,7 +1,9 @@
 <?php
 
 
+use Psr\Http\Message\ResponseInterface;
 use React\EventLoop\LoopInterface;
+use React\Http\Browser;
 use React\HttpClient\Client;
 use React\HttpClient\Response;
 
@@ -20,24 +22,17 @@ public static function request(
         array $headers = [],
         string $body = '',
         callable $callback = null
-    )
-    {
+    ) {
         if (!static::$loop) {
             throw new Error('Please call ReactHttpClient::setLoop before calling ReactHttpClient::request');
         }
-        $client = new Client(static::$loop);
+        $browser = new Browser(static::$loop);
         $headers['Content-Length'] = strlen($body);
-        $req = $client->request($method, $uri, $headers, '1.1');
-        $req->on('response', function (Response $response) use ($callback) {
-            $body = '';
-            $headers = $response->getHeaders();
-            $response->on('data', function (string $chunk) use (&$body) {
-                $body .= $chunk;
-            });
-            $response->on('end', function () use (&$body, $headers, $callback) {
-                $callback(null, new SimpleHttpResponse($body, $headers));
-            });
+        $req = $browser->request($method, $uri, $headers, $body);
+        $req->then(function (ResponseInterface $response) use ($callback) {
+            $callback(null, new SimpleHttpResponse((string)$response->getBody(), $response->getHeaders()));
+        }, function (Exception $exception) use ($callback) {
+            $callback($exception);
         });
-        $req->end($body);
     }
 }
diff --git a/api/examples/-storage-/.htaccess b/api/examples/-storage-/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/tests/Storage.php → api/examples/-storage-/Storage.php b/api/tests/Storage.php → api/examples/-storage-/Storage.php
@@ -111,7 +111,7 @@ class_exists(ClassName::get('HttpClientInterface'));
      *
      * Removes the cache files to begin testing on a clean slate
      */
-    public function delete()
+    public function deleteAll()
     {
         $this->deleteCache();
         $this->deletePackage();

diff --git a/api/examples/-storage-/index.php b/api/examples/-storage-/index.php
@@ -0,0 +1,19 @@
+<?php
+
+use Luracast\Restler\Defaults;
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+define('BASE', __DIR__ . '/../../..');
+
+require BASE . '/vendor/autoload.php';
+
+Defaults::$cacheDirectory = BASE . '/api/common/store';
+Defaults::$implementations[DataProviderInterface::class] = [SerializedFileDataProvider::class];
+Defaults::$implementations[HttpClientInterface::class] = [SimpleHttpClient::class];
+
+Router::mapApiClasses([
+    '' => Storage::class
+]);
+
+(new Restler())->handle();
diff --git a/api/examples/_001_helloworld/.htaccess b/api/examples/_001_helloworld/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/examples/_001_helloworld/Say.php b/api/examples/_001_helloworld/Say.php
@@ -5,7 +5,7 @@
  */
 class Say
 {
-    function hello(string $to = 'world'): string
+    function hello($to = 'world'):string
     {
         return "Hello $to!";
     }

diff --git a/api/examples/_001_helloworld/index.php b/api/examples/_001_helloworld/index.php
@@ -0,0 +1,12 @@
+<?php
+
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+Router::mapApiClasses([
+    Say::class
+]);
+
+(new Restler())->handle();
diff --git a/api/examples/_002_minimal/.htaccess b/api/examples/_002_minimal/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/examples/_002_minimal/Math.php b/api/examples/_002_minimal/Math.php
@@ -23,16 +23,25 @@ function add($n1 = 1, $n2 = 1)
      */
     function multiply($n1, $n2)
     {
-        return array(
+        return [
             'result' => ($n1 * $n2)
-        );
+        ];
     }
 
     /**
      * @url GET sum/*
      */
-    function sum()
+    function _sum()
     {
         return array_sum(func_get_args());
     }
+
+    /**
+     * @param int ...$numbers {@from path}
+     * @return int
+     */
+    function sum2(int ...$numbers):int
+    {
+        return array_sum($numbers);
+    }
 }
diff --git a/api/examples/_002_minimal/index.php b/api/examples/_002_minimal/index.php
@@ -0,0 +1,13 @@
+<?php
+
+
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+Router::mapApiClasses([
+    Math::class
+]);
+
+(new Restler())->handle();
diff --git a/api/examples/_003_multiformat/.htaccess b/api/examples/_003_multiformat/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/examples/_003_multiformat/index.php b/api/examples/_003_multiformat/index.php
@@ -0,0 +1,17 @@
+<?php
+
+
+use Luracast\Restler\MediaTypes\Json;
+use Luracast\Restler\MediaTypes\Xml;
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+Router::setOverridingResponseMediaTypes(Json::class, Xml::class);
+
+Router::mapApiClasses([
+    BMI::class
+]);
+
+(new Restler())->handle();
diff --git a/api/examples/_004_error_response/.htaccess b/api/examples/_004_error_response/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/examples/_004_error_response/Currency.php b/api/examples/_004_error_response/Currency.php
@@ -18,7 +18,6 @@ function format($number = null)
         }
 
         // let's format it as US currency
-        $m = new NumberFormatter("en-US", NumberFormatter::CURRENCY);
-        return $m->format($number);
+        return'$' . number_format($number, 2);
     }
 }
diff --git a/api/examples/_004_error_response/index.php b/api/examples/_004_error_response/index.php
@@ -0,0 +1,13 @@
+<?php
+
+
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+Router::mapApiClasses([
+    Currency::class
+]);
+
+(new Restler())->handle();
diff --git a/api/examples/_005_protected_api/.htaccess b/api/examples/_005_protected_api/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/examples/_005_protected_api/index.php b/api/examples/_005_protected_api/index.php
@@ -0,0 +1,15 @@
+<?php
+
+
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+Router::addAuthenticator(SimpleAuth::class);
+Router::mapApiClasses([
+    '' => Simple::class,
+    Secured::class
+]);
+
+(new Restler())->handle();
diff --git a/api/examples/_006_routing/.htaccess b/api/examples/_006_routing/.htaccess
@@ -0,0 +1,11 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+	php_flag display_errors Off
+</IfModule>
diff --git a/api/examples/_006_routing/index.php b/api/examples/_006_routing/index.php
@@ -0,0 +1,13 @@
+<?php
+
+
+use Luracast\Restler\Restler;
+use Luracast\Restler\Router;
+
+require __DIR__ . '/../../../vendor/autoload.php';
+
+Router::mapApiClasses([
+    Api::class
+]);
+
+(new Restler())->handle();