From 395ed3d6185b5be1284863b7fedc8eab1cb33ef7 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 12:44:03 +0100
Subject: [PATCH 01/18] foo

---
 .github/workflows/test_7.2.yaml | 66 +++++++++++++++++++++++++++++++++
 .travis/before_install_test.sh  |  2 +-
 .travis/check_relevant_test.sh  |  6 ---
 3 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 .github/workflows/test_7.2.yaml
 delete mode 100755 .travis/check_relevant_test.sh

diff --git a/.github/workflows/test_7.2.yaml b/.github/workflows/test_7.2.yaml
new file mode 100644
index 00000000000..c5658b4e453
--- /dev/null
+++ b/.github/workflows/test_7.2.yaml
@@ -0,0 +1,66 @@
+on:
+    pull_request:
+        paths:
+            - 'src/**'
+            - 'tests/**'
+            - '.github/workflows/**'
+
+    push:
+        branches:
+            - develop
+            - master
+
+name: CI
+
+env:
+    SYMFONY_DEPRECATIONS_HELPER: max[self]=0
+    TARGET: test
+    UPSTREAM_URL: https://github.com/sonata-project/SonataAdminBundle.git
+    PHPUNIT_VERSION: 8
+    PHP_EXTENSIONS: "json" # just for testing now
+    PHP_INI_VALUES: "memory_limit=3072M"
+
+jobs:
+    test:
+        name: Test
+
+        runs-on: ubuntu-16.04 # xenial
+
+        strategy:
+            matrix:
+                php-version:
+                    - "7.2"
+                variant:
+                    - "--prefer-lowest"
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2.0.0
+
+            - name: "Install PHP with extensions"
+              uses: "shivammathur/setup-php@v1"
+              with:
+                  coverage: "none"
+                  extensions: "${{ env.PHP_EXTENSIONS }}"
+                  php-version: "${{ matrix.php-version }}"
+                  ini-values: "${{ env.PHP_INI_VALUES }}"
+
+            - name: "Determine composer cache directory"
+              id: "determine-composer-cache-directory"
+              run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+
+            - name: "Cache dependencies installed with composer"
+              uses: "actions/cache@v1.1.2"
+              with:
+                  path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+                  key: "php-${{ matrix.php-version }}-${{ matrix.variant }}-composer-${{ hashFiles('**/composer.lock') }}-phpunit-${{ hashFiles('**/phpunit.xml.dist') }}"
+                  restore-keys: "php-${{ matrix.php-version }}-${{ matrix.variant }}-composer-"
+
+            - name: "Install dependencies with composer"
+              run: composer update --prefer-dist --no-interaction --prefer-stable ${{ matrix.variant }}
+
+            - name: "Setup unit tests via phpunit"
+              run: |
+                  mkdir bin
+                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
+                  chmod u+x "bin/phpunit"
diff --git a/.travis/before_install_test.sh b/.travis/before_install_test.sh
index 370ce818507..02688eed844 100755
--- a/.travis/before_install_test.sh
+++ b/.travis/before_install_test.sh
@@ -6,7 +6,7 @@ TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
 echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
 
 
-sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json
+sed --in-place "s/\"dev-master\":/\"dev-${GITHUB_SHA}\":/" composer.json
 
 if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;
 if [ "$SONATA_CORE" != "" ]; then composer require "sonata-project/core-bundle:$SONATA_CORE" --no-update; fi;
diff --git a/.travis/check_relevant_test.sh b/.travis/check_relevant_test.sh
deleted file mode 100755
index a4ad2903612..00000000000
--- a/.travis/check_relevant_test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -ev
-
-RELEVANT_FILES=$(git diff --name-only HEAD upstream/${TRAVIS_BRANCH} -- '*.php' '*.yml' '*.xml' '*.twig' '*.js' '*.css' '*.json')
-
-if [[ -z ${RELEVANT_FILES} ]]; then echo -n 'KO'; exit 0; fi;

From 54de448cce1a302b417bd77e38a9f253c5bae8ac Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 12:46:01 +0100
Subject: [PATCH 02/18] remove cache

---
 .github/workflows/test_7.2.yaml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/test_7.2.yaml b/.github/workflows/test_7.2.yaml
