scrutinizer adjustments

Author: valentin v / vvval

source/FAQ/Controllers/FAQController.php

@@ -17,14 +17,15 @@
  *
  * @package Spiral\FAQ\Controllers
  * @property \Spiral\Views\ViewsInterface $views
+ * @property \Spiral\Vault\Vault          $vault
  */
 class FAQController extends Controller
 {
     use GuardedTrait, TranslatorTrait;
 
     const GUARD_NAMESPACE = 'vault.faq';
 
-    /** @var \Spiral\FAQ\Database\Sources\FAQSource  */
+    /** @var \Spiral\FAQ\Database\Sources\FAQSource */
     private $source;
 
     /**

source/FAQ/Database/FAQ.php

@@ -24,7 +24,8 @@ class FAQ extends Record
         'id'       => 'primary',
         'status'   => FAQStatus::class,
         'question' => 'string(255)',
-        'answer'   => 'text'
+        'answer'   => 'text',
+        'order'    => 'float',
     ];
 
     /**
@@ -37,7 +38,8 @@ class FAQ extends Record
      */
     const FILLABLE = [
         'question',
-        'answer'
+        'answer',
+        'order'
     ];
 
     const DEFAULTS = [];

source/FAQ/Requests/FAQRequest.php

@@ -10,6 +10,7 @@
  *
  * @package Spiral\FAQ\Requests
  * @property string $status
+ * @property float  $order
  */
 class FAQRequest extends RequestFilter
 {
@@ -20,6 +21,7 @@ class FAQRequest extends RequestFilter
         'question' => 'data:question',
         'answer'   => 'data:answer',
         'status'   => 'data:status',
+        'order'    => 'data:order',
     ];
 
     const VALIDATES = [
@@ -42,5 +44,6 @@ class FAQRequest extends RequestFilter
     const SETTERS = [
         'question' => 'trim',
         'answer'   => 'trim',
+        'order'    => 'floatval',
     ];
 }

source/FAQ/VaultServices/Listings.php

@@ -40,6 +40,7 @@ public function getFAQ(RecordSelector $selector): Listing
 
         $listing->addSorter('id', new BinarySorter('id'));
         $listing->addSorter('question', new BinarySorter('question'));
+        $listing->addSorter('order', new BinarySorter('order'));
 
         $listing->addFilter(
             'status',

source/views/add.dark.php

@@ -15,17 +15,17 @@
     <div class="row">
         <div class="col s12 m8">
             <vault:form action="<?= vault()->uri('faq:create') ?>">
+                <form:input label="[[Question:]]" name="question"/>
+                <form:textarea label="[[Answer:]]" name="answer" rows="20"/>
+
                 <div class="row">
                     <div class="col s12 m12">
-                        <form:input label="[[Question:]]" name="question"/>
+                        <form:select label="[[Status:]]" name="status" values="<?= $statuses->labels(true) ?>"/>
                     </div>
-                </div>
-                <div class="row">
                     <div class="col s12 m12">
-                        <form:textarea label="[[Answer:]]" name="answer" rows="20"/>
+                        <form:input label="[[Order:]]" name="order"/>
                     </div>
                 </div>
-                <form:select label="[[Status:]]" name="status" values="<?= $statuses->labels(true) ?>"/>
 
                 <div class="right-align">
                     <input type="submit" value="[[CREATE]]" class="btn waves-effect waves-light"/>

source/views/edit.dark.php

@@ -14,18 +14,17 @@
     <div class="row">
         <div class="col s12 m8">
             <vault:form action="<?= vault()->uri('faq:update', ['id' => $entity->primaryKey()]) ?>">
+                <form:input label="[[Question:]]" name="question" value="<?= e($entity->question) ?>"/>
+                <form:textarea label="[[Answer:]]" name="answer" rows="20" value="<?= $entity->answer ?>"/>
+
                 <div class="row">
                     <div class="col s12 m12">
-                        <form:input label="[[Question:]]" name="question" value="<?= e($entity->question) ?>"/>
+                        <form:select label="[[Status:]]" name="status" values="<?= $statuses->labels(true) ?>" value="<?= $entity->status ?>"/>
                     </div>
-                </div>
-                <div class="row">
                     <div class="col s12 m12">
-                        <form:textarea label="[[Answer:]]" name="answer" rows="20" value="<?= $entity->answer ?>"/>
+                        <form:input label="[[Order:]]" name="order" value="<?= $entity->order ?>"/>
                     </div>
                 </div>
-                <form:select label="[[Status:]]" name="status" values="<?= $statuses->labels(true) ?>" value="<?= $entity->status ?>"/>
-
                 <div class="right-align">
                     <input type="submit" value="[[UPDATE]]" class="btn waves-effect waves-light"/>
                 </div>

source/views/list.dark.php

@@ -40,13 +40,14 @@
 
     <vault:listing listing="<?= $listing ?>" as="entity" color="" class="striped">
 
-        <grid:cell label="[[Id:]]" value="<?= e($entity->id) ?>" sorter="id"/>
+        <grid:cell label="[[Id:]]" value="<?= $entity->id ?>" sorter="id"/>
         <grid:cell label="[[Question:]]" sorter="question">
             <span title="<?= e($entity->question) ?>"><?= \Spiral\Support\Strings::shorter(e($entity->question), 50) ?></span>
         </grid:cell>
         <grid:cell label="[[Answer:]]">
             <span title="<?= e($entity->answer) ?>"><?= \Spiral\Support\Strings::shorter(e($entity->answer), 100) ?></span>
         </grid:cell>
+        <grid:cell label="[[Order:]]" value="<?= $entity->order ?>" sorter="order"/>
         <grid:cell class="right-align">
             <vault:uri target="faq:edit" icon="edit" options="<?= ['id' => $entity->primaryKey()] ?>" class="waves-effect btn-flat"/>
         </grid:cell>