feat: added twig

wyster · wyster · commit e4b08f620826 · 2020-04-10T16:11:02.000+03:00
diff --git a/.docker/php/start.sh b/.docker/php/start.sh
@@ -9,4 +9,6 @@ if [ $ENABLE_XDEBUG == "1" ]; then
     docker-php-ext-enable xdebug
 fi
 
+php ./bin/console doctrine:migrations:migrate --no-interaction
+
 docker-php-entrypoint php-fpm
diff --git a/composer.json b/composer.json
@@ -9,6 +9,7 @@
     "symfony/flex": "^1.3.1",
     "symfony/framework-bundle": "5.0.*",
     "symfony/orm-pack": "^1.0",
+    "symfony/twig-pack": "^1.0",
     "symfony/yaml": "5.0.*",
     "vlucas/phpdotenv": "~4.1"
   },
diff --git a/config/bundles.php b/config/bundles.php
@@ -6,4 +6,6 @@
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
+    Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
+    Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
 ];
diff --git a/config/packages/test/twig.yaml b/config/packages/test/twig.yaml
@@ -0,0 +1,2 @@
+twig:
+    strict_variables: true
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
@@ -0,0 +1,2 @@
+twig:
+    default_path: '%kernel.project_dir%/templates'
diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
@@ -13,6 +13,6 @@ class IndexController extends AbstractController
      */
     public function main(): Response
     {
-        return new Response('Hello world!');
+        return $this->render('main.html.twig', ['message' => 'hello world!']);
     }
 }
diff --git a/symfony.lock b/symfony.lock
@@ -213,6 +213,9 @@
     "phpdocumentor/type-resolver": {
         "version": "1.1.0"
     },
+    "phpoption/phpoption": {
+        "version": "1.7.3"
+    },
     "phpro/grumphp": {
         "version": "v0.17.2"
     },
@@ -487,6 +490,29 @@
     "symfony/stopwatch": {
         "version": "v5.0.7"
     },
+    "symfony/translation-contracts": {
+        "version": "v2.0.1"
+    },
+    "symfony/twig-bridge": {
+        "version": "v5.0.7"
+    },
+    "symfony/twig-bundle": {
+        "version": "5.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "5.0",
+            "ref": "fab9149bbaa4d5eca054ed93f9e1b66cc500895d"
+        },
+        "files": [
+            "config/packages/test/twig.yaml",
+            "config/packages/twig.yaml",
+            "templates/base.html.twig"
+        ]
+    },
+    "symfony/twig-pack": {
+        "version": "v1.0.0"
+    },
     "symfony/var-dumper": {
         "version": "v5.0.7"
     },
@@ -499,9 +525,18 @@
     "theseer/tokenizer": {
         "version": "1.1.3"
     },
+    "twig/extra-bundle": {
+        "version": "v3.0.3"
+    },
+    "twig/twig": {
+        "version": "v3.0.3"
+    },
     "vimeo/psalm": {
         "version": "3.10.1"
     },
+    "vlucas/phpdotenv": {
+        "version": "v4.1.3"
+    },
     "wearejust/grumphp-extra-tasks": {
         "version": "2.2.1"
     },
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8">
+        <title>{% block title %}Welcome!{% endblock %}</title>
+        {% block stylesheets %}{% endblock %}
+    </head>
+    <body>
+        {% block body %}{% endblock %}
+        {% block javascripts %}{% endblock %}
+    </body>
+</html>
diff --git a/templates/main.html.twig b/templates/main.html.twig
@@ -0,0 +1,5 @@
+{% extends "base.html.twig" %}
+
+{% block body %}
+    <h1>{{message}}
+{% endblock %}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+twig:`
	`2`	`+ default_path: '%kernel.project_dir%/templates'`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ class IndexController extends AbstractController`
`13`	`13`	`*/`
`14`	`14`	`public function main(): Response`
`15`	`15`	`{`
`16`		`- return new Response('Hello world!');`
	`16`	`+ return $this->render('main.html.twig', ['message' => 'hello world!']);`
`17`	`17`	`}`
`18`	`18`	`}`