Symfony 3.4, php 7.2 upgrade (#9)

os2display · Feb 21, 2019 · 6832ce6 · 6832ce6
1 parent 0327757
commit 6832ce6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.0
+
+* Symfony 3.4 version.
+
 ## 1.2.0
 
 * Merged https://github.com/os2display/admin-bundle/pull/8:

diff --git a/Controller/MainController.php b/Controller/MainController.php
@@ -32,7 +32,7 @@ public function indexAction()
         $user = $this->getUser();
         $user->buildRoleGroups();
         $user = $this->get('os2display.api_data')->setApiData($user);
-        $user = $this->get('serializer')
+        $user = $this->get('jms_serializer')
             ->serialize($user, 'json', SerializationContext::create()
                 ->setGroups(array('api'))
                 ->enableMaxDepthChecks());

diff --git a/Resources/public/assets/build/os2displayadmin.min.js b/Resources/public/assets/build/os2displayadmin.min.js
diff --git a/Resources/public/assets/build/styles.min.css b/Resources/public/assets/build/styles.min.css
diff --git a/composer.json b/composer.json
@@ -3,7 +3,8 @@
     "description": "Os2Display admin",
     "type": "symfony-bundle",
     "require": {
-        "twig/extensions": "^1.0"
+        "php": ">=7.2",
+        "twig/twig": "^1.0||^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
   "name": "Os2DisplayAdminBundle",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "link": "https://github.com/os2display"
 }