Test doctrine in separate build (#147)

* Test doctrine in separate build

* Added better instructions

* Fixes

* Syntax fix

Author: Nyholm

.travis.yml

@@ -11,6 +11,8 @@ php:
     - 7.1
 
 env:
+  global:
+    - TEST_COMMAND="composer test"
   matrix:
     - SYMFONY_VERSION=3.3.*
 
@@ -21,17 +23,19 @@ matrix:
       env: SYMFONY_VERSION=4.0.*
   include:
     - php: 7.0
-      env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_VERSION=3.3.* TEST_COMMAND="phpunit --coverage-text --coverage-clover=build/coverage.xml" COVERAGE=true
+      env: TEST_COMMAND="composer test-ci" COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_VERSION=3.3.* COVERAGE=true
+    - php: 7.0
+      env: TEST_COMMAND="phpunit" COMPOSER_FLAGS="--prefer-source" SYMFONY_VERSION="3.3.* phpunit/phpunit:^5.7"
     - php: 7.1
       env: SYMFONY_VERSION=4.0.*
 
 before_script:
     - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
     # This command must be run with `--prefer-source`, otherwise the `Doctrine\Tests\OrmTestCase` class won't be found.
-    - composer update --prefer-source
+    - composer update $COMPOSER_FLAGS
 
 script:
-    - phpunit
+    - $TEST_COMMAND
 
 after_success:
     - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

Resources/doc/index.md

@@ -264,15 +264,24 @@ Testing
 
 Setup the test suite using [Composer](http://getcomposer.org/):
 
+
 ```bash
-composer install --dev --prefer-source
+composer update
+composer test
 ```
 
-**Important:** this command must be run with `--prefer-source`, otherwise the
-`Doctrine\Tests\OrmTestCase` class won't be found.
+### Doctrine test
 
-Run it using PHPUnit:
+There is also a test that tests the doctrine integration. It runs automatically on
+Traivs but if you want to run it locally you must do the following.
 
 ```bash
-composer test
+composer require phpunit/phpunit:^5.7 --no-update
+composer update --prefer-source
+wget https://phar.phpunit.de/phpunit-5.7.phar
+php phpunit-5.7.phar --testsuit doctrine 
 ```
+
+**Important:** this command must be run with `--prefer-source`, otherwise the
+`Doctrine\Tests\OrmTestCase` class won't be found.
+

Tests/Doctrine/ORM/GeocoderListenerTest.php

@@ -44,7 +44,7 @@ public static function setUpBeforeClass()
              * We check for DoctrineTestCase because it is in the same package as OrmTestCase and we want to be able to
              * fake OrmTestCase
              */
-            static::markTestSkipped('Doctrine\Tests\OrmTestCase was not found.');
+            static::fail('Doctrine\Tests\OrmTestCase was not found.');
         }
         parent::setUpBeforeClass();
     }

composer.json

@@ -18,15 +18,15 @@
     "symfony/console": "^3.3 || ^4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7",
+    "phpunit/phpunit": "^6.2",
     "symfony/yaml": "^3.3 || ^4.0",
     "geoip/geoip": "~1.17",
     "doctrine/cache": "~1.3",
     "doctrine/orm": "~2.3",
     "php-http/message": "^1.5",
     "php-http/curl-client": "^1.7",
     "nyholm/psr7": "^0.2.2",
-    "nyholm/symfony-bundle-test": "^1.1",
+    "nyholm/symfony-bundle-test": "^1.2",
     "geocoder-php/google-maps-provider": "^4.0",
     "geocoder-php/cache-provider": "^4.0",
     "geocoder-php/arcgis-online-provider": "^4.0",
@@ -58,8 +58,8 @@
     }
   },
   "scripts": {
-    "test": "vendor/bin/phpunit",
-    "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+    "test": "vendor/bin/phpunit --testsuite main",
+    "test-ci": "vendor/bin/phpunit --testsuite main --coverage-text --coverage-clover=build/coverage.xml"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,

phpunit.xml.dist

@@ -12,8 +12,12 @@
          bootstrap="Tests/bootstrap.php"
         >
     <testsuites>
-        <testsuite name="Geocoder for the Symfony Framework">
+        <testsuite name="main">
             <directory>./Tests</directory>
+            <exclude>./Tests/Doctrine</exclude>
+        </testsuite>
+        <testsuite name="doctrine">
+            <directory>./Tests/Doctrine</directory>
         </testsuite>
     </testsuites>
 
@@ -27,4 +31,4 @@
             </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>