index c5658b4e453..cbd5666518a 100644
--- a/.github/workflows/test_7.2.yaml
+++ b/.github/workflows/test_7.2.yaml
@@ -45,17 +45,6 @@ jobs:
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
 
-            - name: "Determine composer cache directory"
-              id: "determine-composer-cache-directory"
-              run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
-
-            - name: "Cache dependencies installed with composer"
-              uses: "actions/cache@v1.1.2"
-              with:
-                  path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
-                  key: "php-${{ matrix.php-version }}-${{ matrix.variant }}-composer-${{ hashFiles('**/composer.lock') }}-phpunit-${{ hashFiles('**/phpunit.xml.dist') }}"
-                  restore-keys: "php-${{ matrix.php-version }}-${{ matrix.variant }}-composer-"
-
             - name: "Install dependencies with composer"
               run: composer update --prefer-dist --no-interaction --prefer-stable ${{ matrix.variant }}
 

From 6fe690c5d2bfaaf1fad2a06efd9ee4a1d5044d14 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 12:48:15 +0100
Subject: [PATCH 03/18] foo

---
 .github/workflows/test_7.2.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test_7.2.yaml b/.github/workflows/test_7.2.yaml
index cbd5666518a..e58fdf77f21 100644
--- a/.github/workflows/test_7.2.yaml
+++ b/.github/workflows/test_7.2.yaml
@@ -30,8 +30,8 @@ jobs:
             matrix:
                 php-version:
                     - "7.2"
-                variant:
-                    - "--prefer-lowest"
+                    - "7.3"
+                    - "7.4"
 
         steps:
             - name: "Checkout"
@@ -46,7 +46,7 @@ jobs:
                   ini-values: "${{ env.PHP_INI_VALUES }}"
 
             - name: "Install dependencies with composer"
-              run: composer update --prefer-dist --no-interaction --prefer-stable ${{ matrix.variant }}
+              run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest
 
             - name: "Setup unit tests via phpunit"
               run: |

From d0ffa35fbf0bf309f763a1882f54b2707714ac42 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 12:50:55 +0100
Subject: [PATCH 04/18] foo

---
 .github/workflows/test_7.2.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_7.2.yaml b/.github/workflows/test_7.2.yaml
index e58fdf77f21..bce28035f1b 100644
--- a/.github/workflows/test_7.2.yaml
+++ b/.github/workflows/test_7.2.yaml
@@ -10,7 +10,7 @@ on:
             - develop
             - master
 
-name: CI
+name: Test
 
 env:
     SYMFONY_DEPRECATIONS_HELPER: max[self]=0
@@ -22,7 +22,7 @@ env:
 
 jobs:
     test:
-        name: Test
+        name: --prefer-lowest
 
         runs-on: ubuntu-16.04 # xenial
 

From ce5f482d908bc17c856b814522068950671515ec Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 12:52:22 +0100
Subject: [PATCH 05/18] foo

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index db339122368..44649cec90a 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -53,7 +53,7 @@ jobs:
     xml-files:
         name: XML files
 
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-16.04
 
         steps:
             - name: "Checkout"

From 459076a9012b34946ea703de70982e0e32f3198c Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 12:53:25 +0100
Subject: [PATCH 06/18] foo

---
 .github/workflows/lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 44649cec90a..db339122368 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -53,7 +53,7 @@ jobs:
     xml-files:
         name: XML files
 
-        runs-on: ubuntu-16.04
+        runs-on: ubuntu-latest
 
         steps:
             - name: "Checkout"

From 0dad689534a06a20ff7d1c2ec1069ddb8db6cab0 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:09:22 +0100
Subject: [PATCH 07/18] try

---
 ...{test_7.2.yaml => test_prefer_lowest.yaml} |  7 +-
 .github/workflows/test_variants.yaml          | 68 +++++++++++++++++++
 .travis.yml                                   |  2 +-
 .travis/before_install_test.sh                |  5 --
 4 files changed, 74 insertions(+), 8 deletions(-)
 rename .github/workflows/{test_7.2.yaml => test_prefer_lowest.yaml} (89%)
 create mode 100644 .github/workflows/test_variants.yaml

