release of version 3.0.0 (#3)

.gitignore

@@ -1,4 +1,4 @@
 /.idea
 /composer.lock
-/composer.phar
 /vendor
+.phpunit.result.cache

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.0.0] - 2020-02-
+### Changed
+- minimum php version is now 7.2
+### Removed
+- `|call` twig filter
+- Lambda, all files in `LeonAero\NodeExpression\*` (use original twig lambda)
+- `==>`, `;` twig operator
+
 ## [2.1.0] - 2020-02-24
 ### Deprecated
 - `|call` twig filter
@@ -34,6 +42,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - `is any` and `is every` twig test
 - `=>`, `;` twig operator
 
+[3.0.0]: https://github.com/leonaero/twig-lambda/compare/v3.0.0...v2.1.0
 [2.1.0]: https://github.com/leonaero/twig-lambda/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/leonaero/twig-lambda/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/leonaero/twig-lambda/compare/v1.0.0...v1.1.0

README.md

@@ -1,19 +1,26 @@
 # Twig Lambda
-> Lambda expressions for Twig and filters that make use of them
 
 ----------------------------------------------------------------
 
 | Version | Twig Version | Php Version | 
 |---- |----|----|
+| ^3.0 | ^3.0 | ^7.2 |
 | ^2.0 | ^2.10 | ^7.0 |
 | ^1.0 | ^1.0 || 2.9.* | ^5.6 || ^7.0 |
 
 <a name="examples"></a>
 ## Quick examples
 
-Listing names of all authors ordered by age:
+Listing names of all authors ordered by youngest:
 ```twig
-{% for author in articles|map(v => v.author)|unique_by('===')|sort_by(v => v.age) %}
+{% set articles = [
+	{author: {name: 'Bar', age: 55}, text: 'Text...'},
+	{author: {name: 'Bar', age: 65}, text: 'Text...'},
+	{author: {name: 'Foo', age: 45}, text: 'Text...'},
+	{author: {name: 'Foo', age: 45}, text: 'Text...'},
+] %}
+
+{% for author in articles|map(v => v.author)|unique_by('===')|sort(v => v.age)|reverse %}
     * {{ author.name }}, {{ author.age }}
 {% endfor %}
 ```
@@ -53,46 +60,7 @@ services:
 ----------------------------------------------------------------
 
 ## Usage
-
-<a name="lambda"></a>
-### ~~Lambda expression~~
-##### deprecated since 1.1.0 and will be remove in 3.0.0 use original twig lambda
-To create lambda expression prepend any valid Twig expression
-with `==>` operator.
-Inside of the lambda expression you can use
-any variable from the outside. There are also two special
-variables available:
-  * `_` (single underscore) - first argument,
-  * `__` (double underscore) - array of arguments counted
-    from zero.
-
-```
-==> _.name
-==> _ * 2
-==> _|first
-==> 'foobar'
-==> _ is even
-==> __[0] + __[1]
-```
-
-To create lambda expression with list of arguments, add it
-before `==>` operator. Separate multiple arguments with
-semicolons. You can use brackets for readability.
-
-```
-x ==> x + 1
-(book) ==> book.author
-arg1; arg2 ==> arg1 ~ arg2
-(a; b; c) ==> a + b - c
-```
-
-Note that if you use list of arguments, `_` variable is not
-longer available.
-
-----------------------------------------------------------------
-
-Below is a list of available filters and tests. All works
-with arrays and any Traversable object and preserve it keys.
+Below is a list of available filters. All works with arrays and any Traversable object and preserve it keys.
 
 ----------------------------------------------------------------
 
