Multi-file support on wn:resources, enhance model relationships and enable polymorphic relationships

.gitignore

@@ -8,4 +8,5 @@ lumen-test/app
 lumen-test/database
 lumen-test/tests/tmp
 
+.DS_Store
 .idea

formats/fields.json

@@ -32,7 +32,8 @@
         	{
         		"name": "factory",
         		"type": "string",
-        		"default": false
+        		"default": false,
+				"required": false
         	}
         ]
     }

formats/relations-hasManyThrough.json

@@ -0,0 +1,19 @@
+{
+	"type": "array",
+	"fields": {
+        "type": "object",
+        "separator": ":",
+        "fields": [
+            "name",
+            {
+                "name": "model",
+                "type": "string"
+            },
+            {
+                "name": "through",
+                "type": "string",
+                "default": false
+            }
+        ]
+    }
+}

formats/relations-morphMany.json

@@ -0,0 +1,19 @@
+{
+	"type": "array",
+	"fields": {
+        "type": "object",
+        "separator": ":",
+        "fields": [
+            "name",
+            {
+                "name": "model",
+                "type": "string"
+            },
+            {
+                "name": "through",
+                "type": "string",
+                "default": ""
+            }
+        ]
+    }
+}

formats/relations-morphTo.json

@@ -0,0 +1,15 @@
+{
+	"type": "array",
+	"fields": {
+		"type": "object",
+        "separator": "|",
+        "fields": [
+			"name",
+			{
+				"name": "nullable",
+                "type": "boolean",
+				"default": false
+			}
+        ]
+    }
+}

lumen-test/.env

@@ -12,7 +12,7 @@ DB_CONNECTION=sqlite
 # DB_USERNAME=homestead
 # DB_PASSWORD=secret
 
-# CACHE_DRIVER=memcached
+CACHE_DRIVER=file
 # SESSION_DRIVER=memcached
 # QUEUE_DRIVER=database
 

lumen-test/app/Http/routes.php

@@ -11,6 +11,6 @@
 |
 */
 
