Revert "bugfix #137 Fix template attributes forbidden (, masonen)"

This reverts commit 03df9d4, reversing
changes made to f99295a.

Author: phansys

Resources/views/Ticket/show_attachment.html.twig

@@ -1,5 +1,4 @@
-{% import 'hackzilla_ticket.templates.macros' as macros %}
-
+{% import 'HackzillaTicketBundle:Macros:macros.html.twig' as macros %}
 {% if message.attachmentName %}
 <br>
 <div class="ticket_attachment">

TwigExtension/TicketFeatureExtension.php

@@ -3,8 +3,10 @@
 namespace Hackzilla\Bundle\TicketBundle\TwigExtension;
 
 use Hackzilla\Bundle\TicketBundle\Component\TicketFeatures;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFunction;
 
-class TicketFeatureExtension extends \Twig_Extension
+class TicketFeatureExtension extends AbstractExtension
 {
     private $ticketFeatures;
 
@@ -19,7 +21,7 @@ public function __construct(TicketFeatures $ticketFeatures)
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('hasTicketFeature', [$this, 'hasFeature']),
+            new TwigFunction('hasTicketFeature', [$this, 'hasFeature']),
         ];
     }
 

TwigExtension/TicketGlobalExtension.php

@@ -2,7 +2,10 @@
 
 namespace Hackzilla\Bundle\TicketBundle\TwigExtension;
 
-class TicketGlobalExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface
+use Twig\Extension\AbstractExtension;
+use Twig\Extension\GlobalsInterface;
+
+class TicketGlobalExtension extends AbstractExtension implements GlobalsInterface
 {
     protected $templates = [];
 

composer.json

@@ -28,7 +28,7 @@
         "php": "^5.6 || ^7.0",
         "doctrine/doctrine-bundle": "^1.4",
         "doctrine/orm": "^2.4.8",
-        "knplabs/knp-paginator-bundle": "^2.3 || ^3.0",
+        "knplabs/knp-paginator-bundle": "^2.3 || ^3.0 || ^4.0",
         "symfony/config": "^2.8 || ^3.0 || ^4.0",
         "symfony/console": "^2.8 || ^3.0 || ^4.0",
         "symfony/dependency-injection": "^2.8 || ^3.0 || ^4.0",
@@ -41,7 +41,8 @@
         "symfony/security-bundle": "^2.8 || ^3.0 || ^4.0",
         "symfony/translation": "^2.8 || ^3.0 || ^4.0",
         "symfony/validator": "^2.8 || ^3.0 || ^4.0",
-        "symfony/yaml": "^2.8 || ^3.0 || ^4.0"
+        "symfony/yaml": "^2.8 || ^3.0 || ^4.0",
+        "twig/twig": "^1.34 || ^2.0"
     },
     "require-dev": {
         "ext-pdo_sqlite": "*",
@@ -59,6 +60,12 @@
     "autoload": {
         "psr-4": {
             "Hackzilla\\Bundle\\TicketBundle\\": ""
+        },
+        "exclude-from-classmap": ["Tests/"]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Hackzilla\\Bundle\\TicketBundle\\Tests\\": "Tests/"
         }
     },
     "config": {

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="Tests/bootstrap.php"
 >
     <php>