From 2dd26f0b96b0bcb9dbb9de79b010156e5eff4a66 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Fri, 25 Dec 2020 09:25:58 +0000 Subject: [PATCH 01/33] Create run-tests.yml --- .github/workflows/run-tests.yml | 72 +++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 .github/workflows/run-tests.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml new file mode 100644 index 00000000..ba1265f2 --- /dev/null +++ b/.github/workflows/run-tests.yml @@ -0,0 +1,72 @@ +name: "CI" + +on: + pull_request: + push: + branches: + - 'master' + +env: + fail-fast: true + PHPUNIT_FLAGS: "-v" + SYMFONY_REQUIRE: ">=4.4" + +jobs: + test: + name: "${{ matrix.operating-system }} / PHP ${{ matrix.php-version }}" + runs-on: ${{ matrix.operating-system }} + continue-on-error: ${{ matrix.allow-failures }} + + strategy: + matrix: + allow-failures: [false] + operating-system: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + php-version: ['7.2.5', '7.3', '7.4', '8.0'] + + steps: + - name: "Checkout code" + uses: actions/checkout@v2.3.3 + + - name: "Install PHP with extensions" + uses: shivammathur/setup-php@2.7.0 + with: + coverage: "none" + php-version: ${{ matrix.php-version }} + tools: composer:v2 + extensions: intl + + - name: "Set composer cache directory" + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: "Cache composer" + uses: actions/cache@v2.1.2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}-allow-failures-${{ matrix.allow-failures }} + restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer- + + - name: "Require symfony/flex" + run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main + + - if: matrix.php-version != '8.0' + run: composer update + + - if: matrix.php-version == '8.0' + run: composer update --ignore-platform-reqs + + - name: "Install PHPUnit" + run: vendor/bin/simple-phpunit install + + - name: "PHPUnit version" + run: vendor/bin/simple-phpunit --version + + - name: "Run unit tests" + run: vendor/bin/phpunit --coverage-text + + - name: "Run phantomjs tests" + run: phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index.html + + - name: "Run phantomjs tests ES5" + run: phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index-with-es5-shim.html + From 4d061353f9cb4a22e08a073b86f07a88d3ed26f1 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:40:31 +0000 Subject: [PATCH 02/33] support different versions of symfony --- .github/workflows/run-tests.yml | 32 ++++++++++++++++++++-------- .travis.yml | 37 --------------------------------- composer.json | 3 ++- 3 files changed, 25 insertions(+), 47 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ba1265f2..14be8c45 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,9 +20,25 @@ jobs: strategy: matrix: allow-failures: [false] - operating-system: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + operating-system: ['ubuntu-latest'] php-version: ['7.2.5', '7.3', '7.4', '8.0'] - + variant: [normal] + include: + - php-version: 7.2.5 + dependencies: lowest + variant: normal + - php-version: '8.0' + dependencies: highest + allowed-to-fail: false + variant: normal + - php-version: '7.4' + dependencies: highest + allowed-to-fail: false + variant: 'symfony/symfony:"4.4.*"' + - php-version: '7.4' + dependencies: highest + allowed-to-fail: false + variant: 'symfony/symfony:"5.1"' steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 @@ -34,7 +50,7 @@ jobs: php-version: ${{ matrix.php-version }} tools: composer:v2 extensions: intl - + - name: "Set composer cache directory" id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" @@ -49,11 +65,9 @@ jobs: - name: "Require symfony/flex" run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main - - if: matrix.php-version != '8.0' - run: composer update - - - if: matrix.php-version == '8.0' - run: composer update --ignore-platform-reqs + - name: Install variant + if: matrix.variant != 'normal' + run: composer require ${{ matrix.variant }} --no-update - name: "Install PHPUnit" run: vendor/bin/simple-phpunit install @@ -69,4 +83,4 @@ jobs: - name: "Run phantomjs tests ES5" run: phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index-with-es5-shim.html - + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 59651a54..00000000 --- a/.travis.yml +++ /dev/null @@ -1,37 +0,0 @@ -language: php - -php: - - 7.1 - - 7.2 - - 7.3 - - 7.4 - -sudo: false - -cache: - directories: - - $HOME/.composer/cache/files - -before_install: - - COMPOSER_MEMORY_LIMIT=-1 - - composer self-update - - if [ "$STABILITY" = "dev" ]; then composer config minimum-stability dev; fi; - -install: - - composer install - - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --with-all-dependencies; fi; - -script: - - vendor/bin/phpunit --coverage-text - - phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index.html - - phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index-with-es5-shim.html - -matrix: - fast_finish: true - include: - - php: 7.2 - env: SYMFONY_VERSION='^4.4' - - php: 7.2 - env: SYMFONY_VERSION='^5.0' - - php: 7.2 - env: STABILITY=dev diff --git a/composer.json b/composer.json index 414babdf..1ee6417b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "symfony/console": "~4.4|~5.0", "symfony/intl": "~4.4|~5.0", "symfony/translation": "~4.4|~5.0", - "symfony/twig-bundle": "~4.4|~5.0" + "symfony/twig-bundle": "~4.4|~5.0", + "symfony/symfony": "5.1" }, "require-dev": { "symfony/asset": "~4.4|~5.0", From 60a6bb07de6043d1b17872f4fe9e393d034512a0 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:46:10 +0000 Subject: [PATCH 03/33] wip+ --- .github/workflows/run-tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 14be8c45..b177c248 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -27,6 +27,7 @@ jobs: - php-version: 7.2.5 dependencies: lowest variant: normal + allowed-to-fail: false - php-version: '8.0' dependencies: highest allowed-to-fail: false @@ -50,7 +51,7 @@ jobs: php-version: ${{ matrix.php-version }} tools: composer:v2 extensions: intl - + - name: "Set composer cache directory" id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" @@ -62,9 +63,6 @@ jobs: key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}-allow-failures-${{ matrix.allow-failures }} restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer- - - name: "Require symfony/flex" - run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main - - name: Install variant if: matrix.variant != 'normal' run: composer require ${{ matrix.variant }} --no-update From 4a71f627ecac2fce5102b35bd6e1642c90280c19 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:47:26 +0000 Subject: [PATCH 04/33] fix --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b177c248..656e6410 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,9 +13,9 @@ env: jobs: test: - name: "${{ matrix.operating-system }} / PHP ${{ matrix.php-version }}" + name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }} runs-on: ${{ matrix.operating-system }} - continue-on-error: ${{ matrix.allow-failures }} + continue-on-error: ${{ matrix.allowed-to-fail }} strategy: matrix: From f5cba4efd0d55f0a5157761a456ecc390254c7a0 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:49:16 +0000 Subject: [PATCH 05/33] fix --- .github/workflows/run-tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 656e6410..eae973f0 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,13 +14,12 @@ env: jobs: test: name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }} - runs-on: ${{ matrix.operating-system }} + runs-on: 'ubuntu-latest' continue-on-error: ${{ matrix.allowed-to-fail }} strategy: matrix: allow-failures: [false] - operating-system: ['ubuntu-latest'] php-version: ['7.2.5', '7.3', '7.4', '8.0'] variant: [normal] include: @@ -34,12 +33,12 @@ jobs: variant: normal - php-version: '7.4' dependencies: highest - allowed-to-fail: false variant: 'symfony/symfony:"4.4.*"' + allowed-to-fail: false - php-version: '7.4' dependencies: highest + variant: 'symfony/symfony:"5.1"' allowed-to-fail: false - variant: 'symfony/symfony:"5.1"' steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From 3495ce03a2b0829140e57d2d7957d15dd0534c46 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:50:21 +0000 Subject: [PATCH 06/33] wip --- .github/workflows/run-tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index eae973f0..0924ce83 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,7 +15,7 @@ jobs: test: name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }} runs-on: 'ubuntu-latest' - continue-on-error: ${{ matrix.allowed-to-fail }} + continue-on-error: false strategy: matrix: @@ -26,19 +26,15 @@ jobs: - php-version: 7.2.5 dependencies: lowest variant: normal - allowed-to-fail: false - php-version: '8.0' dependencies: highest - allowed-to-fail: false variant: normal - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' - allowed-to-fail: false - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' - allowed-to-fail: false steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From e108a58957cda497e8695a1a584547492c954fa2 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:54:19 +0000 Subject: [PATCH 07/33] fix --- .github/workflows/run-tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0924ce83..ad9a5e4f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -61,6 +61,12 @@ jobs: - name: Install variant if: matrix.variant != 'normal' run: composer require ${{ matrix.variant }} --no-update + + - name: "Install Composer dependencies (${{ matrix.dependencies }})" + uses: "ramsey/composer-install@v1" + with: + dependency-versions: "${{ matrix.dependencies }}" + composer-options: "--prefer-dist --prefer-stable" - name: "Install PHPUnit" run: vendor/bin/simple-phpunit install From f558b4c77c9e9d289fddca19e6478a4244513821 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:55:27 +0000 Subject: [PATCH 08/33] remove cache --- .github/workflows/run-tests.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ad9a5e4f..c6465dea 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -51,13 +51,6 @@ jobs: id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - name: "Cache composer" - uses: actions/cache@v2.1.2 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.json') }}-allow-failures-${{ matrix.allow-failures }} - restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer- - - name: Install variant if: matrix.variant != 'normal' run: composer require ${{ matrix.variant }} --no-update From e71506dab344c603d1e42ec45a5a925c301d43b5 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 08:58:17 +0000 Subject: [PATCH 09/33] wip --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c6465dea..b1486884 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -59,7 +59,7 @@ jobs: uses: "ramsey/composer-install@v1" with: dependency-versions: "${{ matrix.dependencies }}" - composer-options: "--prefer-dist --prefer-stable" + composer-options: "--prefer-dist" - name: "Install PHPUnit" run: vendor/bin/simple-phpunit install From fdb6bc3d5a397bcd96dbaf1ae91fccea66e2fb15 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:00:08 +0000 Subject: [PATCH 10/33] fx --- .github/workflows/run-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b1486884..de278f0e 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -47,6 +47,10 @@ jobs: tools: composer:v2 extensions: intl + - name: Configuration required for PHP 8.0 + if: matrix.php-version == '8.0' + run: composer config platform.php 7.4.99 + - name: "Set composer cache directory" id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" From 8eee740d1f26ce8250529b9e4a465f716ca59bab Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:02:18 +0000 Subject: [PATCH 11/33] add allowed to fail --- .github/workflows/run-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index de278f0e..f8d0f546 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,7 +15,7 @@ jobs: test: name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }} runs-on: 'ubuntu-latest' - continue-on-error: false + continue-on-error: ${{ matrix.allowed-to-fail }} strategy: matrix: @@ -26,15 +26,19 @@ jobs: - php-version: 7.2.5 dependencies: lowest variant: normal + allowed-to-fail: false - php-version: '8.0' dependencies: highest variant: normal + allowed-to-fail: true - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' + allowed-to-fail: false - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' + allowed-to-fail: false steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From a59f023c24f23c5b0905ff19b4874c9b3bf40785 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:07:24 +0000 Subject: [PATCH 12/33] wip --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f8d0f546..8b331280 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -26,19 +26,19 @@ jobs: - php-version: 7.2.5 dependencies: lowest variant: normal - allowed-to-fail: false + allowed-to-fail: [false] - php-version: '8.0' dependencies: highest variant: normal - allowed-to-fail: true + allowed-to-fail: [true] - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' - allowed-to-fail: false + allowed-to-fail: [false] - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' - allowed-to-fail: false + allowed-to-fail: [false] steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From 8b4fb5c53500fee470cce96ead9faeeb25ba611f Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:09:02 +0000 Subject: [PATCH 13/33] r --- .github/workflows/run-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8b331280..5b7c5a8b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,26 +19,26 @@ jobs: strategy: matrix: - allow-failures: [false] + allow-failures: [true] php-version: ['7.2.5', '7.3', '7.4', '8.0'] variant: [normal] include: - php-version: 7.2.5 dependencies: lowest variant: normal - allowed-to-fail: [false] + allowed-to-fail: false - php-version: '8.0' dependencies: highest variant: normal - allowed-to-fail: [true] + allowed-to-fail: true - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' - allowed-to-fail: [false] + allowed-to-fail: false - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' - allowed-to-fail: [false] + allowed-to-fail: false steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From 54baaffc1775d0bf12099ab1ea9354c4ad5494d5 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:11:22 +0000 Subject: [PATCH 14/33] fix --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5b7c5a8b..dd754777 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - allow-failures: [true] + allowed-to-fail: [false] php-version: ['7.2.5', '7.3', '7.4', '8.0'] variant: [normal] include: From 31631c8684ed3e2b9fa2ffe4cb7830a167adcc2c Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:19:27 +0000 Subject: [PATCH 15/33] disable libxml from tests on php version 8 --- .github/workflows/run-tests.yml | 5 +++-- Tests/bootstrap.php | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index dd754777..290c4ed7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,10 +18,11 @@ jobs: continue-on-error: ${{ matrix.allowed-to-fail }} strategy: - matrix: - allowed-to-fail: [false] + matrix: php-version: ['7.2.5', '7.3', '7.4', '8.0'] variant: [normal] + dependencies: [highest] + allowed-to-fail: [false] include: - php-version: 7.2.5 dependencies: lowest diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index 179f1768..5ddd74b8 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -13,4 +13,9 @@ exit(1); } + +if (\PHP_VERSION_ID >= 80000) { + libxml_disable_entity_loader(true); +} + $loader->add('Bazinga\Bundle\JsTranslationBundle\Tests', __DIR__); From c798fd3bc4d3c9fbe7a7895e65e73cf38406f57e Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:23:05 +0000 Subject: [PATCH 16/33] fix --- .github/workflows/run-tests.yml | 4 ---- Tests/bootstrap.php | 3 +-- composer.json | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 290c4ed7..5182a5a1 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -52,10 +52,6 @@ jobs: tools: composer:v2 extensions: intl - - name: Configuration required for PHP 8.0 - if: matrix.php-version == '8.0' - run: composer config platform.php 7.4.99 - - name: "Set composer cache directory" id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index 5ddd74b8..bcc424bb 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -13,8 +13,7 @@ exit(1); } - -if (\PHP_VERSION_ID >= 80000) { +if (version_compare(PHP_VERSION, '8.0.0', '<')) { libxml_disable_entity_loader(true); } diff --git a/composer.json b/composer.json index 1ee6417b..ac9db010 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.1", + "php": ">=7.2.5", "symfony/framework-bundle": "~4.4|~5.0", "symfony/finder": "~4.4|~5.0", "symfony/console": "~4.4|~5.0", From ad3f3a9173c33325d2d9b4a8191bc44d391829df Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 09:30:06 +0000 Subject: [PATCH 17/33] add phpunit 8 for php 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ac9db010..128f9722 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "symfony/browser-kit": "~4.4|~5.0", "symfony/twig-bundle": "~4.4|~5.0", "symfony/phpunit-bridge": "^5.0", - "phpunit/phpunit": "^4.8|~5.7|~6.5" + "phpunit/phpunit": "^4.8|~5.7|~6.5|~8" }, "replace": { "willdurand/expose-translation-bundle": "2.5.*" From 697490437e3a983d4a23eaf813a27fba1824451e Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 10:52:57 +0000 Subject: [PATCH 18/33] remove yet support for phpunit 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 128f9722..ac9db010 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "symfony/browser-kit": "~4.4|~5.0", "symfony/twig-bundle": "~4.4|~5.0", "symfony/phpunit-bridge": "^5.0", - "phpunit/phpunit": "^4.8|~5.7|~6.5|~8" + "phpunit/phpunit": "^4.8|~5.7|~6.5" }, "replace": { "willdurand/expose-translation-bundle": "2.5.*" From 3f7e0061b5385f1b2b1a202071725dc89694fe7b Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 10:53:16 +0000 Subject: [PATCH 19/33] allow to fail --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5182a5a1..27d7ecb9 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -22,7 +22,7 @@ jobs: php-version: ['7.2.5', '7.3', '7.4', '8.0'] variant: [normal] dependencies: [highest] - allowed-to-fail: [false] + allowed-to-fail: [true] include: - php-version: 7.2.5 dependencies: lowest From 38f578f8d0c81496c9702a0655becd2a09401d05 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 10:56:25 +0000 Subject: [PATCH 20/33] fix --- Tests/bootstrap.php | 4 ---- composer.json | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index bcc424bb..179f1768 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -13,8 +13,4 @@ exit(1); } -if (version_compare(PHP_VERSION, '8.0.0', '<')) { - libxml_disable_entity_loader(true); -} - $loader->add('Bazinga\Bundle\JsTranslationBundle\Tests', __DIR__); diff --git a/composer.json b/composer.json index ac9db010..fac4d121 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,7 @@ "symfony/console": "~4.4|~5.0", "symfony/intl": "~4.4|~5.0", "symfony/translation": "~4.4|~5.0", - "symfony/twig-bundle": "~4.4|~5.0", - "symfony/symfony": "5.1" + "symfony/twig-bundle": "~4.4|~5.0" }, "require-dev": { "symfony/asset": "~4.4|~5.0", From ae0e4742ff076e28c78a0a0c02aa1c89d86354ee Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:01:06 +0000 Subject: [PATCH 21/33] allow to fail always true --- .github/workflows/run-tests.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 27d7ecb9..4199f8db 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -27,7 +27,7 @@ jobs: - php-version: 7.2.5 dependencies: lowest variant: normal - allowed-to-fail: false + allowed-to-fail: true - php-version: '8.0' dependencies: highest variant: normal @@ -35,11 +35,11 @@ jobs: - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' - allowed-to-fail: false + allowed-to-fail: true - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' - allowed-to-fail: false + allowed-to-fail: true steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 @@ -80,4 +80,3 @@ jobs: - name: "Run phantomjs tests ES5" run: phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index-with-es5-shim.html - \ No newline at end of file From 4227571fc494da7a7620fc302ff514162d4b2f32 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:04:35 +0000 Subject: [PATCH 22/33] add xdebug for coverage --- .github/workflows/run-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 4199f8db..b8ffd09f 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -50,7 +50,7 @@ jobs: coverage: "none" php-version: ${{ matrix.php-version }} tools: composer:v2 - extensions: intl + extensions: intl, xdebug - name: "Set composer cache directory" id: composer-cache @@ -73,7 +73,7 @@ jobs: run: vendor/bin/simple-phpunit --version - name: "Run unit tests" - run: vendor/bin/phpunit --coverage-text + run: vendor/bin/phpunit --coverage-text --verbose - name: "Run phantomjs tests" run: phantomjs Resources/js/run-qunit.js file://`pwd`/Resources/js/index.html From b5c12d424530953676144edc40cc4a16c0842502 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:08:39 +0000 Subject: [PATCH 23/33] always dependencies highest --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b8ffd09f..09259c91 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -25,9 +25,9 @@ jobs: allowed-to-fail: [true] include: - php-version: 7.2.5 - dependencies: lowest + dependencies: highest variant: normal - allowed-to-fail: true + allowed-to-fail: false - php-version: '8.0' dependencies: highest variant: normal @@ -35,11 +35,11 @@ jobs: - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' - allowed-to-fail: true + allowed-to-fail: false - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' - allowed-to-fail: true + allowed-to-fail: false steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From 0cc94c4c633cae2bc31e590ee944fbd4ccaee627 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:13:27 +0000 Subject: [PATCH 24/33] add typehint --- Tests/Dumper/TranslationDumperTest.php | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/Dumper/TranslationDumperTest.php b/Tests/Dumper/TranslationDumperTest.php index ab5e0034..6ef40cdc 100644 --- a/Tests/Dumper/TranslationDumperTest.php +++ b/Tests/Dumper/TranslationDumperTest.php @@ -149,7 +149,7 @@ class TranslationDumperTest extends WebTestCase private $dumper; - public function setUp() + public function setUp(): void { $container = $this->getContainer(); diff --git a/composer.json b/composer.json index fac4d121..394f10c7 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "symfony/browser-kit": "~4.4|~5.0", "symfony/twig-bundle": "~4.4|~5.0", "symfony/phpunit-bridge": "^5.0", - "phpunit/phpunit": "^4.8|~5.7|~6.5" + "phpunit/phpunit": "^4.8|~5.7|~6.5|~8" }, "replace": { "willdurand/expose-translation-bundle": "2.5.*" From c760dca9112fd6af463dfd6419b65805d3dd84b9 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:15:24 +0000 Subject: [PATCH 25/33] fix --- .github/workflows/run-tests.yml | 2 +- Tests/WebTestCase.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 09259c91..7eb94c4b 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ env: jobs: test: - name: PHP ${{ matrix.php-version }} + ${{ matrix.dependencies }} + ${{ matrix.variant }} + name: PHP ${{ matrix.php-version }} + ${{ matrix.variant }} runs-on: 'ubuntu-latest' continue-on-error: ${{ matrix.allowed-to-fail }} diff --git a/Tests/WebTestCase.php b/Tests/WebTestCase.php index 978c3685..7f01be62 100644 --- a/Tests/WebTestCase.php +++ b/Tests/WebTestCase.php @@ -44,7 +44,7 @@ protected static function createKernel(array $options = array()) ); } - public function setUp() + public function setUp(): void { parent::setUp(); $this->deleteTmpDir(); From 339be63b2b5f014f74fc59c2b061367c6ac3dba7 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:17:39 +0000 Subject: [PATCH 26/33] add symfony version to title --- .github/workflows/run-tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 7eb94c4b..8c8e1f18 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ env: jobs: test: - name: PHP ${{ matrix.php-version }} + ${{ matrix.variant }} + name: PHP ${{ matrix.php-version }} + ${{ matrix.symfony-version }} runs-on: 'ubuntu-latest' continue-on-error: ${{ matrix.allowed-to-fail }} @@ -23,23 +23,28 @@ jobs: variant: [normal] dependencies: [highest] allowed-to-fail: [true] + symfony-version: [latest] include: - php-version: 7.2.5 dependencies: highest variant: normal allowed-to-fail: false + symfony-version: latest - php-version: '8.0' dependencies: highest variant: normal allowed-to-fail: true + symfony-version: latest - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"4.4.*"' allowed-to-fail: false + symfony-version: 4.4 - php-version: '7.4' dependencies: highest variant: 'symfony/symfony:"5.1"' allowed-to-fail: false + symfony-version: 5.1 steps: - name: "Checkout code" uses: actions/checkout@v2.3.3 From 7dcdd9acec71c7d191aaaf6b6f5bb7b15a9187de Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:18:41 +0000 Subject: [PATCH 27/33] update --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 8c8e1f18..5c5c3399 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,7 +13,7 @@ env: jobs: test: - name: PHP ${{ matrix.php-version }} + ${{ matrix.symfony-version }} + name: PHP ${{ matrix.php-version }} + Symfony ${{ matrix.symfony-version }} runs-on: 'ubuntu-latest' continue-on-error: ${{ matrix.allowed-to-fail }} From 2fdc3a44bba1045739c2c0cb6892e4135c825d84 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:26:16 +0000 Subject: [PATCH 28/33] Element phpunit, attribute syntaxCheck: The attribute syntaxCheck is not allowed. --- phpunit.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 50b3cb79..225fccf7 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,7 +7,6 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="false" bootstrap="./Tests/bootstrap.php"> From c5720285dac031b87845f3685d2eaeeacfc8afc6 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:28:53 +0000 Subject: [PATCH 29/33] remove xdebug --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5c5c3399..b3974c04 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -55,7 +55,7 @@ jobs: coverage: "none" php-version: ${{ matrix.php-version }} tools: composer:v2 - extensions: intl, xdebug + extensions: intl - name: "Set composer cache directory" id: composer-cache From 582f16177a030fb3f8f0db1a2b1c954237ca8547 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 11:30:44 +0000 Subject: [PATCH 30/33] add coverage --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b3974c04..2da9c3cf 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -52,7 +52,7 @@ jobs: - name: "Install PHP with extensions" uses: shivammathur/setup-php@2.7.0 with: - coverage: "none" + coverage: pcov php-version: ${{ matrix.php-version }} tools: composer:v2 extensions: intl From 32489861e5970c1d41f88880e7850e96688a1d1f Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 15:01:30 +0000 Subject: [PATCH 31/33] fix --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2da9c3cf..b16852bf 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -52,7 +52,7 @@ jobs: - name: "Install PHP with extensions" uses: shivammathur/setup-php@2.7.0 with: - coverage: pcov + coverage: xdebug php-version: ${{ matrix.php-version }} tools: composer:v2 extensions: intl From a6a119e1c9f989611a7cc5fed3c38b703bc6fcf8 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 15:02:41 +0000 Subject: [PATCH 32/33] add xdebug --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b16852bf..b243aef7 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -55,7 +55,7 @@ jobs: coverage: xdebug php-version: ${{ matrix.php-version }} tools: composer:v2 - extensions: intl + extensions: intl, xdebug - name: "Set composer cache directory" id: composer-cache From 71d8966ca760da34267cc333dd78545599e21895 Mon Sep 17 00:00:00 2001 From: Hugo Monteiro Date: Sat, 26 Dec 2020 17:16:12 +0000 Subject: [PATCH 33/33] add env variable xdebug_mode --- .github/workflows/run-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b243aef7..2f5b3d4d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,6 +10,7 @@ env: fail-fast: true PHPUNIT_FLAGS: "-v" SYMFONY_REQUIRE: ">=4.4" + XDEBUG_MODE: "coverage" jobs: test: