Skip to content

Commit

Permalink
Merge branch 'main' into fix/versioned-resources-api
Browse files Browse the repository at this point in the history
  • Loading branch information
subiabre committed Dec 13, 2024
2 parents 56505f1 + e6b32c7 commit dca7a7d
Show file tree
Hide file tree
Showing 72 changed files with 1,778 additions and 815 deletions.
14 changes: 14 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/public/bundles/
/var/

.phpunit.result.cache
/phpunit.xml

/phpunit.xml
.phpunit.result.cache

/.php-cs-fixer.php
/.php-cs-fixer.cache
.git/
.github/
.vscode/
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,9 @@ PAYPAL_CLIENT_ID=""
PAYPAL_CLIENT_SECRET=""
PAYPAL_WEBHOOK_ID="WEBHOOK_ID"
###< App\Gateway\Paypal\PaypalGateway ###

###> symfony/lock ###
# Choose one of the stores below
# postgresql+advisory://db_user:db_password@localhost/db_name
LOCK_DSN=flock
###< symfony/lock ###
4 changes: 2 additions & 2 deletions .github/workflows/php-cs-fixer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ jobs:
php-cs-fixer:
runs-on: "ubuntu-latest"
steps:
- name: Setup PHP 8.2
- name: Setup PHP 8.3
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
tools: php-cs-fixer:3.64

- name: Checkout repository
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/phpunit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest
- uses: php-actions/composer@v6

- name: PHPUnit
uses: php-actions/phpunit@v4
env:
DATABASE_URL: mysql://root:[email protected]:${{ job.services.mariadb.ports['3306'] }}/goteo
with:
php_version: 8.2
php_version: 8.3
php_extensions: pdo_mysql
configuration: phpunit.xml.dist
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^2.19",
"doctrineencryptbundle/doctrine-encrypt-bundle": "^5.4",
"jolicode/automapper": "^9.2",
"nelmio/cors-bundle": "^2.3",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.24",
Expand Down
Loading

0 comments on commit dca7a7d

Please sign in to comment.