diff --git a/.github/workflows/test_7.2.yaml b/.github/workflows/test_prefer_lowest.yaml
similarity index 89%
rename from .github/workflows/test_7.2.yaml
rename to .github/workflows/test_prefer_lowest.yaml
index bce28035f1b..2e3c06088b4 100644
--- a/.github/workflows/test_7.2.yaml
+++ b/.github/workflows/test_prefer_lowest.yaml
@@ -22,7 +22,7 @@ env:
 
 jobs:
     test:
-        name: --prefer-lowest
+        name: PHP ${{ matrix.php-version }} + composer --prefer-lowest
 
         runs-on: ubuntu-16.04 # xenial
 
@@ -48,8 +48,11 @@ jobs:
             - name: "Install dependencies with composer"
               run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest
 
-            - name: "Setup unit tests via phpunit"
+            - name: "Setup PHPunit"
               run: |
                   mkdir bin
                   wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
                   chmod u+x "bin/phpunit"
+
+            - name: "Run tests via PHPUnit"
+              run: make test
diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
new file mode 100644
index 00000000000..01267da398b
--- /dev/null
+++ b/.github/workflows/test_variants.yaml
@@ -0,0 +1,68 @@
+on:
+    pull_request:
+        paths:
+            - 'src/**'
+            - 'tests/**'
+            - '.github/workflows/**'
+
+    push:
+        branches:
+            - develop
+            - master
+
+name: Test
+
+env:
+    SYMFONY_DEPRECATIONS_HELPER: max[self]=0
+    TARGET: test
+    UPSTREAM_URL: https://github.com/sonata-project/SonataAdminBundle.git
+    PHPUNIT_VERSION: 8
+    PHP_EXTENSIONS: "json" # just for testing now
+    PHP_INI_VALUES: "memory_limit=3072M"
+
+jobs:
+    test:
+        name: PHP ${{ matrix.php-version }} + ${{ matrix.variant }}
+
+        runs-on: ubuntu-16.04 # xenial
+
+        strategy:
+            matrix:
+                php-version:
+                    - "7.3"
+                variant:
+                    - "SYMFONY=4.4.*"
+                    - "SYMFONY='dev-master as 4.4.x-dev'"
+                    - "SONATA_CORE=3.*"
+                    - "SONATA_CORE='dev-master as 3.x-dev'"
+                    - "SONATA_BLOCK=3.*"
+                    - "SONATA_BLOCK='dev-master as 3.x-dev'"
+                    - "SYMFONY_DEPRECATIONS_HELPER=0"
+
+        steps:
+            - name: "Checkout"
+              uses: actions/checkout@v2.0.0
+
+            - name: "Install PHP with extensions"
+              uses: "shivammathur/setup-php@v1"
+              with:
+                  coverage: "none"
+                  extensions: "${{ env.PHP_EXTENSIONS }}"
+                  php-version: "${{ matrix.php-version }}"
+                  ini-values: "${{ env.PHP_INI_VALUES }}"
+
+            - name: "Install dependencies with composer"
+              run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress
+
+            - run: export ${{ matrix.variant }}
+
+            - run: sh ./travis/before_install_test.sh
+
+            - name: "Setup PHPunit"
+              run: |
+                  mkdir bin
+                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
+                  chmod u+x "bin/phpunit"
+
+            - name: "Run tests via PHPUnit"
+              run: make test
diff --git a/.travis.yml b/.travis.yml
index f6bda10b35b..bf5045c37aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ matrix:
     - php: '7.3'
       env: SONATA_BLOCK='dev-master as 3.x-dev'
     - php: '7.3'
-      env: SYMFONY_DEPRECATIONS_HELPER=0
+      env:
   allow_failures:
     - php: 7.4snapshot
     - php: nightly
diff --git a/.travis/before_install_test.sh b/.travis/before_install_test.sh
index 02688eed844..d3ebacfceff 100755
--- a/.travis/before_install_test.sh
+++ b/.travis/before_install_test.sh
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 set -ev
 
-PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
-TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
-echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"
-
-
 sed --in-place "s/\"dev-master\":/\"dev-${GITHUB_SHA}\":/" composer.json
 
 if [ "$SYMFONY" != "" ]; then composer require "symfony/symfony:$SYMFONY" --no-update; fi;

From 7e0f961c1f5eeac94b598db11ebe235a6ffa6725 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:14:37 +0100
Subject: [PATCH 08/18] test

---
 .github/workflows/test_prefer_lowest.yaml | 13 ++++++-------
 .github/workflows/test_variants.yaml      | 11 +++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test_prefer_lowest.yaml b/.github/workflows/test_prefer_lowest.yaml
index 2e3c06088b4..04165d7e3ce 100644
--- a/.github/workflows/test_prefer_lowest.yaml
+++ b/.github/workflows/test_prefer_lowest.yaml
@@ -22,7 +22,7 @@ env:
 
 jobs:
     test:
-        name: PHP ${{ matrix.php-version }} + composer --prefer-lowest
+        name: PHP ${{ matrix.php-version }} + --prefer-lowest
 
         runs-on: ubuntu-16.04 # xenial
 
@@ -45,14 +45,13 @@ jobs:
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
 
-            - name: "Install dependencies with composer"
-              run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest
+            - run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest
 
-            - name: "Setup PHPunit"
+            - name: "Setup PHPUnit"
               run: |
-                  mkdir bin
-                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
-                  chmod u+x "bin/phpunit"
+                  mkdir --parents "${HOME}/bin"
+                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="${HOME}/bin/phpunit"
+                  chmod u+x "${HOME}/bin/phpunit"
 
             - name: "Run tests via PHPUnit"
               run: make test
diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index 01267da398b..653929be719 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -51,18 +51,17 @@ jobs:
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
 
-            - name: "Install dependencies with composer"
-              run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress
+            - run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress
 
             - run: export ${{ matrix.variant }}
 
             - run: sh ./travis/before_install_test.sh
 
-            - name: "Setup PHPunit"
+            - name: "Setup PHPUnit"
               run: |
-                  mkdir bin
-                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
-                  chmod u+x "bin/phpunit"
+                  mkdir --parents "${HOME}/bin"
+                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="${HOME}/bin/phpunit"
+                  chmod u+x "${HOME}/bin/phpunit"
 
             - name: "Run tests via PHPUnit"
               run: make test

From 86b98446f21f4e90fbf9ca3285715b460e7cf49f Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:16:59 +0100
Subject: [PATCH 09/18] foo

---
 .github/workflows/test_prefer_lowest.yaml | 8 ++++----
 .github/workflows/test_variants.yaml      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test_prefer_lowest.yaml b/.github/workflows/test_prefer_lowest.yaml
index 04165d7e3ce..37d6dfafcfb 100644
--- a/.github/workflows/test_prefer_lowest.yaml
+++ b/.github/workflows/test_prefer_lowest.yaml
@@ -49,9 +49,9 @@ jobs:
 
             - name: "Setup PHPUnit"
               run: |
-                  mkdir --parents "${HOME}/bin"
-                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="${HOME}/bin/phpunit"
-                  chmod u+x "${HOME}/bin/phpunit"
+                  mkdir bin
+                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
+                  chmod u+x "bin/phpunit"
 
             - name: "Run tests via PHPUnit"
-              run: make test
+              run: bin/phpunit -c phpunit.xml.dist
diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index 653929be719..2f40f13f175 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -59,9 +59,9 @@ jobs:
 
             - name: "Setup PHPUnit"
               run: |
-                  mkdir --parents "${HOME}/bin"
-                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="${HOME}/bin/phpunit"
-                  chmod u+x "${HOME}/bin/phpunit"
+                  mkdir bin
+                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
+                  chmod u+x "bin/phpunit"
 
             - name: "Run tests via PHPUnit"
-              run: make test
+              run: bin/phpunit -c phpunit.xml.dist

From 6cc34dceb5a7c70acb9439d944e2710cd127062a Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:19:27 +0100
Subject: [PATCH 10/18] foo

---
 .github/workflows/test_variants.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index 2f40f13f175..a3e97375c83 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -55,7 +55,7 @@ jobs:
 
             - run: export ${{ matrix.variant }}
 
