Better travis file (#185)

* Better travis file

* cs

* Add compiler pass to make sure we deal with public services

Author: Nyholm

.travis.yml

@@ -1,41 +1,60 @@
 language: php
-
 sudo: false
-
 cache:
-  directories:
-    - $HOME/.composer/cache
-
-php:
-    - 7.0
-    - 7.1
+    directories:
+        - $HOME/.composer/cache/files
+        - $HOME/symfony-bridge/.phpunit
 
 env:
-  global:
-    - TEST_COMMAND="composer test"
-  matrix:
-    - SYMFONY_VERSION=3.3.*
+    global:
+        - PHPUNIT_FLAGS="-v --testsuite main"
+        - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
 
 matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.1
-      env: SYMFONY_VERSION=4.0.*
-  include:
-    - php: 7.0
-      env: TEST_COMMAND="composer test-ci" COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_VERSION=3.3.* COVERAGE=true
-    - php: 7.0
-      # We need `--prefer-source`, otherwise the `Doctrine\Tests\OrmTestCase` class won't be found.
-      env: TEST_COMMAND="phpunit --testsuite doctrine" 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
-    - composer update $COMPOSER_FLAGS
+    fast_finish: true
+    include:
+          # Minimum supported dependencies with the latest and oldest PHP version
+        - php: 7.2
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
+        - php: 7.0
+          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
+
+          # Test the latest stable release
+        - php: 7.0
+        - php: 7.1
+        - php: 7.2
+          env: COVERAGE=true PHPUNIT_FLAGS="-v --testsuite main --coverage-text --coverage-clover=build/coverage.xml"
+
+        - php: 7.1
+          # We need `--prefer-source`, otherwise the `Doctrine\Tests\OrmTestCase` class won't be found.
+          env: PHPUNIT_FLAGS="-v --testsuite doctrine" COMPOSER_FLAGS="--prefer-source" DEPENDENCIES="dunglas/symfony-lock:^3""
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^3"
+        - php: 7.2
+          env: DEPENDENCIES="dunglas/symfony-lock:^4"
+
+          # Latest commit to master
+        - php: 7.2
+          env: STABILITY="dev"
+
+    allow_failures:
+          # Dev-master is allowed to fail.
+        - env: STABILITY="dev"
+
+before_install:
+    - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
+    - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
+    - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
+
+install:
+    # To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
+    - if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
+    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - ./vendor/bin/simple-phpunit install
 
 script:
-    - $TEST_COMMAND
+    - composer validate --strict --no-check-lock
+    - ./vendor/bin/simple-phpunit $PHPUNIT_FLAGS
 
 after_success:
     - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

DependencyInjection/Compiler/FactoryValidatorPass.php

@@ -17,7 +17,7 @@
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
 /**
- * Make sure that the factory actually exists
+ * Make sure that the factory actually exists.
  *
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */

Tests/Functional/BundleInitializationTest.php

@@ -16,13 +16,20 @@
 use Geocoder\Plugin\Plugin\CachePlugin;
 use Geocoder\Plugin\PluginProvider;
 use Geocoder\Provider\GoogleMaps\GoogleMaps;
-use Geocoder\Provider\Provider;
 use Geocoder\ProviderAggregator;
 use Nyholm\BundleTest\BaseBundleTestCase;
+use Nyholm\BundleTest\CompilerPass\PublicServicePass;
 use Nyholm\NSA;
 
 class BundleInitializationTest extends BaseBundleTestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->addCompilerPass(new PublicServicePass('|[Bb]azinga:*|'));
+        $this->addCompilerPass(new PublicServicePass('|[gG]eocoder:*|'));
+    }
+
     protected function getBundleClass()
     {
         return BazingaGeocoderBundle::class;

Tests/Functional/ProviderFactoryTest.php

@@ -33,14 +33,20 @@
 use Geocoder\Provider\Nominatim\Nominatim;
 use Geocoder\Provider\OpenCage\OpenCage;
 use Geocoder\Provider\PickPoint\PickPoint;
-use Geocoder\Provider\Provider;
 use Geocoder\Provider\TomTom\TomTom;
 use Geocoder\Provider\Yandex\Yandex;
 use Nyholm\BundleTest\BaseBundleTestCase;
+use Nyholm\BundleTest\CompilerPass\PublicServicePass;
 use Nyholm\NSA;
 
 class ProviderFactoryTest extends BaseBundleTestCase
 {
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->addCompilerPass(new PublicServicePass('|bazinga.*|'));
+    }
+
     protected function getBundleClass()
     {
         return BazingaGeocoderBundle::class;

composer.json

@@ -19,7 +19,7 @@
     "symfony/console": "^3.3 || ^4.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.2",
+    "symfony/phpunit-bridge": "^3.4 || ^4.0",
     "symfony/yaml": "^3.3 || ^4.0",
     "geoip/geoip": "~1.17",
     "doctrine/cache": "~1.3",
@@ -28,7 +28,7 @@
     "php-http/curl-client": "^1.7",
     "nyholm/psr7": "^0.2.2",
     "nyholm/nsa": "^1.1",
-    "nyholm/symfony-bundle-test": "^1.2",
+    "nyholm/symfony-bundle-test": "^1.3",
     "geocoder-php/google-maps-provider": "^4.0",
     "geocoder-php/cache-provider": "^4.0",
     "geocoder-php/arcgis-online-provider": "^4.0",
@@ -61,8 +61,7 @@
     }
   },
   "scripts": {
-    "test": "vendor/bin/phpunit --testsuite main",
-    "test-ci": "vendor/bin/phpunit --testsuite main --coverage-text --coverage-clover=build/coverage.xml"
+    "test": "vendor/bin/simple-phpunit --testsuite main"
   },
   "minimum-stability": "dev",
   "prefer-stable": true,