Merge remote-tracking branch 'stwe/master' into patch-5

Author: stephanvierkant

.travis.yml

@@ -9,9 +9,8 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-    - php: 5.6
-    - php: 7.0
+    - php: 7.1
+      env: DEPENDENCIES=beta
     - php: hhvm
   allow_failures:
     - php: hhvm
@@ -21,10 +20,10 @@ env:
 
 before_install:
   - composer self-update
+  - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;  
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/framework-bundle=$SYMFONY_VERSION; fi
   - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then composer require --dev "phpunit/phpunit=4.8.*"; fi
-  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then composer require --dev "phpunit/phpunit=5.7.*"; fi
+  - composer require --dev "phpunit/phpunit=5.7.*"
 
 install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Version 1.1.1
+
+* Bugfix: DateRangeFilter overwrites other filter (#803)
+
+# Version 1.1.0
+
+* Dropped support for PHP 5 and PHP 7.0. (#850)
+* Feature: Unique name to allow a datatable multiple times on the same page
+* Feature: Added the RowGroup extension (#769)
+* Bugfix: fixed Basque, Polish, Hebrew, Latvian and Russian translations (#760, #844, #846)
+* Other bugfixes

Controller/DatatableController.php

@@ -39,7 +39,7 @@ class DatatableController extends Controller
      *
      * @param Request $request
      *
-     * @Route("/sg/datatables/edit/field", name="sg_datatables_edit")
+     * @Route("/datatables/edit/field", name="sg_datatables_edit")
      * @Method("POST")
      *
      * @return Response

Datatable/AbstractDatatable.php

@@ -128,13 +128,29 @@ abstract class AbstractDatatable implements DatatableInterface
      */
     protected $language;
 
+    /**
+     * The unique id for this instance.
+     *
+     * @var int
+     */
+    protected $uniqueId;
+
     /**
      * The PropertyAccessor.
      *
      * @var PropertyAccessor
      */
     protected $accessor;
 
+    //-------------------------------------------------
+
+    /**
+     * Used to generate unique names.
+     *
+     * @var array
+     */
+    protected static $uniqueCounter = array();
+
     //-------------------------------------------------
     // Ctor.
     //-------------------------------------------------
@@ -161,6 +177,12 @@ public function __construct(
     ) {
         $this->validateName();
 
+        if (isset(self::$uniqueCounter[$this->getName()])) {
+            $this->uniqueId = ++self::$uniqueCounter[$this->getName()];
+        } else {
+            $this->uniqueId = self::$uniqueCounter[$this->getName()] = 1;
+        }
+
         $this->authorizationChecker = $authorizationChecker;
         $this->securityToken = $securityToken;
         $this->translator = $translator;
@@ -282,6 +304,22 @@ public function getOptionsArrayFromEntities($entities, $keyFrom = 'id', $valueFr
         return $options;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getUniqueId()
+    {
+        return $this->uniqueId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getUniqueName()
+    {
+        return $this->getName().($this->getUniqueId() > 1 ? '-'.$this->getUniqueId() : '');
+    }
+
     //-------------------------------------------------
     // Private
     //-------------------------------------------------

Datatable/Action/Action.php

@@ -94,7 +94,7 @@ class Action
      * HTML attributes (except 'href' and 'value').
      * Default: null
      *
-     * @var null|array
+     * @var null|array|Closure
      */
     protected $attributes;
 
@@ -179,7 +179,7 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('label', array('null', 'string'));
         $resolver->setAllowedTypes('confirm', 'bool');
         $resolver->setAllowedTypes('confirm_message', array('null', 'string'));
-        $resolver->setAllowedTypes('attributes', array('null', 'array'));
+        $resolver->setAllowedTypes('attributes', array('null', 'array', 'Closure'));
         $resolver->setAllowedTypes('button', 'bool');
         $resolver->setAllowedTypes('button_value', array('null', 'string'));
         $resolver->setAllowedTypes('button_value_prefix', 'bool');
@@ -341,7 +341,7 @@ public function setConfirmMessage($confirmMessage)
     /**
      * Get attributes.
      *
-     * @return null|array
+     * @return null|array|Closure
      */
     public function getAttributes()
     {
@@ -351,7 +351,7 @@ public function getAttributes()
     /**
      * Set attributes.
      *
-     * @param null|array $attributes
+     * @param null|array|Closure $attributes
      *
      * @return $this
      * @throws Exception

Datatable/Column/AbstractColumn.php

@@ -412,7 +412,7 @@ public function isSelectColumn()
      */
     public function getOptionsTemplate()
     {
-        return 'SgDatatablesBundle:column:column.html.twig';
+        return '@SgDatatables/column/column.html.twig';
     }
 
     /**

Datatable/Column/ActionColumn.php

@@ -81,13 +81,14 @@ public function addDataToOutputArray(array &$row)
     public function renderSingleField(array &$row)
     {
         $parameters = array();
+        $attributes = array();
         $values = array();
 
         /** @var Action $action */
         foreach ($this->actions as $actionKey => $action) {
             $routeParameters = $action->getRouteParameters();
             if (is_array($routeParameters)) {
-                    foreach ($routeParameters as $key => $value) {
+                foreach ($routeParameters as $key => $value) {
                     if (isset($row[$value])) {
                         $parameters[$actionKey][$key] = $row[$value];
                     } else {
@@ -107,6 +108,15 @@ public function renderSingleField(array &$row)
                 $parameters[$actionKey] = array();
             }
 
+            $actionAttributes = $action->getAttributes();
+            if (is_array($actionAttributes)) {
+                $attributes[$actionKey] = $actionAttributes;
+            } elseif ($actionAttributes instanceof Closure) {
+                $attributes[$actionKey] = call_user_func($actionAttributes, $row);
+            } else {
+                $attributes[$actionKey] = array();
+            }
+
             if ($action->isButton()) {
                 if (null !== $action->getButtonValue()) {
                     if (isset($row[$action->getButtonValue()])) {
@@ -133,6 +143,7 @@ public function renderSingleField(array &$row)
             array(
                 'actions' => $this->actions,
                 'route_parameters' => $parameters,
+                'attributes' => $attributes,
                 'values' => $values,
                 'render_if_actions' => $row['sg_datatables_actions'][$this->index],
                 'start_html_container' => $this->startHtml,
@@ -154,7 +165,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:action.html.twig';
+        return '@SgDatatables/render/action.html.twig';
     }
 
     /**

Datatable/Column/BooleanColumn.php

@@ -88,13 +88,17 @@ public function renderSingleField(array &$row)
     {
         $path = Helper::getDataPropertyPath($this->data);
 
-        if (true === $this->isEditableContentRequired($row)) {
-            $content = $this->renderTemplate($this->accessor->getValue($row, $path), $row[$this->editable->getPk()]);
-        } else {
-            $content = $this->renderTemplate($this->accessor->getValue($row, $path));
-        }
+        if ($this->accessor->isReadable($row, $path)) {
+
+            if (true === $this->isEditableContentRequired($row)) {
+                $content = $this->renderTemplate($this->accessor->getValue($row, $path), $row[$this->editable->getPk()]);
+            } else {
+                $content = $this->renderTemplate($this->accessor->getValue($row, $path));
+            }
 
-        $this->accessor->setValue($row, $path, $content);
+            $this->accessor->setValue($row, $path, $content);
+
+        }
 
         return $this;
     }
@@ -107,27 +111,31 @@ public function renderToMany(array &$row)
         $value = null;
         $path = Helper::getDataPropertyPath($this->data, $value);
 
-        $entries = $this->accessor->getValue($row, $path);
-
-        if (count($entries) > 0) {
-            foreach ($entries as $key => $entry) {
-                $currentPath = $path.'['.$key.']'.$value;
-                $currentObjectPath = Helper::getPropertyPathObjectNotation($path, $key, $value);
-
-                if (true === $this->isEditableContentRequired($row)) {
-                    $content = $this->renderTemplate(
-                        $this->accessor->getValue($row, $currentPath),
-                        $row[$this->editable->getPk()],
-                        $currentObjectPath
-                    );
-                } else {
-                    $content = $this->renderTemplate($this->accessor->getValue($row, $currentPath));
-                }
+        if ($this->accessor->isReadable($row, $path)) {
 
-                $this->accessor->setValue($row, $currentPath, $content);
+            $entries = $this->accessor->getValue($row, $path);
+
+            if (count($entries) > 0) {
+                foreach ($entries as $key => $entry) {
+                    $currentPath = $path . '[' . $key . ']' . $value;
+                    $currentObjectPath = Helper::getPropertyPathObjectNotation($path, $key, $value);
+
+                    if (true === $this->isEditableContentRequired($row)) {
+                        $content = $this->renderTemplate(
+                            $this->accessor->getValue($row, $currentPath),
+                            $row[$this->editable->getPk()],
+                            $currentObjectPath
+                        );
+                    } else {
+                        $content = $this->renderTemplate($this->accessor->getValue($row, $currentPath));
+                    }
+
+                    $this->accessor->setValue($row, $currentPath, $content);
+                }
+            } else {
+                // no placeholder - leave this blank
             }
-        } else {
-            // no placeholder - leave this blank
+
         }
 
         return $this;
@@ -138,7 +146,7 @@ public function renderToMany(array &$row)
      */
     public function getCellContentTemplate()
     {
-        return 'SgDatatablesBundle:render:boolean.html.twig';
+        return '@SgDatatables/render/boolean.html.twig';
     }
 
     /**
@@ -148,7 +156,7 @@ public function renderPostCreateDatatableJsContent()
     {
         if ($this->editable instanceof EditableInterface) {
             return $this->twig->render(
-                'SgDatatablesBundle:column:column_post_create_dt.js.twig',
+                '@SgDatatables/column/column_post_create_dt.js.twig',
                 array(
                     'column_class_editable_selector' => $this->getColumnClassEditableSelector(),
                     'editable_options' => $this->editable,
@@ -336,7 +344,7 @@ public function setFalseLabel($falseLabel)
     private function renderTemplate($data, $pk = null, $path = null)
     {
         $renderVars = array(
-            'data' => $data,
+            'data' => $this->isCustomDql() && in_array($data, array(0, 1, '0', '1'), true) ? boolval($data) : $data,
             'default_content' => $this->getDefaultContent(),
             'true_label' => $this->trueLabel,
             'true_icon' => $this->trueIcon,