Merge pull request #2 from cvc-digital/support-twig-3

Support Twig v3 only

.travis.yml

@@ -49,35 +49,26 @@ jobs:
     - <<: *lint_php
       name: Lint PHP 7.3
       php: 7.3
-    - <<: *lint_php
-      name: Lint PHP 7.2
-      php: 7.2
     - <<: *editor_config
       name: Lint Editorconfig
       php: 7.4
-    - <<: *psalm
-      name: Psalm (PHP 7.3)
-      php: 7.3
     - <<: *psalm
       name: Psalm (PHP 7.4)
       php: 7.4
     - <<: *psalm
-      name: Psalm (PHP 7.2)
-      php: 7.2
+      name: Psalm (PHP 7.3)
+      php: 7.3
     - <<: *unit_tests
       name: Unit Tests (PHP 7.4, highest)
       php: 7.4
     - <<: *unit_tests
       name: Unit Tests (PHP 7.3, highest)
       php: 7.3
     - <<: *unit_tests
-      name: Unit Tests (PHP 7.2, highest)
-      php: 7.2
+      name: Unit Tests (PHP 7.4, lowest)
+      php: 7.4
+      env: dependencies=lowest
     - <<: *unit_tests
       name: Unit Tests (PHP 7.3, lowest)
       php: 7.3
       env: dependencies=lowest
-    - <<: *unit_tests
-      name: Unit Tests (PHP 7.2, lowest)
-      php: 7.2
-      env: dependencies=lowest

CHANGELOG.md

@@ -4,6 +4,17 @@ 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).
 
+## 0.2.0
+
+### Changed
+
+* Support Twig v3 only
+
+### Removed
+
+* Support PHP 7.2
+* Support Twig v2
+
 ## 0.1.0
 
 ### Added

composer.json

@@ -23,8 +23,8 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "twig/twig": "^2.0",
+        "php": ">=7.3",
+        "twig/twig": "^3.0",
         "phpdocumentor/reflection-docblock": "^4.3"
     },
     "require-dev": {

src/Describer/FilterDescriber.php

@@ -18,8 +18,8 @@ final class FilterDescriber extends AbstractDescriber
 {
     public function describe(TwigFilter $filter): FilterDescription
     {
-        $skipParameters = $filter->needsContext() + $filter->needsEnvironment();
-        $description = $this->describeCallable(new FilterDescription($filter->getName()), $filter->getCallable(), $skipParameters);
+        $numberOfSkippedParameters = intval($filter->needsContext()) + intval($filter->needsEnvironment());
+        $description = $this->describeCallable(new FilterDescription($filter->getName()), $filter->getCallable(), $numberOfSkippedParameters);
         assert($description instanceof FilterDescription);
 
         return $description;

src/Describer/FunctionDescriber.php

@@ -18,8 +18,8 @@ final class FunctionDescriber extends AbstractDescriber
 {
     public function describe(TwigFunction $function): FunctionDescription
     {
-        $skipParameters = $function->needsContext() + $function->needsEnvironment();
-        $description = $this->describeCallable(new FunctionDescription($function->getName()), $function->getCallable(), $skipParameters);
+        $numberOfSkippedParameters = intval($function->needsContext()) + intval($function->needsEnvironment());
+        $description = $this->describeCallable(new FunctionDescription($function->getName()), $function->getCallable(), $numberOfSkippedParameters);
         assert($description instanceof FunctionDescription);
 
         return $description;