-            - run: sh ./travis/before_install_test.sh
+            - run: sh travis/before_install_test.sh
 
             - name: "Setup PHPUnit"
               run: |

From 4eba686f26452a0106e7153642f416f66ccfd181 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:23:32 +0100
Subject: [PATCH 11/18] foo

---
 .github/workflows/test_prefer_lowest.yaml | 9 ++-------
 .github/workflows/test_variants.yaml      | 9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test_prefer_lowest.yaml b/.github/workflows/test_prefer_lowest.yaml
index 37d6dfafcfb..6388b0c4efc 100644
--- a/.github/workflows/test_prefer_lowest.yaml
+++ b/.github/workflows/test_prefer_lowest.yaml
@@ -44,14 +44,9 @@ jobs:
                   extensions: "${{ env.PHP_EXTENSIONS }}"
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
+                  tools: "phpunit:${{ env.PHPUNIT_VERSION }}"
 
             - run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest
 
-            - name: "Setup PHPUnit"
-              run: |
-                  mkdir bin
-                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
-                  chmod u+x "bin/phpunit"
-
             - name: "Run tests via PHPUnit"
-              run: bin/phpunit -c phpunit.xml.dist
+              run: phpunit -c phpunit.xml.dist
diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index a3e97375c83..867bcaa82ae 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -50,6 +50,7 @@ jobs:
                   extensions: "${{ env.PHP_EXTENSIONS }}"
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
+                  tools: "phpunit:${{ env.PHPUNIT_VERSION }}"
 
             - run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress
 
@@ -57,11 +58,5 @@ jobs:
 
             - run: sh travis/before_install_test.sh
 
-            - name: "Setup PHPUnit"
-              run: |
-                  mkdir bin
-                  wget "https://phar.phpunit.de/phpunit-${{ env.PHPUNIT_VERSION }}.phar" --output-document="bin/phpunit"
-                  chmod u+x "bin/phpunit"
-
             - name: "Run tests via PHPUnit"
-              run: bin/phpunit -c phpunit.xml.dist
+              run: phpunit -c phpunit.xml.dist

From 873be4a926884ff96818845973f7c35e0fae91eb Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:29:03 +0100
Subject: [PATCH 12/18] foo

---
 .github/workflows/test_prefer_lowest.yaml | 2 +-
 .github/workflows/test_variants.yaml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_prefer_lowest.yaml b/.github/workflows/test_prefer_lowest.yaml
index 6388b0c4efc..6e9a58a0770 100644
--- a/.github/workflows/test_prefer_lowest.yaml
+++ b/.github/workflows/test_prefer_lowest.yaml
@@ -44,7 +44,7 @@ jobs:
                   extensions: "${{ env.PHP_EXTENSIONS }}"
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
-                  tools: "phpunit:${{ env.PHPUNIT_VERSION }}"
+                  tools: phpunit:8.5.2
 
             - run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress --prefer-lowest
 
diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index 867bcaa82ae..fe77d4e875c 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -50,7 +50,7 @@ jobs:
                   extensions: "${{ env.PHP_EXTENSIONS }}"
                   php-version: "${{ matrix.php-version }}"
                   ini-values: "${{ env.PHP_INI_VALUES }}"
-                  tools: "phpunit:${{ env.PHPUNIT_VERSION }}"
+                  tools: phpunit:8.5.2
 
             - run: composer update --prefer-dist --no-interaction --prefer-stable --no-progress
 

From 673f1bd6db143426afdcc476baff5d12636492a0 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:30:12 +0100
Subject: [PATCH 13/18] foo

---
 .github/workflows/test_prefer_lowest.yaml | 2 --
 .github/workflows/test_variants.yaml      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/.github/workflows/test_prefer_lowest.yaml b/.github/workflows/test_prefer_lowest.yaml
index 6e9a58a0770..37ffec2ce8b 100644
--- a/.github/workflows/test_prefer_lowest.yaml
+++ b/.github/workflows/test_prefer_lowest.yaml
@@ -14,8 +14,6 @@ name: Test
 
 env:
     SYMFONY_DEPRECATIONS_HELPER: max[self]=0
