From 6a8a2abd3c374494121368f56c993b6ca51cee56 Mon Sep 17 00:00:00 2001
From: Shivam Mathur <shivam_jpr@hotmail.com>
Date: Sat, 17 Jul 2021 11:49:03 +0530
Subject: [PATCH] Improve symfony examples

---
 examples/symfony-mysql.yml    | 13 +++++++------
 examples/symfony-postgres.yml | 13 +++++++------
 examples/symfony.yml          | 12 ++++++------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/examples/symfony-mysql.yml b/examples/symfony-mysql.yml
index 34192c3e..0075630d 100644
--- a/examples/symfony-mysql.yml
+++ b/examples/symfony-mysql.yml
@@ -26,6 +26,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
+          tools: phpunit-bridge
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql
           coverage: xdebug #optional
       - name: Start mysql service
@@ -42,15 +43,15 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: |
-          composer require --dev symfony/orm-pack symfony/phpunit-bridge
-          composer install --no-progress --prefer-dist --optimize-autoloader
-          php bin/phpunit install
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Migration
         run: |
+          composer require --dev symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:
           DATABASE_URL: mysql://root:symfony@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/symfony
-      - name: Run Tests
-        run: php bin/phpunit --coverage-text
+      - name: Install PHPUnit
+        run: simple-phpunit install
+      - name: Run tests
+        run: simple-phpunit --coverage-text
diff --git a/examples/symfony-postgres.yml b/examples/symfony-postgres.yml
index 64c89528..e0ec60f8 100644
--- a/examples/symfony-postgres.yml
+++ b/examples/symfony-postgres.yml
@@ -26,6 +26,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
+          tools: phpunit-bridge
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, pgsql
           coverage: xdebug #optional
       - name: Get composer cache directory
@@ -40,15 +41,15 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: |
-          composer require --dev symfony/orm-pack symfony/phpunit-bridge
-          composer install --no-progress --prefer-dist --optimize-autoloader
-          php bin/phpunit install
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
       - name: Run Migration
         run: |
+          composer require --dev symfony/orm-pack
           php bin/console doctrine:schema:update --force || echo "No migrations found or schema update failed"
           php bin/console doctrine:migrations:migrate || echo "No migrations found or migration failed"
         env:
           DATABASE_URL: postgres://postgres:postgres@127.0.0.1:${{ job.services.postgres.ports[5432] }}/postgres?charset=UTF-8
-      - name: Run Tests
-        run: php bin/phpunit --coverage-text
+      - name: Install PHPUnit
+        run: simple-phpunit install
+      - name: Run tests
+        run: simple-phpunit --coverage-text
diff --git a/examples/symfony.yml b/examples/symfony.yml
index a9402eed..6d4e28b5 100644
--- a/examples/symfony.yml
+++ b/examples/symfony.yml
@@ -17,6 +17,7 @@ jobs:
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
           php-version: ${{ matrix.php-versions }}
+          tools: phpunit-bridge
           extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite
           coverage: xdebug #optional
       - name: Get composer cache directory
@@ -31,9 +32,8 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
       - name: Install Composer dependencies
-        run: |
-          composer require --dev symfony/phpunit-bridge
-          composer install --no-progress --prefer-dist --optimize-autoloader
-          php bin/phpunit install
-      - name: Run Tests
-        run: php bin/phpunit --coverage-text
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+      - name: Install PHPUnit
+        run: simple-phpunit install
+      - name: Run tests
+        run: simple-phpunit --coverage-text