diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 79d33a69..00000000 --- a/.coveralls.yml +++ /dev/null @@ -1,3 +0,0 @@ -coverage_clover: coverage.clover -json_path: ./coveralls.json -repo_token: PpZCCrM6aBtU9l5xdzeOFj8bakIcaJqgD diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 7118ec01..b7e92c6a 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -19,61 +19,33 @@ jobs: - php-version: '5.6' lint: false symfony-version: '^2.8' - elasticsearch-package-constraint: '^5.0' - env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.0' lint: false symfony-version: '^3.4' - elasticsearch-package-constraint: '^5.0' - env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.2' lint: false symfony-version: '^3.4' - elasticsearch-package-constraint: '^5.0' - env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.3' lint: false symfony-version: '^4.4' - elasticsearch-package-constraint: '^5.0' - env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' - php-version: '7.4' lint: true symfony-version: '^5.0' - elasticsearch-package-constraint: '^5.0' - env: - ELASTICSEARCH_HOST: '127.0.0.1:9205' + elasticsearch-package-constraint: '^5.0' services: elasticsearch5: image: elasticsearch:5.6.14 ports: - - 9205:9200 - env: - discovery.type: 'single-node' - xpack.security.enabled: 'false' - options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5 - - elasticsearch6: - image: elasticsearch:6.8.4 - ports: - - 9206:9200 - env: - discovery.type: 'single-node' - xpack.security.enabled: 'false' - options: --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=5 - - elasticsearch7: - image: elasticsearch:7.9.3 - ports: - - 9202:9200 + - 9200:9200 env: discovery.type: 'single-node' xpack.security.enabled: 'false' @@ -111,12 +83,7 @@ jobs: - name: Fix code style if: ${{ matrix.lint }} - run: vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/ ./ + run: vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/,Profiler/Handler/BackwardCompatibilityWriteTrait.php ./ - name: Run tests - run: vendor/bin/simple-phpunit --coverage-clover=coverage.clover - - - name: Upload coverage results to Coveralls - run: vendor/bin/php-coveralls -v - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: vendor/bin/simple-phpunit diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 8d17ca3b..00000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,5 +0,0 @@ -imports: - - php -filter: - excluded_paths: - - Tests/* diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b3df58c9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,66 +0,0 @@ -sudo: false -dist: trusty -language: php -matrix: - include: - - language: php - php: 5.6 - env: - - SYMFONY=^2.8 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - ENABLE_SWAP=true - - - language: php - php: 7.0 - env: - - SYMFONY=^3.4 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - - language: php - php: 7.2 - env: - - SYMFONY=^3.4 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - - language: php - php: 7.3 - env: - - SYMFONY=^4.4 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - - - language: php - php: 7.4 - env: - - SYMFONY=^5.0 - - ES_VERSION=^5.0 - - ES_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.14.zip" - -before_install: - - composer self-update --snapshot # remove when composer 2 is released - -install: - # install elasticsearch - - wget ${ES_DOWNLOAD_URL} - - unzip elasticsearch-*.zip - - cd ./elasticsearch-* - - bin/elasticsearch -d - - cd .. - -before_script: - - echo 'memory_limit=-1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - - composer require --no-update symfony/symfony:${SYMFONY} - - composer require --no-update elasticsearch/elasticsearch:${ES_VERSION} - - if [[ $TRAVIS_SECURE_ENV_VARS = "true" ]]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi - - composer install --no-interaction --prefer-dist - -script: - - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200 - - vendor/bin/simple-phpunit --coverage-clover=coverage.clover - - vendor/bin/phpcs -p --standard=PSR2 --ignore=vendor/,Tests/app/,var/,Profiler/Handler/BackwardCompatibilityWriteTrait.php ./ - -after_script: - - travis_retry php vendor/bin/coveralls diff --git a/composer.json b/composer.json index e3253788..695d0cc9 100644 --- a/composer.json +++ b/composer.json @@ -39,8 +39,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/dependency-injection": "^2.8|^3.4|^4|^5", "symfony/validator": "^2.8|^3.4|^4|^5", - "symfony/options-resolver": "^2.8|^3.4|^4|^5", - "php-coveralls/php-coveralls": "^2.4.3" + "symfony/options-resolver": "^2.8|^3.4|^4|^5" }, "autoload": { "psr-4": { "ONGR\\ElasticsearchBundle\\": "" },