Merge branch 'master' of https://github.com/code16/sharp

Author: antoine

docs/guide/README.md

@@ -56,3 +56,15 @@ As we can see, each `entity` (like `spaceship`, here), can define:
 	- and a `policy` class, for authorization.
 
 We'll get into all those classes in this document. The important thing to notice is that Sharp provides base classes to handle all the wiring (and more), but as we'll see, the applicative code is totally up to you.
+
+## Access to Sharp
+
+Once installed, Sharp is accessible via the url `/sharp`, by default. If you wish to change this default value, you'll need to define the `custom_url_segment` config value, in `config/sharp.php`:
+
+```php
+return [
+    "name" => "Saturn",
+    "custom_url_segment" => "admin",
+    [...]
+]
+```

saturn/config/sharp.php

@@ -146,7 +146,7 @@
             "url" => "https://google.com"
         ],
         [
-            "label" => "Features",
+            "label" => "Some powerful Features",
             "icon" => "fa-superpowers",
             "entity" => "feature"
         ]

src/Form/SharpForm.php

@@ -3,7 +3,6 @@
 namespace Code16\Sharp\Form;
 
 use Code16\Sharp\Exceptions\Form\SharpFormUpdateException;
-use Code16\Sharp\Form\Fields\SharpFormField;
 use Code16\Sharp\Form\Layout\FormLayoutColumn;
 use Code16\Sharp\Form\Layout\FormLayoutTab;
 use Code16\Sharp\Utils\SharpNotification;
@@ -83,10 +82,10 @@ public function newInstance()
     public function hasDataLocalizations()
     {
         return collect($this->fields())
-            ->filter(function($field) {
-                return $field["localized"] ?? false;
-            })
-            ->count() > 0;
+                ->filter(function($field) {
+                    return $field["localized"] ?? false;
+                })
+                ->count() > 0;
     }
 
     /**
@@ -224,7 +223,18 @@ public function __construct($attributes)
                 $this->attributes = $attributes;
 
                 foreach($attributes as $name => $value) {
-                    $this->$name = $value;
+                    if(strpos($name, ':')) {
+                        list($subModel, $attr) = explode(':', $name);
+
+                        if(!isset($this->$subModel)) {
+                            $this->$subModel = new \stdClass();
+                        }
+
+                        $this->$subModel->$attr = $value;
+
+                    } else {
+                        $this->$name = $value;
+                    }
                 }
             }
             public function toArray()

src/SharpServiceProvider.php

@@ -26,7 +26,7 @@
 class SharpServiceProvider extends ServiceProvider
 {
     /** @var string */
-    const VERSION = '4.1.13';
+    const VERSION = '4.1.14';
 
     public function boot()
     {

tests/Unit/Form/SharpFormTest.php

@@ -35,6 +35,26 @@ function buildFormFields()
             ], $sharpForm->newInstance());
     }
 
+    /** @test */
+    function we_get_formatted_data_in_creation_with_the_default_create_function_with_subclasses()
+    {
+        $sharpForm = new class extends BaseSharpForm {
+            function buildFormFields()
+            {
+                $this->addField(
+                    SharpFormTextField::make("name")
+                )->addField(
+                    SharpFormMarkdownField::make("subclass:company")
+                );
+            }
+        };
+
+        $this->assertEquals([
+            "name" => "",
+            "subclass:company" => ["text" => null],
+        ], $sharpForm->newInstance());
+    }
+
     /** @test */
     function if_the_field_formatter_needs_it_we_can_delay_its_execution_after_first_save()
     {