Skip to content

Commit

Permalink
chore: upgrade sf demo app
Browse files Browse the repository at this point in the history
  • Loading branch information
mRoca committed Jan 3, 2024
1 parent 7444c44 commit 2627ed1
Show file tree
Hide file tree
Showing 13 changed files with 6,012 additions and 1,325 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v2
- uses: actions/checkout@v2
- uses: actions/setup-node@v4
- uses: actions/checkout@v4
- run: yarn install --frozen-lockfile

- run: |
Expand All @@ -18,7 +18,7 @@ jobs:
sed -i "s/dist\/bundle.js/bundle.js?t=$(date +%s)/g" dist/index.html
- name: Deploy
uses: JamesIves/github-pages-deploy-action@4.0.0
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages
folder: dist
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.3'
- run: composer install
- run: vendor/bin/php-cs-fixer fix --dry-run --verbose --diff
- run: bin/console --env=test lint:twig templates
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '12.x'
registry-url: 'https://registry.npmjs.org'
- run: yarn install
- run: npm publish
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ClassicEditor
A PHP `TwigVariablesExtractor` class allows to convert an array of items (objects, entities, arrays, types, ...)
into a `variables` array that can be used as plugin config.

This class is currently located into `demo/symfonyapp/src/Extractor`, and will later be moved into a dedicated repository
This class is currently located into `demo/symfonyapp/src/Extractor`, and could later be moved into a dedicated repository
and composer package.

**Extractor options**
Expand Down
1 change: 0 additions & 1 deletion demo/symfonyapp/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/public/build/
npm-debug.log
yarn-error.log
yarn.lock
###< symfony/webpack-encore-bundle ###

###> friendsofphp/php-cs-fixer ###
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<?php

$finder = PhpCsFixer\Finder::create()
$finder = (new PhpCsFixer\Finder())
->in(__DIR__)
->exclude('var')
->exclude('public')
->exclude('node_modules')
;

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setRules([
'@Symfony' => true,
])
Expand Down
43 changes: 23 additions & 20 deletions demo/symfonyapp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,39 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=7.4",
"php": ">=8.3",
"ext-ctype": "*",
"ext-iconv": "*",
"phpdocumentor/reflection-docblock": "^5.2",
"symfony/cache": "5.2.*",
"symfony/console": "5.2.*",
"symfony/dotenv": "5.2.*",
"phpdocumentor/reflection-docblock": "^5.3",
"symfony/cache": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/flex": "^1.3.1",
"symfony/framework-bundle": "5.2.*",
"symfony/property-info": "5.2.*",
"symfony/serializer": "5.2.*",
"symfony/stopwatch": "5.2.*",
"symfony/twig-bundle": "5.2.*",
"symfony/yaml": "5.2.*",
"twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^2.12|^3.0"
"symfony/framework-bundle": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/yaml": "6.4.*",
"twig/extra-bundle": "^3.8",
"twig/twig": "^3.8"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.18",
"hellonico/twig-dump-extension": "^1.1",
"symfony/var-dumper": "5.2.*",
"symfony/web-profiler-bundle": "5.2.*",
"symfony/webpack-encore-bundle": "^1.11"
"friendsofphp/php-cs-fixer": "^3.45",
"hellonico/twig-dump-extension": "^1.2",
"symfony/var-dumper": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*",
"symfony/webpack-encore-bundle": "^2.1"
},
"config": {
"optimize-autoloader": true,
"preferred-install": {
"*": "dist"
},
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"symfony/flex": true
}
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -65,7 +68,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.2.*"
"require": "6.4.*"
}
}
}
Loading

0 comments on commit 2627ed1

Please sign in to comment.