Fix build travis

This commit is contained in:
Maxime Helias 2019-11-19 18:24:58 +01:00
parent 99f5d37601
commit 3888d6b976
11 changed files with 26 additions and 13 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/var/
/vendor/ /vendor/
/composer.phar /composer.phar
/composer.lock /composer.lock

View File

@ -2,6 +2,7 @@
$finder = PhpCsFixer\Finder::create() $finder = PhpCsFixer\Finder::create()
->in(__DIR__) ->in(__DIR__)
->exclude('var')
->exclude('Tests/Functional/cache') ->exclude('Tests/Functional/cache')
; ;

View File

@ -22,8 +22,8 @@ use Nelmio\ApiDocBundle\Tests\Functional\Entity\SymfonyConstraints;
use Nelmio\ApiDocBundle\Tests\Functional\Entity\User; use Nelmio\ApiDocBundle\Tests\Functional\Entity\User;
use Nelmio\ApiDocBundle\Tests\Functional\Form\DummyType; use Nelmio\ApiDocBundle\Tests\Functional\Form\DummyType;
use Nelmio\ApiDocBundle\Tests\Functional\Form\UserType; use Nelmio\ApiDocBundle\Tests\Functional\Form\UserType;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Swagger\Annotations as SWG; use Swagger\Annotations as SWG;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Validator\Constraints\IsTrue; use Symfony\Component\Validator\Constraints\IsTrue;
use Symfony\Component\Validator\Constraints\Regex; use Symfony\Component\Validator\Constraints\Regex;

View File

@ -13,8 +13,8 @@ namespace Nelmio\ApiDocBundle\Tests\Functional\Controller;
use Nelmio\ApiDocBundle\Annotation\Model; use Nelmio\ApiDocBundle\Annotation\Model;
use Nelmio\ApiDocBundle\Tests\Functional\Entity\BazingaUser; use Nelmio\ApiDocBundle\Tests\Functional\Entity\BazingaUser;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Swagger\Annotations as SWG; use Swagger\Annotations as SWG;
use Symfony\Component\Routing\Annotation\Route;
/** /**
* @Route(host="api.example.com") * @Route(host="api.example.com")

View File

@ -13,8 +13,8 @@ namespace Nelmio\ApiDocBundle\Tests\Functional\Controller;
use Nelmio\ApiDocBundle\Annotation\Model; use Nelmio\ApiDocBundle\Annotation\Model;
use Nelmio\ApiDocBundle\Tests\Functional\EntityExcluded\BazingaUserTyped; use Nelmio\ApiDocBundle\Tests\Functional\EntityExcluded\BazingaUserTyped;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Swagger\Annotations as SWG; use Swagger\Annotations as SWG;
use Symfony\Component\Routing\Annotation\Route;
/** /**
* @Route(host="api.example.com") * @Route(host="api.example.com")

View File

@ -12,8 +12,8 @@
namespace Nelmio\ApiDocBundle\Tests\Functional\Controller; namespace Nelmio\ApiDocBundle\Tests\Functional\Controller;
use Nelmio\ApiDocBundle\Annotation\Security; use Nelmio\ApiDocBundle\Annotation\Security;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Swagger\Annotations as SWG; use Swagger\Annotations as SWG;
use Symfony\Component\Routing\Annotation\Route;
/** /**
* @Route("/api", host="api.example.com") * @Route("/api", host="api.example.com")

View File

@ -21,8 +21,8 @@ use Nelmio\ApiDocBundle\Tests\Functional\Entity\NestedGroup\JMSChatRoomUser;
use Nelmio\ApiDocBundle\Tests\Functional\Entity\NestedGroup\JMSChatUser; use Nelmio\ApiDocBundle\Tests\Functional\Entity\NestedGroup\JMSChatUser;
use Nelmio\ApiDocBundle\Tests\Functional\Entity\NestedGroup\JMSPicture; use Nelmio\ApiDocBundle\Tests\Functional\Entity\NestedGroup\JMSPicture;
use Nelmio\ApiDocBundle\Tests\Functional\Entity\VirtualProperty; use Nelmio\ApiDocBundle\Tests\Functional\Entity\VirtualProperty;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Swagger\Annotations as SWG; use Swagger\Annotations as SWG;
use Symfony\Component\Routing\Annotation\Route;
/** /**
* @Route(host="api.example.com") * @Route(host="api.example.com")

View File

@ -11,8 +11,8 @@
namespace Nelmio\ApiDocBundle\Tests\Functional\Controller; namespace Nelmio\ApiDocBundle\Tests\Functional\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Swagger\Annotations as SWG; use Swagger\Annotations as SWG;
use Symfony\Component\Routing\Annotation\Route;
/** /**
* @Route("/test", host="api-test.example.com") * @Route("/test", host="api-test.example.com")

View File

@ -11,7 +11,7 @@
namespace Nelmio\ApiDocBundle\Tests\Functional\Controller; namespace Nelmio\ApiDocBundle\Tests\Functional\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Component\Routing\Annotation\Route;
/** /**
* @Route(host="api.example.com") * @Route(host="api.example.com")

View File

@ -104,21 +104,31 @@ class TestKernel extends Kernel
*/ */
protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader) protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
{ {
$c->loadFromExtension('framework', [ $framework = [
'secret' => 'MySecretKey', 'secret' => 'MySecretKey',
'test' => null, 'test' => null,
'validation' => null, 'validation' => null,
'form' => null, 'form' => null,
'templating' => [
'engines' => ['twig'],
],
'serializer' => ['enable_annotations' => true], 'serializer' => ['enable_annotations' => true],
]); ];
// templating is deprecated
if (Kernel::VERSION_ID <= 40300) {
$framework['templating'] = ['engines' => ['twig']];
}
$c->loadFromExtension('framework', $framework);
$c->loadFromExtension('twig', [ $c->loadFromExtension('twig', [
'strict_variables' => '%kernel.debug%', 'strict_variables' => '%kernel.debug%',
]); ]);
$c->loadFromExtension('sensio_framework_extra', [
'router' => [
'annotations' => false,
],
]);
$c->loadFromExtension('api_platform', [ $c->loadFromExtension('api_platform', [
'mapping' => ['paths' => ['%kernel.project_dir%/Tests/Functional/Entity']], 'mapping' => ['paths' => ['%kernel.project_dir%/Tests/Functional/Entity']],
]); ]);

View File

@ -37,7 +37,8 @@
"symfony/cache": "^3.4|^4.0", "symfony/cache": "^3.4|^4.0",
"symfony/phpunit-bridge": "^3.4.24|^4.0", "symfony/phpunit-bridge": "^3.4.24|^4.0",
"symfony/stopwatch": "^3.4|^4.0", "symfony/stopwatch": "^3.4|^4.0",
"sensio/framework-extra-bundle": "^3.0", "symfony/routing": "^3.4|^4.0",
"sensio/framework-extra-bundle": "^3.0.13|^4.0|^5.0",
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.2",
"doctrine/common": "^2.4", "doctrine/common": "^2.4",