Fix tests

.travis.yml

@@ -35,4 +35,4 @@ before_script:
     - composer update
 
 script:
-    - phpunit
+    - bin/phpunit

Tests/Event/Listenener/PrepareListenerTest.php

@@ -16,13 +16,12 @@ public function testGetForceCaseInsensitivity()
         $pgPlatform = $this->getMockBuilder('Doctrine\DBAL\Platforms\PostgreSqlPlatform')->getMock();
         $myPlatform = $this->getMockBuilder('Doctrine\DBAL\Platforms\MySqlPlatform')->getMock();
 
-        $connection    = $this->getMock(
-            'Doctrine\DBAL\Connection',
-            array(),
-            array(),
-            '',
-            false
-        );
+        $connection = $this
+            ->getMockBuilder('Doctrine\DBAL\Connection')
+            ->disableOriginalConstructor()
+            ->getMock()
+        ;
+
         $connection->expects($this->any())
             ->method('getDatabasePlatform')
             ->will($this->onConsecutiveCalls(
@@ -40,11 +39,12 @@ public function testGetForceCaseInsensitivity()
             ->method('getConnection')
             ->will($this->returnValue($connection));
 
-        $queryBuilder  = $this->getMock(
-            '\Doctrine\ORM\QueryBuilder',
-            array('getEntityManager'),
-            array($entityManager)
-        );
+        $queryBuilder = $this
+            ->getMockBuilder('\Doctrine\ORM\QueryBuilder')
+            ->setConstructorArgs(array($entityManager))
+            ->setMethods(array('getEntityManager'))
+            ->getMock()
+        ;
 
         $queryBuilder->expects($this->any())
             ->method('getEntityManager')
@@ -53,11 +53,12 @@ public function testGetForceCaseInsensitivity()
         $this->assertTrue($listener->getForceCaseInsensitivity($queryBuilder));
         $this->assertFalse($listener->getForceCaseInsensitivity($queryBuilder));
 
-        $queryBuilder  = $this->getMock(
-            'Doctrine\DBAL\Query\QueryBuilder',
-            array('getConnection'),
-            array($connection)
-        );
+        $queryBuilder = $this
+            ->getMockBuilder('Doctrine\DBAL\Query\QueryBuilder')
+            ->setConstructorArgs(array($connection))
+            ->setMethods(array('getConnection'))
+            ->getMock()
+        ;
 
         $queryBuilder->expects($this->any())
             ->method('getConnection')

Tests/Filter/Doctrine/DBALQueryBuilderUpdaterTest.php

@@ -67,8 +67,8 @@ public function testDateRange()
     public function testDateRangeWithTimezone()
     {
         parent::createDateRangeWithTimezoneTest('getSQL', array(
-            'SELECT i FROM item i WHERE (i.startAt <= \'2015-10-20 23:59:59\') AND (i.startAt >= \'2015-10-20 00:00:00\')',
-            'SELECT i FROM item i WHERE (i.startAt <= \'2015-10-16 23:59:59\') AND (i.startAt >= \'2015-10-01 00:00:00\')',
+            'SELECT i FROM item i WHERE (i.startAt <= \'2015-10-20 18:59:59\') AND (i.startAt >= \'2015-10-19 19:00:00\')',
+            'SELECT i FROM item i WHERE (i.startAt <= \'2015-10-16 18:59:59\') AND (i.startAt >= \'2015-09-30 19:00:00\')',
         ));
     }
 

Tests/Filter/Doctrine/ORMQueryBuilderUpdaterTest.php

@@ -70,8 +70,8 @@ public function testDateRange()
     public function testDateRangeWithTimezone()
     {
         parent::createDateRangeWithTimezoneTest('getDQL', array(
-            'SELECT i FROM Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Entity\Item i WHERE i.startAt <= \'2015-10-20 23:59:59\' AND i.startAt >= \'2015-10-20 00:00:00\'',
-            'SELECT i FROM Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Entity\Item i WHERE i.startAt <= \'2015-10-16 23:59:59\' AND i.startAt >= \'2015-10-01 00:00:00\'',
+            'SELECT i FROM Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Entity\Item i WHERE i.startAt <= \'2015-10-20 18:59:59\' AND i.startAt >= \'2015-10-19 19:00:00\'',
+            'SELECT i FROM Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Entity\Item i WHERE i.startAt <= \'2015-10-16 18:59:59\' AND i.startAt >= \'2015-09-30 19:00:00\'',
         ));
     }
 

Tests/Fixtures/Filter/RangeFilterType.php

@@ -30,21 +30,21 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('default_position', NumberRangeFilterType::class)
             ->add('createdAt', DateRangeFilterType::class, array(
                 'left_date_options'  => array('widget' => 'single_text'),
-                'right_date_options' => array('widget' => 'choice'),
+                'right_date_options' => array('widget' => 'choice', 'years' => range(2010, 2020)),
             ))
             ->add('updatedAt', DateTimeRangeFilterType::class, array(
                 'left_datetime_options'  => array('date_widget' => 'single_text', 'time_widget' => 'single_text'),
-                'right_datetime_options' => array(),
+                'right_datetime_options' => array('years' => range(2010, 2020)),
             ))
             ->add('startAt', DateRangeFilterType::class, array(
                 'left_date_options' => array(
                     'widget' => 'single_text',
-                    'model_timezone' => 'Europe/Paris',
+                    'model_timezone' => 'UTC',
                     'view_timezone' => 'Asia/Karachi'
                 ),
                 'right_date_options' => array(
                     'widget' => 'single_text',
-                    'model_timezone' => 'Europe/Paris',
+                    'model_timezone' => 'UTC',
                     'view_timezone' => 'Asia/Karachi'
                 ),
             ))

composer.json

@@ -25,7 +25,7 @@
     },
     "require-dev": {
         "doctrine/mongodb-odm-bundle": "~3.0",
-        "phpunit/phpunit": "~3.7"
+        "phpunit/phpunit": "~5.7"
     },
     "autoload":     {
         "psr-4": { "Lexik\\Bundle\\FormFilterBundle\\": "" }