-    TARGET: test
-    UPSTREAM_URL: https://github.com/sonata-project/SonataAdminBundle.git
     PHPUNIT_VERSION: 8
     PHP_EXTENSIONS: "json" # just for testing now
     PHP_INI_VALUES: "memory_limit=3072M"
diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index fe77d4e875c..dfa8081425c 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -14,8 +14,6 @@ name: Test
 
 env:
     SYMFONY_DEPRECATIONS_HELPER: max[self]=0
-    TARGET: test
-    UPSTREAM_URL: https://github.com/sonata-project/SonataAdminBundle.git
     PHPUNIT_VERSION: 8
     PHP_EXTENSIONS: "json" # just for testing now
     PHP_INI_VALUES: "memory_limit=3072M"

From 18890c91076ce9ede59f933cb1f89515b2485f99 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:32:07 +0100
Subject: [PATCH 14/18] foo

---
 .github/workflows/test_variants.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index dfa8081425c..bf09a7b397b 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -54,7 +54,7 @@ jobs:
 
             - run: export ${{ matrix.variant }}
 
-            - run: sh travis/before_install_test.sh
+            - run: sh .travis/before_install_test.sh
 
             - name: "Run tests via PHPUnit"
               run: phpunit -c phpunit.xml.dist

From fc89d85bf93e5e322a9cd25e3928c358b0db207f Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:38:03 +0100
Subject: [PATCH 15/18] test block bundle 2 failing

---
 .github/workflows/test_variants.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index bf09a7b397b..0a457cf1868 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -33,7 +33,7 @@ jobs:
                     - "SYMFONY='dev-master as 4.4.x-dev'"
                     - "SONATA_CORE=3.*"
                     - "SONATA_CORE='dev-master as 3.x-dev'"
-                    - "SONATA_BLOCK=3.*"
+                    - "SONATA_BLOCK=2.*"
                     - "SONATA_BLOCK='dev-master as 3.x-dev'"
                     - "SYMFONY_DEPRECATIONS_HELPER=0"
 

From 0262c8d5f2d8ae66b3d46262d2157725c26eac31 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:38:12 +0100
Subject: [PATCH 16/18] Output Github SHA

---
 .github/workflows/test_variants.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index 0a457cf1868..3c9243d5742 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -54,6 +54,8 @@ jobs:
 
             - run: export ${{ matrix.variant }}
 
+            - run: echo ${{ GITHUB_SHA }}
+
             - run: sh .travis/before_install_test.sh
 
             - name: "Run tests via PHPUnit"

From e5c7bf2484054c1655a844d851400a908c132cf4 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 13:44:47 +0100
Subject: [PATCH 17/18] Revert "test block bundle 2 failing"

This reverts commit fc89d85bf93e5e322a9cd25e3928c358b0db207f.
---
 .github/workflows/test_variants.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index 3c9243d5742..bd3cd50cbc1 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -33,7 +33,7 @@ jobs:
                     - "SYMFONY='dev-master as 4.4.x-dev'"
                     - "SONATA_CORE=3.*"
                     - "SONATA_CORE='dev-master as 3.x-dev'"
-                    - "SONATA_BLOCK=2.*"
+                    - "SONATA_BLOCK=3.*"
                     - "SONATA_BLOCK='dev-master as 3.x-dev'"
                     - "SYMFONY_DEPRECATIONS_HELPER=0"
 

From 3c6c22af0b274dec946e5fec15b72aa035e577a9 Mon Sep 17 00:00:00 2001
From: Oskar Stark <oskarstark@googlemail.com>
Date: Mon, 24 Feb 2020 14:29:05 +0100
Subject: [PATCH 18/18] fix

---
 .github/workflows/test_variants.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/test_variants.yaml b/.github/workflows/test_variants.yaml
index bd3cd50cbc1..bf09a7b397b 100644
--- a/.github/workflows/test_variants.yaml
+++ b/.github/workflows/test_variants.yaml
@@ -54,8 +54,6 @@ jobs:
 
             - run: export ${{ matrix.variant }}
 
-            - run: echo ${{ GITHUB_SHA }}
-
             - run: sh .travis/before_install_test.sh
 
             - name: "Run tests via PHPUnit"