Skip to content

Commit

Permalink
Support psr/log:^3.0 (#131)
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentchalamon authored Sep 29, 2022
1 parent 1d3ed65 commit 59c13e4
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 29 deletions.
42 changes: 19 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,33 @@ on:

jobs:
tests:
name: Tests PHP ${{ matrix.php }} ${{ matrix.dependency }} (Symfony ${{ matrix.symfony }})
name: Tests PHP ${{ matrix.php }} (Symfony ${{ matrix.symfony }})
runs-on: ubuntu-latest
strategy:
matrix:
php:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
symfony:
- '4.4.*'
- '5.4.*'
- '6.0.*'
dependency:
- ''
- '--prefer-lowest'
exclude:
- symfony: '6.0.*'
php: '7.3'
- symfony: '6.0.*'
php: '7.4'
- symfony: '5.4.*'
dependency: '--prefer-lowest'
- symfony: '6.0.*'
dependency: '--prefer-lowest'
- '6.1.*'
include:
- php: '7.4'
dependency: ''
symfony: '5.4.*'
bootable: true
- php: '8.1'
dependency: ''
symfony: '6.0.*'
symfony: '6.1.*'
coverage: '--coverage-clover build/logs/phpunit/clover.xml'
bootable: true
quality: true
exclude:
# Symfony 6.1 requires PHP 8.1
- php: '7.4'
symfony: '6.1.*'
- php: '8.0'
symfony: '6.1.*'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -80,7 +71,7 @@ jobs:
run: composer config extra.symfony.require "${{ matrix.symfony }}"

- name: Update project dependencies
run: composer update --no-progress --ansi --prefer-stable ${{ matrix.dependency }}
run: composer update --no-progress --ansi --prefer-stable

- name: Bundle is bootable
if: matrix.bootable && github.event_name == 'push'
Expand Down Expand Up @@ -121,6 +112,13 @@ jobs:
DOCUSIGN_PASSWORD: ${{ secrets.DOCUSIGN_PASSWORD }}
run: vendor/bin/simple-phpunit ${{ matrix.coverage }}

- name: Upload coverage artifacts
if: failure()
uses: actions/upload-artifact@v3
with:
name: panther-screenshots-${{ matrix.php }}
path: screenshots

- name: Run bootable PHPUnit tests
env:
DOCUSIGN_INTEGRATION_KEY: ${{ secrets.DOCUSIGN_INTEGRATION_KEY }}
Expand All @@ -133,13 +131,11 @@ jobs:
DOCUSIGN_DEFAULT_SIGNER_EMAIL: ${{ secrets.DOCUSIGN_DEFAULT_SIGNER_EMAIL }}
DOCUSIGN_EMAIL: ${{ secrets.DOCUSIGN_EMAIL }}
DOCUSIGN_PASSWORD: ${{ secrets.DOCUSIGN_PASSWORD }}
run: |
composer require --dev nyholm/symfony-bundle-test:dev-master
vendor/bin/simple-phpunit --group bootable
run: vendor/bin/simple-phpunit --group bootable

- name: Upload coverage artifacts
if: matrix.coverage != ''
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
with:
name: build-php${{ matrix.php }}
path: build
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"docusign/esign-client": "^5.0 || ^6.0",
"lcobucci/jwt": "^3.3.1 || ^4.0",
"league/flysystem": "^1.1 || ^2.3",
"psr/log": "^1.1 || ^2.0",
"psr/log": "^1.1 || ^2.0 || ^3.0",
"symfony/config": "^4.4 || ^5.0 || ^6.0",
"symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
"symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
Expand All @@ -46,13 +46,14 @@
"dbrekelmans/bdi": "^1.0",
"doctrine/annotations": "^1.11",
"league/flysystem-bundle": "^1.2 || ^2.0",
"nyholm/symfony-bundle-test": "^2.0",
"phpspec/prophecy": "^1.12",
"phpstan/phpstan": "^1.0",
"psr/event-dispatcher": "^1.0",
"symfony/console": "^4.4 || ^5.0 || ^6.0",
"symfony/css-selector": "^4.4 || ^5.0 || ^6.0",
"symfony/debug": "^4.4",
"symfony/dotenv": "^4.4 || ^5.0 || ^6.0",
"symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
"symfony/monolog-bundle": "^3.5",
"symfony/panther": "^1.0 || ^2.0",
"symfony/phpunit-bridge": "^5.1 || ^6.0",
Expand Down
2 changes: 1 addition & 1 deletion features/console
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use DocusignBundle\E2e\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Debug\Debug;
use Symfony\Component\ErrorHandler\Debug;

set_time_limit(0);

Expand Down
2 changes: 1 addition & 1 deletion features/public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
declare(strict_types=1);

use DocusignBundle\E2e\Kernel;
use Symfony\Component\Debug\Debug;
use Symfony\Component\ErrorHandler\Debug;
use Symfony\Component\HttpFoundation\Request;

require dirname(__DIR__).'/bootstrap.php';
Expand Down
2 changes: 2 additions & 0 deletions tests/ClickwrapTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

/**
* @author Vincent Chalamon <vincentchalamon@gmail.com>
*
* @group functional
*/
final class ClickwrapTest extends PantherTestCase
{
Expand Down
4 changes: 3 additions & 1 deletion tests/EmbeddedAuthCodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

/**
* @author Vincent Chalamon <vincentchalamon@gmail.com>
*
* @group functional
*/
final class EmbeddedAuthCodeTest extends PantherTestCase
{
Expand Down Expand Up @@ -96,7 +98,7 @@ public function testICanSignAnEmbeddedDocument(): void
$crawler->filter('label[for=disclosureAccepted]')->click();
}

$crawler->filter('#action-bar-btn-continue')->click();
$client->executeScript("$('#action-bar-btn-continue').click()");
$crawler = $client->waitFor('.page-tabs .signature-tab > button');

// Wait for "Comment tooltip" button (optional use-case)
Expand Down
4 changes: 3 additions & 1 deletion tests/EmbeddedTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

/**
* @author Vincent Chalamon <vincentchalamon@gmail.com>
*
* @group functional
*/
final class EmbeddedTest extends PantherTestCase
{
Expand Down Expand Up @@ -70,7 +72,7 @@ public function testICanSignAnEmbeddedDocument(): void
$crawler->filter('label[for=disclosureAccepted]')->click();
}

$crawler->filter('#action-bar-btn-continue')->click();
$client->executeScript("$('#action-bar-btn-continue').click()");
$crawler = $client->waitFor('.page-tabs .signature-tab > button');

// Wait for "Comment tooltip" button (optional use-case)
Expand Down
2 changes: 2 additions & 0 deletions tests/HomepageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

/**
* @author Vincent Chalamon <vincentchalamon@gmail.com>
*
* @group functional
*/
final class HomepageTest extends PantherTestCase
{
Expand Down
2 changes: 2 additions & 0 deletions tests/RemoteAuthCodeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

/**
* @author Vincent Chalamon <vincentchalamon@gmail.com>
*
* @group functional
*/
final class RemoteAuthCodeTest extends PantherTestCase
{
Expand Down
2 changes: 2 additions & 0 deletions tests/RemoteTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

/**
* @author Vincent Chalamon <vincentchalamon@gmail.com>
*
* @group functional
*/
final class RemoteTest extends PantherTestCase
{
Expand Down

0 comments on commit 59c13e4

Please sign in to comment.