From 6cd77ecca26f8f3cfa10efb8edf44c236a8b16ca Mon Sep 17 00:00:00 2001 From: Al Ganiev Date: Thu, 11 Jan 2024 10:40:29 +1000 Subject: [PATCH] Compatibility with Symfony 7 (#63) * replaced to tiny * Added devcontainer * Added php 8.* to gh actions * Allow Sf7 * Allow symfony flex --- .coveralls.yml | 2 -- .devcontainer/devcontainer.json | 38 +++++++++++++++++++++++++++++++++ .github/workflows/test.yaml | 9 ++++---- CONTRIBUTING.md | 4 ++-- composer.json | 10 ++++----- 5 files changed, 50 insertions(+), 13 deletions(-) delete mode 100644 .coveralls.yml create mode 100644 .devcontainer/devcontainer.json diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 90ae313..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1,2 +0,0 @@ -service_name: travis-ci -coverage_clover: build/logs/clover.xml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..9099bbf --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -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" +} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8164af2..9cd81fc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee06b8e..2638766 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/composer.json b/composer.json index dfc9006..6dfa560 100644 --- a/composer.json +++ b/composer.json @@ -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" : {