Merge pull request #41 from worldia/chore/symfony-v4-support

chore(Deps): add Symfony v4 support

Tests/Fixtures/Project/app/AppKernel.php

@@ -1,9 +1,17 @@
 <?php
 
-use Symfony\Component\HttpKernel\Kernel;
+namespace Worldia\Bundle\TextmasterBundle\Tests\Fixtures\Project\app;
+
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle;
+use Worldia\Bundle\ProductTestBundle\WorldiaProductTestBundle;
+use Worldia\Bundle\TextmasterBundle\WorldiaTextmasterBundle;
 
-class AppKernel extends Kernel
+class AppKernel extends BaseKernel
 {
     private $mainBundle = 'WorldiaTextmasterBundle';
 
@@ -13,12 +21,12 @@ class AppKernel extends Kernel
     public function registerBundles()
     {
         return array(
-            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Symfony\Bundle\TwigBundle\TwigBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
-            new Worldia\Bundle\ProductTestBundle\WorldiaProductTestBundle(),
-            new Worldia\Bundle\TextmasterBundle\WorldiaTextmasterBundle(),
+            new DoctrineBundle(),
+            new FrameworkBundle(),
+            new TwigBundle(),
+            new WhiteOctoberPagerfantaBundle(),
+            new WorldiaProductTestBundle(),
+            new WorldiaTextmasterBundle(),
         );
     }
 
@@ -43,8 +51,6 @@ private function guessTempDirectoryFor($dirname)
             __DIR__.'/build/tmp/'.$dirname
             : sys_get_temp_dir().'/'.$this->mainBundle.'/'.$dirname;
 
-            // var_dump($dir);
-            // die;
             return $dir;
     }
 }

behat.yml

@@ -14,5 +14,6 @@ default:
       kernel:
         env: test
         debug: true
+        class: Worldia\Bundle\TextmasterBundle\Tests\Fixtures\Project\app\AppKernel
         path: Tests/Fixtures/Project/app/AppKernel.php
         bootstrap: Tests/Fixtures/Project/app/bootstrap.php

composer.json

@@ -14,20 +14,20 @@
     "require": {
         "php": ">=7.0",
         "worldia/textmaster-api": "^1.0",
-        "symfony/framework-bundle": "^3.2",
-        "symfony/property-access": "^3.2",
-        "symfony/validator": "^3.2",
-        "symfony/security-csrf": "^3.2",
-        "symfony/form": "^3.2",
+        "symfony/framework-bundle": "^3.2|^4.0",
+        "symfony/property-access": "^3.2|^4.0",
+        "symfony/validator": "^3.2|^4.0",
+        "symfony/security-csrf": "^3.2|^4.0",
+        "symfony/form": "^3.2|^4.0",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
-        "symfony/browser-kit": "^3.2",
-        "symfony/twig-bundle": "^3.2",
-        "symfony/templating": "^3.2",
-        "symfony/asset": "^3.2",
+        "symfony/browser-kit": "^3.2|^4.0",
+        "symfony/twig-bundle": "^3.2|^4.0",
+        "symfony/templating": "^3.2|^4.0",
+        "symfony/asset": "^3.2|^4.0",
         "matthiasnoback/symfony-config-test": "^3.0",
         "matthiasnoback/symfony-dependency-injection-test": "^2.0",
         "behat/symfony2-extension": "2.1.*",

phpunit.xml.dist

@@ -10,6 +10,7 @@
 
     <php>
         <server name="KERNEL_DIR" value="/Tests/Fixtures/Project/app/" />
+        <server name="KERNEL_CLASS" value="Worldia\Bundle\TextmasterBundle\Tests\Fixtures\Project\app\AppKernel" />
     </php>
 
     <filter>