Skip to content

Commit

Permalink
Compatibility with Symfony 7 (#63)
Browse files Browse the repository at this point in the history
* replaced to tiny

* Added devcontainer

* Added php 8.* to gh actions

* Allow Sf7

* Allow symfony flex
  • Loading branch information
helios-ag authored Jan 11, 2024
1 parent 2728a13 commit 6cd77ec
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 13 deletions.
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/php
{
"name": "PHP",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/php:0-8.2",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
"settings": {},
"extensions": [
"streetsidesoftware.code-spell-checker"
]
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [8000],

// Use 'portsAttributes' to set default properties for specific forwarded ports. More info: https://code.visualstudio.com/docs/remote/devcontainerjson-reference.
"portsAttributes": {
"8000": {
"label": "Hello Remote World",
"onAutoForward": "notify"
}
}

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "sudo chmod a+x \"$(pwd)\" && sudo rm -rf /var/www/html && sudo ln -s \"$(pwd)\" /var/www/html"

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
9 changes: 5 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,23 @@ jobs:
continue-on-error: false
strategy:
matrix:
php-version: ['7.4', '8.0', '8.1']
php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
steps:
- name: 'Checkout code'
uses: actions/checkout@v2.3.3
uses: actions/checkout@v3

- name: 'Install PHP with extensions'
uses: shivammathur/setup-php@2.7.0
uses: shivammathur/setup-php@2.27.1
with:
coverage: none
php-version: ${{ matrix.php-version }}
tools: composer:v2
extensions: mbstring, intl, pdo, pdo_sqlite, sqlite3
extensions: mbstring, intl
ini-values: date.timezone=UTC

- name: 'Install project dependencies'
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins symfony/flex
composer update --no-interaction --prefer-dist --optimize-autoloader --prefer-stable
vendor/bin/simple-phpunit install
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ Please format your commit messages as follows:

[gh-help]: https://help.github.com
[gh-pr]: https://help.github.com/send-pull-requests
[issue]: https://github.com/helios-ag/FMElfinderBundle/issues/new
[pr]: https://github.com/helios-ag/FMElfinderBundle/pull/new
[issue]: https://github.com/helios-ag/FMTinyMCEBundle/issues/new
[pr]: https://github.com/helios-ag/FMTinyMCEBundle/pull/new
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
},
"require": {
"php": "^7.4 || ^8.0",
"symfony/framework-bundle": "^4.4 || ^5.2 || ^6.0",
"symfony/twig-bundle": "^4.4 || ^5.2 || ^6.0",
"symfony/form": "^4.4 || ^5.2 || ^6.0",
"symfony/asset": "^4.4 || ^5.2 || ^6.0",
"symfony/templating": "^4.4 || ^5.2 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.2 || ^6.0 || ^7.0",
"symfony/twig-bundle": "^4.4 || ^5.2 || ^6.0 || ^7.0",
"symfony/form": "^4.4 || ^5.2 || ^6.0 || ^7.0",
"symfony/asset": "^4.4 || ^5.2 || ^6.0 || ^7.0",
"symfony/templating": "^4.4 || ^5.2 || ^6.0 || ^7.0",
"tinymce/tinymce": "^4 || >=5.1.0"
},
"require-dev" : {
Expand Down

0 comments on commit 6cd77ec

Please sign in to comment.