-$app->get("/", function () use ($app) {
-    return $app->welcome();
+$router->get("/", function () use ($router) {
+    return 'Hello World';
 });

lumen-test/bootstrap/app.php

@@ -2,7 +2,11 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-Dotenv::load(__DIR__.'/../');
+try {
+    (new Dotenv\Dotenv(__DIR__.'/../'))->load();
+} catch (Dotenv\Exception\InvalidPathException $e) {
+    //
+}
 
 /*
 |--------------------------------------------------------------------------
@@ -92,7 +96,9 @@
 |
 */
 
-$app->group(['namespace' => 'App\Http\Controllers'], function ($app) {
+$app->router->group([
+    'namespace' => 'App\Http\Controllers',
+], function ($router) {
     require __DIR__.'/../app/Http/routes.php';
 });
 

lumen-test/clean.sh

@@ -1,3 +1,7 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "$0")"
+
 # models
 rm app/*.php 2> /dev/null
 
@@ -11,13 +15,15 @@ echo "<?php
     return \$app->welcome();
 });" > app/Http/routes.php
 
-echo "<?php
-/*
-|------------------------------------------
-|   ***** DUMMY ROUTES FOR TESTING ONLY *****
-|------------------------------------------
-*/
-" > routes/api.php
+if [ -d "routes" ]; then
+    echo "<?php
+    /*
+    |------------------------------------------
+    |   ***** DUMMY ROUTES FOR TESTING ONLY *****
+    |------------------------------------------
+    */
+    " > routes/api.php
+fi
 
 # Controllers
 rm app/Http/Controllers/*.php 2> /dev/null

lumen-test/composer.json

@@ -5,14 +5,14 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=5.5.9",
-        "laravel/lumen-framework": "5.1.*",
-        "vlucas/phpdotenv": "~1.0"
+        "php": ">=7.1.3",
+        "laravel/lumen-framework": "5.5.*",
+        "vlucas/phpdotenv": "~2.2"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "fzaninotto/faker": "~1.0",
-        "phpspec/phpspec": "2.0.0",
+        "phpspec/phpspec": "5.1.0",
         "codeception/codeception": "^2.2"
     },
     "autoload": {

lumen-test/tests/_support/_generated/AcceptanceTesterActions.php

@@ -1,14 +1,10 @@
-<?php  //[STAMP] d6606f78456705b0875c6b8343fc6a4a
+<?php  //[STAMP] 141a71be31fb850b4f0890a80e070f8c
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Helper\Acceptance;
-use Codeception\Module\Cli;
-use Codeception\Module\Filesystem;
-
 trait AcceptanceTesterActions
 {
     /**
@@ -17,22 +13,6 @@ trait AcceptanceTesterActions
     abstract protected function getScenario();
 
 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that array contains subset.
-     *
-     * @param array  $subset
-     * @param array  $array
-     * @param bool   $strict
-     * @param string $message
-     * @see \Codeception\Module::assertArraySubset()
-     */
-    public function assertArraySubset($subset, $array, $strict = null, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
-    }
-
-
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *

lumen-test/tests/_support/_generated/FunctionalTesterActions.php

@@ -1,12 +1,10 @@
-<?php  //[STAMP] d2a298893573661fdbd787dcfa27a7b0
+<?php  //[STAMP] e9c8ced0898dea0901abb2a576b5a217
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Helper\Functional;
-
 trait FunctionalTesterActions
 {
     /**
@@ -15,18 +13,4 @@ trait FunctionalTesterActions
     abstract protected function getScenario();
 
 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that array contains subset.
-     *
-     * @param array  $subset
-     * @param array  $array
-     * @param bool   $strict
-     * @param string $message
-     * @see \Codeception\Module::assertArraySubset()
-     */
-    public function assertArraySubset($subset, $array, $strict = null, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
-    }
 }

lumen-test/tests/_support/_generated/UnitTesterActions.php

@@ -1,13 +1,10 @@
-<?php  //[STAMP] 1467e0d5027bbc2413077351642a21f3
+<?php  //[STAMP] 0c250320f7b0d08d5ec3e0f02856af50
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Codeception\Module\Asserts;
-use Helper\Unit;
-
 trait UnitTesterActions
 {
     /**
@@ -26,13 +23,13 @@ abstract protected function getScenario();
      * Regular example:
      * ```php
      * <?php
-     * $I->assertEquals($element->getChildrenCount(), 5);
+     * $I->assertEquals(5, $element->getChildrenCount());
      * ```
      *
      * Floating-point example:
      * ```php
      * <?php
-     * $I->assertEquals($calculator->add(0.1, 0.2), 0.3, 'Calculator should add the two numbers correctly.', 0.01);
+     * $I->assertEquals(0.3, $calculator->add(0.1, 0.2), 'Calculator should add the two numbers correctly.', 0.01);
      * ```
      *
      * @param        $expected
@@ -56,13 +53,13 @@ public function assertEquals($expected, $actual, $message = null, $delta = null)
      * Regular example:
      * ```php
      * <?php
-     * $I->assertNotEquals($element->getChildrenCount(), 0);
+     * $I->assertNotEquals(0, $element->getChildrenCount());
      * ```
      *
      * Floating-point example:
      * ```php
      * <?php
-     * $I->assertNotEquals($calculator->add(0.1, 0.2), 0.4, 'Calculator should add the two numbers correctly.', 0.01);
+     * $I->assertNotEquals(0.4, $calculator->add(0.1, 0.2), 'Calculator should add the two numbers correctly.', 0.01);
      * ```
      *
      * @param        $expected
@@ -326,6 +323,20 @@ public function assertTrue($condition, $message = null) {
     }
 
 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the condition is NOT true (everything but true)
+     *
+     * @param        $condition
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotTrue()
+     */
+    public function assertNotTrue($condition, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotTrue', func_get_args()));
+    }
+
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -340,6 +351,20 @@ public function assertFalse($condition, $message = null) {
     }
 
 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the condition is NOT false (everything but false)
+     *
+     * @param        $condition
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotFalse()
+     */
+    public function assertNotFalse($condition, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotFalse', func_get_args()));
+    }
+
+
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -441,7 +466,7 @@ public function assertArrayNotHasKey($key, $actual, $description = null) {
      * @param array  $array
      * @param bool   $strict
      * @param string $message
-     * @see \Codeception\Module::assertArraySubset()
+     * @see \Codeception\Module\Asserts::assertArraySubset()
      */
     public function assertArraySubset($subset, $array, $strict = null, $message = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArraySubset', func_get_args()));
@@ -540,9 +565,45 @@ public function fail($message) {
      *
      * @param $exception string or \Exception
      * @param $callback
+     *
+     * @deprecated Use expectThrowable instead
      * @see \Codeception\Module\Asserts::expectException()
      */
     public function expectException($exception, $callback) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
     }
+
+
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Handles and checks throwables (Exceptions/Errors) called inside the callback function.
+     * Either throwable class name or throwable instance should be provided.
+     *
+     * ```php
+     * <?php
+     * $I->expectThrowable(MyThrowable::class, function() {
+     *     $this->doSomethingBad();
+     * });
+     *
+     * $I->expectThrowable(new MyException(), function() {
+     *     $this->doSomethingBad();
+     * });
+     * ```
+     * If you want to check message or throwable code, you can pass them with throwable instance:
+     * ```php
+     * <?php
+     * // will check that throwable MyError is thrown with "Don't do bad things" message
+     * $I->expectThrowable(new MyError("Don't do bad things"), function() {
+     *     $this->doSomethingBad();
+     * });
+     * ```
+     *
+     * @param $throwable string or \Throwable
+     * @param $callback
+     * @see \Codeception\Module\Asserts::expectThrowable()
+     */
+    public function expectThrowable($throwable, $callback) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectThrowable', func_get_args()));
+    }
 }