Skip to content

Commit

Permalink
Merge pull request #43 from helios-ag/devcontainer
Browse files Browse the repository at this point in the history
Upgraded deps
  • Loading branch information
helios-ag authored Nov 27, 2024
2 parents 597f299 + 0aa0479 commit c59d108
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 17 deletions.
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": "FM Summernote bundle for Symfony",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/php:8.3",

// 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"
}
13 changes: 6 additions & 7 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ jobs:
continue-on-error: false
strategy:
matrix:
php-version: ['7.4', '8.0', '8.1']
php-version: ['8.1','8.2','8.3']
steps:
- name: 'Checkout code'
uses: actions/[email protected]
- uses: actions/checkout@v4
name: Checkout repository

- name: 'Install PHP with extensions'
uses: shivammathur/setup-php@2.7.0
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
coverage: none
php-version: ${{ matrix.php-version }}
Expand All @@ -33,10 +33,9 @@ jobs:

- 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
- name: 'Run tests'
env:
SYMFONY_DEPRECATIONS_HELPER: 'max[indirect]=10&max[total]=27'
run: vendor/bin/simple-phpunit -v
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@
# Composer PHAR
/composer.phar
.php_cs.cache
composer.lock
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ FMSummernoteBundle
FMSummernoteBundle adds [summernote](https://github.com/summernote/summernote) bundle


| Tests | StyleCI | Downloads | Version | License |
|---------|---------|-----------|---------|---------|
|[![Tests - Linux](https://github.com/helios-ag/FMSummernoteBundle/actions/workflows/test.yaml/badge.svg)](https://github.com/helios-ag/FMSummernoteBundle/actions/workflows/test.yaml)|[![StyleCI](https://github.styleci.io/repos/43000455/shield?branch=master)](https://github.styleci.io/repos/43000455)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-summernote-bundle/downloads)](https://packagist.org/packages/helios-ag/fm-summernote-bundle)|[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-summernote-bundle/v/stable)](https://packagist.org/packages/helios-ag/fm-summernote-bundle)|[![License](https://poser.pugx.org/helios-ag/fm-summernote-bundle/license)](https://packagist.org/packages/helios-ag/fm-summernote-bundle)|
| Tests | Downloads | Version | License |
|---------|-----------|---------|---------|
|[![Tests - Linux](https://github.com/helios-ag/FMSummernoteBundle/actions/workflows/test.yaml/badge.svg)](https://github.com/helios-ag/FMSummernoteBundle/actions/workflows/test.yaml)|[![Total Downloads](https://poser.pugx.org/helios-ag/fm-summernote-bundle/downloads)](https://packagist.org/packages/helios-ag/fm-summernote-bundle)|[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-summernote-bundle/v/stable)](https://packagist.org/packages/helios-ag/fm-summernote-bundle)|[![License](https://poser.pugx.org/helios-ag/fm-summernote-bundle/license)](https://packagist.org/packages/helios-ag/fm-summernote-bundle)|


## Installation
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "helios-ag/fm-summernote-bundle",
"description": "Summernote bundle, adds Summernote WYSIWYG editor to your Symfony2/3/4 project",
"description": "Summernote bundle, adds Summernote WYSIWYG editor to your Symfony project",
"keywords": ["summernote","WYSIWYG", "editor"],
"type": "symfony-bundle",
"homepage": "https://github.com/helios-ag/FMSummernoteBundle",
Expand All @@ -17,12 +17,12 @@
}
],
"require": {
"php": "^7.4 || ^8.0 || ^8.1",
"symfony/framework-bundle": "^4.4 || ^5.0 || ^5.2 || ^6.0",
"symfony/twig-bundle": "^4.4 || ^5.0 || ^5.2 || ^6.0"
"php": "^8.1",
"symfony/framework-bundle": "^6.0 || ^7",
"symfony/twig-bundle": "^6.0 || ^7"
},
"require-dev" : {
"symfony/phpunit-bridge": "^4.3.5 || ^5.0 || ^5.2 || ^6.0",
"symfony/phpunit-bridge": "^6.0 || ^7",
"matthiasnoback/symfony-config-test": "^4.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.1"
},
Expand All @@ -38,7 +38,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
"dev-master": "2.0-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/DependencyInjection/FMSummernoteExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Extension\Extension;

class FMSummernoteExtension extends Extension
{
Expand Down

0 comments on commit c59d108

Please sign in to comment.