add almost all cmf updates

Author: ElectricMaxxx

composer.json

@@ -50,7 +50,7 @@
         "symfony-cmf/routing-auto-bundle": "^2.1",
         "symfony-cmf/seo-bundle": "^2.1",
         "symfony-cmf/sonata-phpcr-admin-integration-bundle": "^1.1",
-        "symfony-cmf/symfony-cmf": "2.1.0-RC1 as 2.1",
+        "symfony-cmf/symfony-cmf": "^2.1",
         "symfony-cmf/tree-browser-bundle": "^2.1",
         "symfony/console": "^4.0",
         "symfony/debug-pack": "^1.0",

composer.lock

@@ -40,8 +40,8 @@ cmf_sonata_phpcr_admin_integration:
 cmf_routing:
     chain:
         routers_by_id:
-            router.default: 20
-            cmf_routing.dynamic_router: 100
+            cmf_routing.dynamic_router: 20
+            router.default: 100
     dynamic:
         route_collection_limit: 10
         controllers_by_type:

config/packages/config.yaml

@@ -7,10 +7,7 @@ imports:
 
 parameters:
     locale: en
-    locales:
-        - en
-        - fr
-        - de
+    locales: [ en, fr, de]
     secret: ThisTokenIsNotSoSecretChangeIt
     coffee.extension: \.coffee-disabled$
     coffee.bin: ''

config/packages/symfony_cmf.yaml

@@ -29,6 +29,7 @@
     <php>
         <!-- ###+ symfony/framework-bundle ### -->
         <env name="APP_ENV" value="test"/>
+        <env name="SYMFONY_ENV" value="test"/>
         <env name="APP_SECRET" value="3780da4e3c8b2225171dc1b6ddba5599"/>
         <!-- env name="TRUSTED_PROXIES" value="127.0.0.1,127.0.0.2" -->
         <!-- env name="TRUSTED_HOSTS" value="localhost,example.com" -->

config/services.yaml

@@ -53,4 +53,12 @@ public function setSeoMetadata($seoMetadata)
     {
         $this->seoMetadata = $seoMetadata;
     }
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->id;
+    }
 }

phpunit.xml.dist

@@ -55,7 +55,7 @@
                         <a href="#" class="btn  btn-default  btn-xs  navbar-btn  dropdown-toggle" data-toggle="dropdown">Read this page in <span class="caret"></span></a>
                         <ul class="dropdown-menu">
                                 {% if cmfMainContent is defined %}
-                                    {{ locale_switcher(cmfMainContent, null, 'includes/switcher_links.html.twig') }}
+                                    {# {{ locale_switcher(cmfMainContent, null, 'includes/switcher_links.html.twig') }} #}
                                 {% endif %}
                         </ul>
                     </div>

src/Document/DemoSeoContent.php

@@ -22,15 +22,15 @@ public function testRedirectToDashboard()
 
         $client->request('GET', '/admin');
 
-        $this->assertEquals(301, $client->getResponse()->getStatusCode());
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
 
         $client->followRedirect();
 
         $this->assertEquals('http://localhost/en/admin/dashboard', $client->getRequest()->getUri());
 
         $client->request('GET', '/admin/dashboard');
 
-        $this->assertEquals(301, $client->getResponse()->getStatusCode());
+        $this->assertEquals(302, $client->getResponse()->getStatusCode());
 
         $client->followRedirect();