Merge pull request #214 from symfony-cmf/build

cleanup build matrix

Author: wouterj

.travis.yml

@@ -10,22 +10,23 @@ sudo: false
 
 cache:
   directories:
+    - .phpunit
     - $HOME/.composer/cache/files
 
 env:
+  matrix: SYMFONY_VERSION=3.2.*
   global:
-    - SYMFONY_DEPRECATIONS_HELPER=weak
-  matrix:
-    - SYMFONY_VERSION=2.8.*
+    - SYMFONY_DEPRECATIONS_HELPER=42
+    - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
 
 matrix:
   include:
-    - php: 7.0
-      env: DEPS=dev SYMFONY_VERSION=3.1.*
     - php: 5.5
-      env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 7.0
-      env: DEPS=dev COMPOSER_FLAGS="--prefer-stable" SYMFONY_VERSION=3.0.*
+      env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 7.1
+      env: DEPS=dev SYMFONY_VERSION=3.3.*
+    - php: 7.1
+      env: SYMFONY_VERSION=3.1.*
   fast_finish: true
 
 before_install:
@@ -37,8 +38,7 @@ before_install:
 
 install: composer update --prefer-dist $COMPOSER_FLAGS
 
-script: phpunit
+script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "symfony-cmf-devs@googlegroups.com"

README.md

@@ -16,7 +16,7 @@ translated content.
 
 ## Requirements
 
-* Symfony 2.3+
+* Symfony 2.8+
 
 
 ## Documentation

composer.json

@@ -18,19 +18,22 @@
     },
     "require-dev": {
         "symfony/security-bundle": "^2.8|^3.0",
+        "symfony/phpunit-bridge": "^3.2",
         "mockery/mockery": "^0.9.4",
-        "symfony-cmf/routing-bundle": "^1.2|^2.0",
+        "symfony-cmf/routing-bundle": "^2.0",
         "symfony-cmf/testing": "^1.3|^2.0",
         "doctrine/dbal": "2.5.*",
         "doctrine/phpcr-odm": "^1.0|^2.0"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "suggest": {
         "symfony/twig-bundle": "To get access to the CMF twig extension (^2.1)",
         "doctrine/phpcr-bundle": "To be able to use the CMF twig extension (^1.0)",
         "doctrine/phpcr-odm": "To be able to use the CMF twig extension (^1.0)",
         "symfony/security-bundle": "To be able to use the publish workflow system (^2.1)",
         "symfony-cmf/routing": "To be able to use the CMF twig extension functions cmf_prev_linkable/cmf_next_linkable (^1.2)",
-        "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^1.2)",
+        "symfony-cmf/routing-bundle": "To be able to enable the publish_workflow_listener (^2.0)",
         "symfony-cmf/sonata-admin-integration-bundle": "To provide an admin interface for the PHPCR ODM documents."
     },
     "autoload": {

src/DependencyInjection/CmfCoreExtension.php

@@ -37,7 +37,7 @@ public function prepend(ContainerBuilder $container)
         $config = $this->processConfiguration(new Configuration(), $configs);
 
         $extensions = $container->getExtensions();
-        if (isset($config['multilang']['locales']) && isset($extensions['cmf_routing'])) {
+        if (isset($config['multilang']['locales'], $extensions['cmf_routing'])) {
             $container->prependExtensionConfig('cmf_routing', array(
                 'dynamic' => array('locales' => $config['multilang']['locales']),
             ));

tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php

@@ -11,22 +11,32 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\Form;
 
+use Symfony\Bridge\Twig\Form\TwigRenderer;
+use Symfony\Bridge\Twig\Extension\FormExtension;
+use Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\DataFixture\LoadRouteData;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 use Symfony\Cmf\Bundle\CoreBundle\Form\Type\CheckboxUrlLabelFormType;
+use Symfony\Bundle\TwigBundle\ContainerAwareRuntimeLoader;
 
 class CheckboxUrlLabelFormTypeTest extends BaseTestCase
 {
     public function setUp()
     {
-        $this->db('PHPCR')->loadFixtures(array('\Symfony\Cmf\Bundle\CoreBundle\Tests\Resources\DataFixture\LoadRouteData'));
+        $this->db('PHPCR')->loadFixtures(array(LoadRouteData::class));
     }
 
     public function testFormTwigTemplate()
     {
-        $twigExtension = $this->getContainer()->get('twig');
-        $twigExtension->initRuntime();
-        $renderer = $twigExtension->getExtension('form')->renderer;
+        $twig = $this->getContainer()->get('twig');
+        if (class_exists(ContainerAwareRuntimeLoader::class)) {
+            // TwigBridge 3.2+
+            $renderer = $twig->getRuntime(TwigRenderer::class);
+        } else {
+            $twig25 = !method_exists($twig, 'getRuntime');
+            $renderer = $twig->getExtension($twig25 ? 'form' : FormExtension::class)->renderer;
+            $renderer->setEnvironment($twig);
+        }
 
         $view = $this->getContainer()->get('form.factory')->createNamedBuilder('name')
             ->add('terms', CheckboxUrlLabelFormType::class, array(

tests/Functional/Twig/ServiceTest.php

@@ -11,14 +11,16 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\Twig;
 
+use Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 
 class ServiceTest extends BaseTestCase
 {
     public function testContainer()
     {
+        /** @var \Twig_Environment $twig */
         $twig = $this->getContainer()->get('twig');
-        $ext = $twig->getExtension('cmf');
+        $ext = $twig->getExtension(method_exists($twig, 'getRuntime') ? CmfExtension::class : 'cmf');
         $this->assertNotEmpty($ext);
     }
 }