Merge remote-tracking branch 'origin/master'

# Conflicts: # src/Abstractor/Eloquent/Model.php
anavel · Jan 30, 2017 · 056e325 · 056e325
2 parents d034acd + 5a40015
commit 056e325
Show file tree

Hide file tree

Showing 74 changed files with 913 additions and 673 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: php
 php:
   - 5.5
   - 5.6
-  - 7.0
   - hhvm
 
 before_script:

diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,9 @@
+
+
+Copyright (c) 2016 A navalla suíza
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/config/anavel-crud.php b/config/anavel-crud.php
@@ -43,7 +43,7 @@
         'date'     => 'd/m/Y',
         'time'     => 'H:i',
         'datetime' => 'd/m/Y H:i:s',
-        'number'   => '%.2f'
+        'number'   => '%.2f',
     ],
 
     /*
@@ -143,7 +143,6 @@
         ]
         */
     ],
-    'modelsGroups' =>
-        [/*'Blog' => ['Blog Posts', 'Blog Tags']*/]
+    'modelsGroups' => [/*'Blog' => ['Blog Posts', 'Blog Tags']*/],
 
 ];
diff --git a/lang/ca/messages.php b/lang/ca/messages.php
@@ -22,5 +22,5 @@
     'alert_success_model_destroy_title' => 'Tot bé!',
     'alert_success_model_destroy_text'  => "L'element fou eliminat correctament",
     'modal_delete_title'                => 'Estàs segur?',
-    'modal_delete_text'                 => 'Aquesta acció esborrarà permanentment aquest contingut'
+    'modal_delete_text'                 => 'Aquesta acció esborrarà permanentment aquest contingut',
 ];
diff --git a/lang/en/messages.php b/lang/en/messages.php
@@ -22,5 +22,5 @@
     'alert_success_model_destroy_title' => 'Everything OK!',
     'alert_success_model_destroy_text'  => 'The item was deleted successfully',
     'modal_delete_title'                => 'Are you sure?',
-    'modal_delete_text'                 => 'This will permanently delete this content'
+    'modal_delete_text'                 => 'This will permanently delete this content',
 ];
diff --git a/lang/es/messages.php b/lang/es/messages.php
@@ -22,5 +22,5 @@
     'alert_success_model_destroy_title' => '¡Todo bien!',
     'alert_success_model_destroy_text'  => 'El elemento ha sido borrado correctamente',
     'modal_delete_title'                => 'Estás seguro/a?',
-    'modal_delete_text'                 => 'Esto borrará permanentemente este contenido'
+    'modal_delete_text'                 => 'Esto borrará permanentemente este contenido',
 ];
diff --git a/lang/gl/messages.php b/lang/gl/messages.php
@@ -22,5 +22,5 @@
     'alert_success_model_destroy_title' => 'Todo ben!',
     'alert_success_model_destroy_text'  => 'Borrouse perfectamente o que querías',
     'modal_delete_title'                => 'Estás seguro/a?',
-    'modal_delete_text'                 => 'Así borrarás este contido para sempre'
+    'modal_delete_text'                 => 'Así borrarás este contido para sempre',
 ];
diff --git a/public/js/app.js b/public/js/app.js
@@ -5,6 +5,6 @@ $(function () {
 
     //bootstrap WYSIHTML5 - text editor
     $(".bootstrap-wysihtml5").wysihtml5();
-    $('select').selectize();
+    $('select[multiple]').selectize();
     $("input[type=date]").pikaday({  format: 'YYYY-MM-DD'});
 });
diff --git a/src/Abstractor/ConfigurationReader.php b/src/Abstractor/ConfigurationReader.php
@@ -1,12 +1,13 @@
 <?php
