Merge branch '2.x' into 3.x

* 2.x:
  Bump min version for pinky
  fix variable name

doc/filters/sort.rst

@@ -22,7 +22,7 @@ You can pass an arrow function to sort the array:
 
 .. code-block:: twig
 
-    {% set list = [
+    {% set fruits = [
         { name: 'Apples', quantity: 5 },
         { name: 'Oranges', quantity: 2 },
         { name: 'Grapes', quantity: 4 },

extra/inky-extra/composer.json

@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "lorenzo/pinky": "^1.0",
+        "lorenzo/pinky": "^1.0.5",
         "twig/twig": "^2.4|^3.0"
     },
     "require-dev": {