Skip to content

Commit

Permalink
Merge branch 'main' of github.com:eckinox/tinymce-bundle into feat-up…
Browse files Browse the repository at this point in the history
…grade-tinymce
  • Loading branch information
Emma1987 committed Feb 19, 2024
2 parents 4dba4dc + 401bb74 commit c9e977a
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 3,685 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ jobs:
- name: Install PHP dependencies (composer install)
uses: php-actions/composer@v6
with:
php_version: 8.0
php_version: "8.2"
php_extensions: xsl intl
args: --no-plugins
- name: Remove auth.json file
run: rm -f $GITHUB_WORKSPACE/auth.json
- name: Restore configs overwritten by the eckinox/eckinox-cs install
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/vendor/
node_modules
.php-cs-fixer.cache
.DS_Store
composer.lock
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
"type": "symfony-bundle",
"require": {
"php": "^8.0",
"symfony/http-foundation": "^4.0|^5.0|^6.0",
"symfony/http-kernel": "^4.0|^5.0|^6.0",
"symfony/form": "^4.0|^5.0|^6.0",
"symfony/dependency-injection": "^4.0|^5.0|^6.0",
"symfony/routing": "^4.0|^5.0|^6.0",
"symfony/asset": "^4.0|^5.0|^6.0|^7.0",
"symfony/http-foundation": "^4.0|^5.0|^6.0|^7.0",
"symfony/http-kernel": "^4.0|^5.0|^6.0|^7.0",
"symfony/form": "^4.0|^5.0|^6.0|^7.0",
"symfony/dependency-injection": "^4.0|^5.0|^6.0|^7.0",
"symfony/routing": "^4.0|^5.0|^6.0|^7.0",
"twig/twig": "^3.3"
},
"require-dev": {
Expand Down
Loading

0 comments on commit c9e977a

Please sign in to comment.