Merge pull request #245 from symfony-cmf/prepare-1.3

prepare 1.3 release

Author: dbu

.travis.yml

@@ -21,7 +21,7 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: DEPS=dev
+      env: DEPS=dev SYMFONY_VERSION=2.8.*
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+1.3.0
+-----
+
+* Support Symfony 2.8
+* Support PHP 7
+
+1.2.0
+-----
+
 1.2.0-RC1
 ---------
 

Cache/BlockJsCache.php

@@ -109,7 +109,7 @@ protected function getSync(array $keys)
     {
         $dashifiedId = $this->dashify($keys['block_id']);
 
-        return sprintf(<<<CONTENT
+        return sprintf(<<<'CONTENT'
 <div id="block%s" >
     <script type="text/javascript">
         /*<![CDATA[*/
@@ -157,7 +157,7 @@ protected function getSync(array $keys)
      */
     protected function getAsync(array $keys)
     {
-        return sprintf(<<<CONTENT
+        return sprintf(<<<'CONTENT'
 <div id="block%s" >
     <script type="text/javascript">
         /*<![CDATA[*/
@@ -219,7 +219,7 @@ public function cacheAction(Request $request)
             return $response;
         }
 
-        $response->setContent(sprintf(<<<JS
+        $response->setContent(sprintf(<<<'JS'
     (function () {
         var block = document.getElementById('block%s'),
             div = document.createElement("div"),

Cache/BlockVarnishCache.php

@@ -68,7 +68,7 @@ public function __construct(
         BlockLoaderInterface $blockLoader,
         BlockContextManagerInterface $blockContextManager,
         FragmentHandler $fragmentHandler,
-        array $servers = array(),
+        array $servers,
         $purgeInstruction
     ) {
         parent::__construct($token, $servers, $router, $purgeInstruction, null);

Tests/Unit/Cache/BlockJsCacheTest.php

@@ -14,9 +14,6 @@
 use Symfony\Cmf\Bundle\BlockBundle\Cache\BlockJsCache;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- *
- */
 class BlockJsCacheTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -78,7 +75,7 @@ public function testInitCache()
 
         $this->assertInstanceOf('Sonata\Cache\CacheElement', $cacheElement);
 
-        $expected = <<<EXPECTED
+        $expected = <<<'EXPECTED'
 <div id="block-cms-content-home-additionalInfoBlock" >
     <script type="text/javascript">
         /*<![CDATA[*/

composer.json

@@ -23,10 +23,9 @@
         "symfony/framework-bundle": ">=2.3.0,<2.3.2"
     },
     "require-dev": {
-        "symfony-cmf/testing": "^1.3@RC",
+        "symfony-cmf/testing": "^1.3",
         "symfony-cmf/menu-bundle": "^1.1|^2.0",
         "sonata-project/doctrine-phpcr-admin-bundle": "^1.1",
-        "symfony-cmf/tree-browser-bundle": "^1.0.0-RC1",
         "sonata-project/cache-bundle": ">=2.1.3,<2.1.6",
         "twig/twig": "^1.14.2|^2.0"
     },