Skip to content

Commit

Permalink
Merge pull request #35 from rdohms/fix-php-dep
Browse files Browse the repository at this point in the history
Fix incompatible code
  • Loading branch information
rdohms authored Mar 5, 2018
2 parents 22ce6b2 + 629520a commit 3fa3a04
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
19 changes: 10 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
language: php

php:
- 5.3
- 5.6
- 7.0

before_script:
- phpenv config-rm xdebug.ini
- composer self-update
- rm composer.lock
- composer install --dev
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update && composer update --dev; fi;

script: phpunit

matrix:
include:
- php: 5.3
dist: precise
- php: 5.3
env: SYMFONY_VERSION=2.8.*
dist: precise
- php: 5.6
env: SYMFONY_VERSION=2.8.*
- php: 5.6
env: SYMFONY_VERSION=3.0.*
- php: 5.6
env: SYMFONY_VERSION=3.1.*
- php: 7
env: SYMFONY_VERSION=3.0.*
- php: 7
env: SYMFONY_VERSION=3.1.*
- php: 7
env: SYMFONY_VERSION=dev-master@dev
allow_failures:
- env: SYMFONY_VERSION=dev-master@dev
exclude:
- php: 5.3
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ public function configureOptions(OptionsResolver $resolver)
*/
public function getExtendedType()
{
return FormType::class;
return 'Symfony\Component\Form\Extension\Core\Type\FormType';
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace DMS\Bundle\FilterBundle\Tests\Form\Type;

use DMS\Bundle\FilterBundle\Service\Filter;
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\FormEvents;
use DMS\Bundle\FilterBundle\Tests\Dummy\AnnotatedClass;
use DMS\Bundle\FilterBundle\Form\FilterExtension;
Expand Down Expand Up @@ -53,7 +52,7 @@ protected function getExtensions()
public function testFilterSubscriberDefined()
{
/** @var $form \Symfony\Component\Form\Form */
$form = $this->factory->create(FormType::class);
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType');

$dispatcher = $form->getConfig()->getEventDispatcher();

Expand All @@ -73,7 +72,7 @@ public function testFilterSubscriberDisabled()
$this->setUp();

/** @var $form \Symfony\Component\Form\Form */
$form = $this->factory->create(FormType::class);
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\FormType');

$dispatcher = $form->getConfig()->getEventDispatcher();

Expand All @@ -83,8 +82,8 @@ public function testFilterSubscriberDisabled()
public function testBindValidatesData()
{
$entity = new AnnotatedClass();
$builder = $this->factory->createBuilder(FormType::class, $entity);
$builder->add('name', FormType::class);
$builder = $this->factory->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', $entity);
$builder->add('name', 'Symfony\Component\Form\Extension\Core\Type\FormType');
$form = $builder->getForm();

$this->filter->expects($this->atLeastOnce())
Expand Down

0 comments on commit 3fa3a04

Please sign in to comment.