+
 namespace Anavel\Crud\Abstractor;
 
 trait ConfigurationReader
 {
     public function getConfigValue()
     {
-        if (! property_exists($this, 'config') || ! is_array($this->config) || empty($this->config)) {
-            return null;
+        if (!property_exists($this, 'config') || !is_array($this->config) || empty($this->config)) {
+            return;
         }
 
         $params = func_get_args();
@@ -17,9 +18,10 @@ public function getConfigValue()
 
         if (is_array($params) && count($params) > 0) {
             foreach ($params as $configKey) {
-                if (! array_key_exists($configKey, $nestedConfig)) {
-                    $nestedConfig = array();
-                    return null;
+                if (!array_key_exists($configKey, $nestedConfig)) {
+                    $nestedConfig = [];
+
+                    return;
                 }
 
                 $nestedConfig = $nestedConfig[$configKey];
@@ -29,7 +31,5 @@ public function getConfigValue()
         if (array_key_exists($lastParam, $nestedConfig)) {
             return $nestedConfig[$lastParam];
         }
-
-        return null;
     }
 }
diff --git a/src/Abstractor/Eloquent/Field.php b/src/Abstractor/Eloquent/Field.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Anavel\Crud\Abstractor\Eloquent;
 
 use Anavel\Crud\Contracts\Abstractor\Field as FieldAbstractorContract;
@@ -32,8 +33,8 @@ public function __construct(Column $column, FormManagerField $formField, $name,
         $this->formField = $formField;
         $this->name = $name;
         $this->presentation = $presentation;
-        $this->validationRules = array();
-        $this->functions = array();
+        $this->validationRules = [];
+        $this->functions = [];
         $this->options = [];
         $this->hideValue = false;
         $this->saveIfEmpty = true;
@@ -44,7 +45,7 @@ public function __clone()
     {
         $formField = clone $this->formField;
         $this->formField = $formField;
-        $field = new Field($this->dbal, $formField, $this->name, $this->presentation);
+        $field = new self($this->dbal, $formField, $this->name, $this->presentation);
 
         return $field;
     }
@@ -106,8 +107,8 @@ public function getValidationRulesArray()
 
     public function setFunctions($functions)
     {
-        if (! is_array($functions)) {
-            $functions = array($functions);
+        if (!is_array($functions)) {
+            $functions = [$functions];
         }
 
         $this->functions = $functions;
@@ -116,8 +117,8 @@ public function setFunctions($functions)
     public function applyFunctions($value)
     {
         foreach ($this->functions as $function) {
-            if (! function_exists($function)) {
-                throw new \Exception("Function ".$function." does not exist");
+            if (!function_exists($function)) {
+                throw new \Exception('Function '.$function.' does not exist');
             }
 
             $value = call_user_func($function, $value);
@@ -128,13 +129,14 @@ public function applyFunctions($value)
 
     /**
      * @param string $value
+     *
      * @return void
      */
     public function setValue($value)
     {
         $this->value = $value;
 
-        if (! $this->hideValue()) {
+        if (!$this->hideValue()) {
             $this->formField->val($this->value);
         }
     }
@@ -149,6 +151,7 @@ public function getValue()
 
     /**
      * @param array $options
+     *
      * @return void
      */
     public function setOptions(array $options)
@@ -168,7 +171,7 @@ public function getOptions()
 
     public function getFormField()
     {
-        if (! $this->hideValue()) {
+        if (!$this->hideValue()) {
             if (Request::old($this->name)) {
                 $this->formField->val(Request::old($this->name));
             }
@@ -177,36 +180,27 @@ public function getFormField()
         return $this->formField;
     }
 
-    /**
-     *
-     */
     public function hideValue($value = null)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->hideValue = $value;
         }
 
         return $this->hideValue;
     }
 
-    /**
-     *
-     */
     public function saveIfEmpty($value = null)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->saveIfEmpty = $value;
         }
 
         return $this->saveIfEmpty;
     }
 
-    /**
-     *
-     */
     public function noValidate($value = null)
     {
-        if (! is_null($value)) {
+        if (!is_null($value)) {
             $this->noValidate = $value;
         }
 
@@ -215,6 +209,7 @@ public function noValidate($value = null)
 
     /**
      * @param array $attributes
+     *
      * @return void
      */
     public function setFormElementAttributes(array $attributes)

diff --git a/src/Abstractor/Eloquent/FieldFactory.php b/src/Abstractor/Eloquent/FieldFactory.php
@@ -1,8 +1,9 @@
 <?php
+
 namespace Anavel\Crud\Abstractor\Eloquent;
 
-use Anavel\Crud\Contracts\Abstractor\FieldFactory as FieldAbstractorFactoryContract;
 use Anavel\Crud\Abstractor\Exceptions\FactoryException;
+use Anavel\Crud\Contracts\Abstractor\FieldFactory as FieldAbstractorFactoryContract;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Types\Type as DbalType;
 use FormManager\FactoryInterface as FormManagerFactory;
@@ -27,7 +28,7 @@ class FieldFactory implements FieldAbstractorFactoryContract
     /**
      * @var array
      */
-    protected $databaseTypeToFormType = array(
+    protected $databaseTypeToFormType = [
         DbalType::INTEGER  => 'number',
         DbalType::SMALLINT => 'number',
         DbalType::BIGINT   => 'number',
@@ -44,56 +45,47 @@ class FieldFactory implements FieldAbstractorFactoryContract
         'hidden',
         'select',
         'file',
-        'money'
-    );
+        'money',
+    ];
 
     public function __construct(FormManagerFactory $factory)
     {
         $this->factory = $factory;
     }
 
-    /**
-     *
-     */
     public function setColumn(Column $column)
     {
         $this->column = $column;
 
         return $this;
     }
 
-    /**
-     *
-     */
     public function setConfig(array $config)
     {
         $this->config = $config;
 
         return $this;
     }
 
-    /**
-     *
-     */
     public function get()
     {
         $formElement = $this->getFormElement();
 
         $field = new Field($this->column, $formElement, $this->config['name'], $this->config['presentation']);
 
-        if (! empty($this->config['validation'])) {
+        if (!empty($this->config['validation'])) {
             if ($this->config['validation'] === 'no_validate') {
                 $this->config['no_validate'] = true;
             } else {
                 $field->setValidationRules($this->config['validation']);
             }
         }
 
-        if (! empty($this->config['functions'])) {
+        if (!empty($this->config['functions'])) {
             $field->setFunctions($this->config['functions']);
         }
 
-        if (! empty($this->config['no_validate']) && $this->config['no_validate'] === true) {
+        if (!empty($this->config['no_validate']) && $this->config['no_validate'] === true) {
             $field->noValidate(true);
         }
 
@@ -107,7 +99,7 @@ public function get()
             if (in_array('required', $rules)) {
                 $field->setFormElementAttributes(
                     [
-                        'required' => true
+                        'required' => true,
                     ]
                 );
             }
@@ -118,15 +110,15 @@ public function get()
 
     protected function getFormElement()
     {
-        if (! empty($this->config['form_type'])) {
-            if (! in_array($this->config['form_type'], $this->databaseTypeToFormType)) {
-                throw new FactoryException("Unknown form type " . $this->config['form_type']);
+        if (!empty($this->config['form_type'])) {
+            if (!in_array($this->config['form_type'], $this->databaseTypeToFormType)) {
+                throw new FactoryException('Unknown form type '.$this->config['form_type']);
             }
 
             $formElementType = $this->config['form_type'];
         } else {
-            if (! array_key_exists($this->column->getType()->getName(), $this->databaseTypeToFormType)) {
-                throw new FactoryException("No form type found for database type " . $this->column->getType()->getName());
+            if (!array_key_exists($this->column->getType()->getName(), $this->databaseTypeToFormType)) {
+                throw new FactoryException('No form type found for database type '.$this->column->getType()->getName());
             }
 
             $formElementType = $this->databaseTypeToFormType[$this->column->getType()->getName()];
@@ -136,10 +128,9 @@ protected function getFormElement()
             $formElementType = 'select';
         }
 
-
         $formElement = $this->factory->get($formElementType, []);
 
-        if (! empty($this->config['attr']) && is_array($this->config['attr'])) {
+        if (!empty($this->config['attr']) && is_array($this->config['attr'])) {
             $formElement->attr($this->config['attr']);
         }
 
@@ -150,15 +141,15 @@ protected function getFormElement()
         }
 
         if ($formElementType === 'textarea') {
-            $formElement->class('form-control ' . config('anavel-crud.text_editor'));
+            $formElement->class('form-control '.config('anavel-crud.text_editor'));
         }
 
         if ($formElementType === 'checkbox') {
             $formElement->class('checkbox');
         }
 
         if (isset($this->config['defaults'])) {
-            if (! is_array($this->config['defaults'])) {
+            if (!is_array($this->config['defaults'])) {
                 $formElement->val(transcrud($this->config['defaults']));
             } else {
                 $defaults = [];
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ language: php @@
     php:
       - 5.5
       - 5.6
-      - 7.0
       - hhvm
     before_script:
@@ Expand Down @@