[master] - BB-14614: Release preparation activities (#19347)

* BB-14614: Release preparation activities - changed references for master branch to 3.1 - fixed test after upgrade twig/twig
brainOut · Jul 25, 2018 · 5fa6afb · 5fa6afb
1 parent 8233391
commit 5fa6afb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -110,7 +110,7 @@
         "npm-asset/xregexp": "3.2.*",
         "robloach/component-installer": "0.2.*",
         "jms/cg": "1.2.*",
-        "oro/redis-config": "2.x-dev",
+        "oro/redis-config": "3.1.*",
         "brick/math": "0.5.*",
         "bower-asset/fuse": "3.2.*"
     },
@@ -140,7 +140,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-master": "3.1-dev"
         }
     },
     "autoload": {

diff --git a/src/Oro/Bundle/UIBundle/Tests/Unit/Twig/EnvironmentTest.php b/src/Oro/Bundle/UIBundle/Tests/Unit/Twig/EnvironmentTest.php
@@ -40,7 +40,7 @@ public function testAutoescapeOption()
 
         $this->assertEquals('foo&lt;br/ &gt; foo&lt;br/ &gt;', $twig->render('html', array('foo' => 'foo<br/ >')));
         $this->assertEquals(
-            'foo\x3Cbr\x2F\x20\x3E foo\x3Cbr\x2F\x20\x3E',
+            'foo\u003Cbr\/\u0020\u003E foo\u003Cbr\/\u0020\u003E',
             $twig->render('js', array('bar' => 'foo<br/ >'))
         );
     }