Composer and test updates (lexik#311)

* Composer and test update (#3)
snebes · Sep 1, 2019 · e27d46f · e27d46f
1 parent f6bc22f
commit e27d46f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 52 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,48 +1,42 @@
 language: php
 
-sudo: false
-
 cache:
     directories:
-        - $HOME/.composer/cache
+        - $HOME/.composer/cache/files
 
 php:
-    - 5.6
     - 7.0
     - 7.1
+    - 7.2
+    - 7.3
+
+env:
+    global:
+        - MONGO_EXTENSION="mongodb.so"
+        - COMPOSER_FLAGS=""
 
 matrix:
-    exclude:
+    include:
         - php: 5.6
-          env: SYMFONY_VERSION=4.0.*
-        - php: 7.0
-          env: SYMFONY_VERSION=4.0.*
+          env: MONGO_EXTENSION="mongo.so" SYMFONY_VERSION="symfony/lts:^2"
+        - php: 7.1
+          env: SYMFONY_VERSION="symfony/lts:^3"
     fast_finish: true
 
 services:
     - mongodb
 
-env:
-    - SYMFONY_VERSION=2.8.*
-    - SYMFONY_VERSION=3.0.*
-    - SYMFONY_VERSION=3.1.*
-    - SYMFONY_VERSION=3.2.*
-    - SYMFONY_VERSION=3.3.*
-    - SYMFONY_VERSION=4.0.*
-
 before_install:
-    - if [[ "$STABLE" != "" ]]; then composer config minimum-stability $STABLE; fi;
+    - echo "extension = $MONGO_EXTENSION" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+    - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 
 before_script:
-    - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-    - echo memory_limit = -1 >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-    - if [[ $TRAVIS_PHP_VERSION =~ ^5 ]]; then echo 'extension = "mongo.so"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
-    - if ! [[ $TRAVIS_PHP_VERSION =~ ^5 ]]; then echo 'extension = "mongodb.so"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;
-    - composer self-update
-    - if ! [[ $TRAVIS_PHP_VERSION =~ ^5 ]]; then composer config "platform.ext-mongo" "1.6.16" && composer require alcaeus/mongo-php-adapter; fi;
-    - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update
-    - composer require symfony/form:${SYMFONY_VERSION} --no-update
-    - composer update
+    - composer config platform.ext-mongo 1.6.16
+    - if [ "$SYMFONY_VERSION" != "" ]; then travis_wait composer require --no-update $SYMFONY_VERSION; fi;
+    - travis_wait composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+    - if ! [[ $TRAVIS_PHP_VERSION =~ ^5 ]]; then composer require alcaeus/mongo-php-adapter; fi;
 
 script:
-    - bin/phpunit
+    - composer validate --no-check-lock --strict
+    - bin/phpunit --coverage-text
diff --git a/Tests/Filter/Doctrine/DoctrineQueryBuilderUpdater.php b/Tests/Filter/Doctrine/DoctrineQueryBuilderUpdater.php
@@ -2,9 +2,9 @@
 
 namespace Lexik\Bundle\FormFilterBundle\Tests\Filter\Doctrine;
 
+use Doctrine\ORM\QueryBuilder;
 use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\BooleanFilterType;
-use Lexik\Bundle\FormFilterBundle\Filter\QueryBuilderUpdater;
 use Lexik\Bundle\FormFilterBundle\Tests\TestCase;
 use Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Filter\RangeFilterType;
 use Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Filter\ItemCallbackFilterType;
@@ -34,6 +34,11 @@ public function setUp()
         $this->conn = $this->em->getConnection();
     }
 
+    /**
+     * @return QueryBuilder
+     */
+    abstract protected function createDoctrineQueryBuilder();
+
     /**
      * Get query parameters from the query builder.
      *
@@ -46,7 +51,7 @@ protected function getQueryBuilderParameters($qb)
             return $qb->getParameters();
         }
 
-        if ($qb instanceof \Doctrine\ORM\QueryBuilder) {
+        if ($qb instanceof QueryBuilder) {
             $params = array();
 
             foreach ($qb->getParameters() as $parameter) {
@@ -110,6 +115,7 @@ protected function createBuildQueryTest($method, array $dqls)
         $this->assertEquals(array('p_i_position' => 2, 'p_i_enabled' => 1), $this->getQueryBuilderParameters($doctrineQueryBuilder));
 
         // bind a request to the form - date + pattern selector
+        $year = \date('Y');
         $form = $this->formFactory->create(ItemFilterType::class, null, array(
             'with_selector' => true,
         ));
@@ -118,12 +124,12 @@ protected function createBuildQueryTest($method, array $dqls)
         $form->submit(array(
             'name'      => array('text' => 'blabla', 'condition_pattern' => FilterOperands::STRING_ENDS),
             'position'  => array('text' => 2, 'condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL),
-            'createdAt' => array('year' => 2013, 'month' => 9, 'day' => 27),
+            'createdAt' => array('year' => $year, 'month' => 9, 'day' => 27),
         ));
 
         $filterQueryBuilder->addFilterConditions($form, $doctrineQueryBuilder);
         $this->assertEquals($dqls[5], $doctrineQueryBuilder->{$method}());
-        $this->assertEquals(array('p_i_position' => 2, 'p_i_createdAt' => new \DateTime('2013-09-27')), $this->getQueryBuilderParameters($doctrineQueryBuilder));
+        $this->assertEquals(array('p_i_position' => 2, 'p_i_createdAt' => new \DateTime("{$year}-09-27")), $this->getQueryBuilderParameters($doctrineQueryBuilder));
 
         // bind a request to the form - datetime + pattern selector
         $form = $this->formFactory->create(ItemFilterType::class, null, array(
@@ -136,14 +142,14 @@ protected function createBuildQueryTest($method, array $dqls)
             'name'      => array('text' => 'blabla', 'condition_pattern' => FilterOperands::STRING_ENDS),
             'position'  => array('text' => 2, 'condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL),
             'createdAt' => array(
-                'date' => array('year' => 2013, 'month' => 9, 'day' => 27),
+                'date' => array('year' => $year, 'month' => 9, 'day' => 27),
                 'time' => array('hour' => 13, 'minute' => 21),
             ),
         ));
 
         $filterQueryBuilder->addFilterConditions($form, $doctrineQueryBuilder);
         $this->assertEquals($dqls[6], $doctrineQueryBuilder->{$method}());
-        $this->assertEquals(array('p_i_position' => 2, 'p_i_createdAt' => new \DateTime('2013-09-27 13:21:00')), $this->getQueryBuilderParameters($doctrineQueryBuilder));
+        $this->assertEquals(array('p_i_position' => 2, 'p_i_createdAt' => new \DateTime("{$year}-09-27 13:21:00")), $this->getQueryBuilderParameters($doctrineQueryBuilder));
     }
 
     protected function createDisabledFieldTest($method, array $dqls)

diff --git a/Tests/Filter/Doctrine/MongodbQueryBuilderUpdaterTest.php b/Tests/Filter/Doctrine/MongodbQueryBuilderUpdaterTest.php
@@ -11,14 +11,10 @@
 use Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Filter\RangeFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\BooleanFilterType;
-use Lexik\Bundle\FormFilterBundle\Filter\QueryBuilderUpdater;
 use Lexik\Bundle\FormFilterBundle\Tests\TestCase;
 use Lexik\Bundle\FormFilterBundle\Tests\Fixtures\Filter\ItemFilterType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Mongodb query builder tests.
@@ -46,14 +42,16 @@ public function setUp()
 
     public function testBuildQuery()
     {
+        $year = \date('Y');
+
         $bson = array(
             '#db.items.find\(({ })?\);#',
             'db.items.find({ "$and": [ { "name": "blabla" } ] });',
             'db.items.find({ "$and": [ { "name": "blabla" }, { "position": { "$gt": 2 } } ] });',
             'db.items.find({ "$and": [ { "name": "blabla" }, { "position": { "$gt": 2 } }, { "enabled": true } ] });',
             'db.items.find({ "$and": [ { "name": "blabla" }, { "position": { "$gt": 2 } }, { "enabled": true } ] });',
-            '#db.items.find\(\{ "\$and": \[ \{ "name": new RegExp\("\.\*blabla\$", "i"\) \}, \{ "position": \{ "\$lte": 2 \} \}, \{ "createdAt": new ISODate\("2013-09-27T00:00:00\+[0-9:]+"\) \} \] \}\);#',
-            '#db.items.find\(\{ "\$and": \[ \{ "name": new RegExp\("\.\*blabla\$", "i"\) \}, \{ "position": \{ "\$lte": 2 \} \}, \{ "createdAt": new ISODate\("2013-09-27T13:21:00\+[0-9:]+"\) \} \] \}\);#',
+            '#db.items.find\(\{ "\$and": \[ \{ "name": new RegExp\("\.\*blabla\$", "i"\) \}, \{ "position": \{ "\$lte": 2 \} \}, \{ "createdAt": new ISODate\("' . $year . '-09-27T00:00:00\+[0-9:]+"\) \} \] \}\);#',
+            '#db.items.find\(\{ "\$and": \[ \{ "name": new RegExp\("\.\*blabla\$", "i"\) \}, \{ "position": \{ "\$lte": 2 \} \}, \{ "createdAt": new ISODate\("' . $year . '-09-27T13:21:00\+[0-9:]+"\) \} \] \}\);#',
         );
 
         $form = $this->formFactory->create(ItemFilterType::class);
@@ -110,7 +108,7 @@ public function testBuildQuery()
         $form->submit(array(
             'name'      => array('text' => 'blabla', 'condition_pattern' => FilterOperands::STRING_ENDS),
             'position'  => array('text' => 2, 'condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL),
-            'createdAt' => array('year' => 2013, 'month' => 9, 'day' => 27),
+            'createdAt' => array('year' => $year, 'month' => 9, 'day' => 27),
         ));
 
         $filterQueryBuilder->addFilterConditions($form, $mongoQB);
@@ -127,7 +125,7 @@ public function testBuildQuery()
             'name'      => array('text' => 'blabla', 'condition_pattern' => FilterOperands::STRING_ENDS),
             'position'  => array('text' => 2, 'condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL),
             'createdAt' => array(
-                'date' => array('year' => 2013, 'month' => 9, 'day' => 27),
+                'date' => array('year' => $year, 'month' => 9, 'day' => 27),
                 'time' => array('hour' => 13, 'minute' => 21),
             ),
         ));

diff --git a/Tests/TestCase.php b/Tests/TestCase.php
@@ -18,7 +18,7 @@
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var Symfony\Component\Form\FormFactory
+     * @var FormFactory
      */
     protected $formFactory;
 
@@ -30,7 +30,7 @@ public function setUp()
     /**
      * Create a form factory instance.
      *
-     * @return \Symfony\Component\Form\FormFactory
+     * @return FormFactory
      */
     public function getFormFactory()
     {

diff --git a/composer.json b/composer.json
@@ -19,23 +19,27 @@
     ],
     "require": {
         "php": ">=5.5.9",
+        "doctrine/orm": "^2.4.8",
         "symfony/framework-bundle": "~2.8|~3.0|^4.0",
-        "symfony/form": "~2.8|~3.0|^4.0",
-        "doctrine/orm": "^2.4.8"
+        "symfony/form": "~2.8|~3.0|^4.0"
     },
     "require-dev": {
-        "doctrine/mongodb-odm-bundle": "~3.0",
-        "phpunit/phpunit": "^5.7|~6.0"
+        "doctrine/mongodb-odm-bundle": "^3.0",
+        "phpunit/phpunit": "~5.0|^7.5"
     },
     "autoload":     {
         "psr-4": { "Lexik\\Bundle\\FormFilterBundle\\": "" }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
             "dev-master": "5.x.x-dev"
         }
+    },
+    "suggest": {
+        "alcaeus/mongo-php-adapter": "Install this package if using the PHP 7 MongoDB Driver"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="Tests/bootstrap.php"
 >
     <testsuites>
@@ -17,7 +19,7 @@
         </testsuite>
     </testsuites>
     <filter>
-    
+
         <whitelist>
             <directory>./</directory>
             <exclude>
@@ -26,7 +28,7 @@
             </exclude>
         </whitelist>
     </filter>
-    
+
     <php>
         <server name="ROOT_DIR" value="../../../../.." />
     </php>