fix: merge conflict

linkorb · Mar 5, 2022 · de0fe90 · de0fe90
2 parents c1a2aea + bd489b4
commit de0fe90
Show file tree

Hide file tree

Showing 4 changed files with 1,212 additions and 730 deletions.
diff --git a/Resources/views/base.wiki.html.twig b/Resources/views/base.wiki.html.twig
@@ -7,7 +7,7 @@
     <h4>Table of contents
         <small><a class="text text-muted" href="{{ path('wiki_page_edit', {'wikiName': wiki.name, 'id': tocPage.id } )}}"><i class="fa fa-edit"></i></a></small>
     </h4>
-    {{ tocPage.content|markdown }}
+    {{ tocPage.content|default('')|markdown_to_html }}
     {% else %}
       <h4>Pages</h4>
 

diff --git a/Resources/views/wiki_page/view.html.twig b/Resources/views/wiki_page/view.html.twig
@@ -24,7 +24,7 @@
                   </div>
                 {% endif %}
                 <div class="mt-2 wiki-content">
-                    {{ content|markdown }}
+                    {{ content|default('')|markdown_to_html }}
                 </div>
             </fieldset>
         </div>

diff --git a/composer.json b/composer.json
@@ -29,16 +29,20 @@
       "role": "Developer"
     }
   ],
+  "config": {
+    "sort-packages": true
+  },
   "autoload": {
     "psr-4": {
       "LinkORB\\Bundle\\WikiBundle\\": ""
     }
   },
   "require": {
-    "doctrine/doctrine-bundle": "*",
-    "symfony/framework-bundle": "^4.0|5.1.*",
-    "sensio/framework-extra-bundle": "^5.1",
-    "symfony/security-bundle": "^4.0|5.1.*",
-    "andrewfenn/pid-helper": "^0.1.0"
+    "andrewfenn/pid-helper": "^0.1.0",
+    "doctrine/doctrine-bundle": "^2.5",
+    "sensio/framework-extra-bundle": "^5.1 || ^6.0",
+    "symfony/framework-bundle": "^4.0 || ^5.1",
+    "symfony/security-bundle": "^4.0 || ^5.1",
+    "twig/markdown-extra": "^3.3"
   }
 }