@@ -199,23 +167,3 @@ Returns true if lambda returns true for every element from an array.
 {{ [1, 2, 3]|is_every(v => v > 0) ? "All elements in the array are positive." }}
 {# prints 'All elements in the array are positive.' #}
 ```
-
-----------------------------------------------------------------
-
-<a name="call"></a>
-### ~~call()~~
-##### deprecated since 2.0.0
-**Signature:** `call(lambda [, arguments:array])`
-
-Calls lambda and returns its result. You can provide array
-of arguments.
-
-This function is provided to allow creating twig macros taking
-lambda as an argument.
-
-```twig
-{{ call(v => v * 2, [10]) }}
-{# prints '20' #}
-{{ call(v => v.foo, [{foo: 12}]) }}
-{# prints '12' #}
-```

Tests/Fixtures/filters/any.test

@@ -4,7 +4,7 @@
 {{ data|is_any(v => v > 6) ? 'YES':'NO' }}
 {{ data|is_any(v => v is even) ? 'YES':'NO' }}
 {{ data|is_any(v => v < 0) ? 'YES':'NO' }}
-{{ data|is_any((v; i) ==> i is same as('foo')) ? 'YES':'NO' }}
+{{ data|is_any((v, i) => i is same as('foo')) ? 'YES':'NO' }}
 --DATA--
 return [ 'data' => [1, 2, 3, 4, 5, 'foo' => 6] ];
 --EXPECT--

Tests/Fixtures/filters/count_by.test

@@ -1,7 +1,7 @@
 --TEST--
 "count_by" filter
 --TEMPLATE--
-{% for key, value in data|count_by(v ==> v.foo ) %}
+{% for key, value in data|count_by(v => v.foo ) %}
 {{ key }}: {{ value }}
 {% endfor %}
 --DATA--

Tests/Fixtures/filters/count_by_key.test

@@ -1,7 +1,7 @@
 --TEST--
 "count_by" filter counted with array key
 --TEMPLATE--
-{% for key, value in data|count_by((v; key) ==> key|first ) %}
+{% for key, value in data|count_by((v, key) => key|first ) %}
 {{ key }}: {{ value }}
 {% endfor %}
 --DATA--

Tests/Fixtures/filters/every.test

@@ -1,10 +1,10 @@
 --TEST--
 "all" test
 --TEMPLATE--
-{{ data|is_every(v ==> v > 6) ? 'YES':'NO' }}
-{{ data|is_every(v ==> v is even) ? 'YES':'NO' }}
-{{ data|is_every(v ==> v < 12) ? 'YES':'NO' }}
-{{ data|is_every((v; i) ==> i >= 0) ? 'YES':'NO' }}
+{{ data|is_every(v => v > 6) ? 'YES':'NO' }}
+{{ data|is_every(v => v is even) ? 'YES':'NO' }}
+{{ data|is_every(v => v < 12) ? 'YES':'NO' }}
+{{ data|is_every((v, i) => i >= 0) ? 'YES':'NO' }}
 --DATA--
 return [ 'data' => [] ];
 --EXPECT--

Tests/Fixtures/filters/group_by.test

@@ -1,7 +1,7 @@
 --TEST--
 "group_by" filter
 --TEMPLATE--
-{% for key,items in data|group_by(v ==> v|first ) %}
+{% for key,items in data|group_by(v => v|first ) %}
  = {{ key }}
 {% for i in items %}
    * {{ i }}

Tests/Fixtures/filters/group_by_key.test

@@ -1,7 +1,7 @@
 --TEST--
 "group_by" filter grouping with array key
 --TEMPLATE--
-{% for key,items in data|group_by((v; i) ==> i|first ) %}
+{% for key,items in data|group_by((v, i) => i|first ) %}
  = {{ key }}
 {% for i in items %}
    * {{ i }}

Tests/Fixtures/filters/group_by_object.test

@@ -1,7 +1,7 @@
 --TEST--
 "group_by" filter can group by object
 --TEMPLATE--
-{% for category, articles in array|group_by(v ==> v.category) %}
+{% for category, articles in array|group_by(v => v.category) %}
   = {{ category.name }}
 {% for article in articles %}
     * {{ article.name }}

Tests/Fixtures/filters/unique.test

@@ -1,7 +1,7 @@
 --TEST--
 "unique_by" filter
 --TEMPLATE--
-{% for i in data|unique_by((i1; i2) ==> i1 == i2) %}
+{% for i in data|unique_by((i1, i2) => i1 == i2) %}
  * {{ i }}
 {% endfor %}
 --DATA--

Tests/Fixtures/filters/unique_by.test

@@ -0,0 +1,18 @@
+--TEST--
+"unique_by" filter
+--TEMPLATE--
+{% set articles = [
+	{author: {name: 'Bar', age: 55}, text: 'Text...'},
+	{author: {name: 'Bar', age: 65}, text: 'Text...'},
+	{author: {name: 'Foo', age: 45}, text: 'Text...'},
+	{author: {name: 'Foo', age: 45}, text: 'Text...'},
+] %}
+{% for author in articles|map(v => v.author)|unique_by('===')|sort(v => v.age)|reverse %}
+    * {{ author.name }}, {{ author.age }}
+{% endfor %}
+--DATA--
+return [];
+--EXPECT--
+    * Bar, 55
+    * Foo, 45
+    * Bar, 65

Tests/Fixtures/filters/unique_object.test

@@ -1,7 +1,7 @@
 --TEST--
 "unique_by" filter works with list of objects
 --TEMPLATE--
-{% for i in list|unique_by((i1; i2) ==> i1 is same as(i2)) %}
+{% for i in list|unique_by((i1, i2) => i1 is same as(i2)) %}
  * {{ i.data }}
 {% endfor %}
 --DATA--