Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Symfony 7 support #133

Merged
merged 2 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $ composer require artgris/filemanager-bundle
# app/config/routes.yaml
artgris_bundle_file_manager:
resource: "@ArtgrisFileManagerBundle/Controller"
type: annotation
type: attribute
prefix: /manager
```
### Step 3: Enable the translator service
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
interactive:
resource: "@ArtgrisFileManagerBundle/Controller"
type: annotation
type: attribute
2 changes: 1 addition & 1 deletion Resources/doc/book/0-installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $ composer require artgris/filemanager-bundle
# app/config/routing.yml
artgris_bundle_file_manager:
resource: "@ArtgrisFileManagerBundle/Controller"
type: annotation
type: attribute
prefix: /manager
```

Expand Down
1 change: 0 additions & 1 deletion Tests/Fixtures/App/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public function registerBundles() :iterable
return [
new Artgris\Bundle\FileManagerBundle\ArtgrisFileManagerBundle(),
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
];
}
Expand Down
3 changes: 2 additions & 1 deletion Tests/Fixtures/App/config/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
framework:
secret: '%env(APP_SECRET)%'
#csrf_protection: true
#http_method_override: true
http_method_override: false
handle_all_throwables: true

# Enables session support. Note that the session will ONLY be started if you read or write from it.
# Remove or comment this section to explicitly disable session support.
Expand Down
2 changes: 1 addition & 1 deletion Tests/Fixtures/App/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
artgris_bundle_file_manager:
resource: "@ArtgrisFileManagerBundle/Controller"
type: annotation
type: attribute
prefix: /manager/
33 changes: 16 additions & 17 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,26 @@
"require": {
"php": ">=8.1",
"oomphinc/composer-installers-extender": "^2.0",
"symfony/asset": "^6.0",
"symfony/event-dispatcher": "^6.0",
"symfony/expression-language": "^6.0",
"symfony/asset": "^6.0||^7.0",
"symfony/event-dispatcher": "^6.0||^7.0",
"symfony/expression-language": "^6.0||^7.0",
"symfony/flex": "^2.3",
"symfony/form": "^6.0",
"symfony/framework-bundle": "^6.0",
"symfony/mime": "^6.0",
"symfony/translation": "^6.0",
"symfony/twig-bridge": "^6.0",
"symfony/twig-bundle": "^6.0",
"symfony/validator": "^6.0"
"symfony/form": "^6.0||^7.0",
"symfony/framework-bundle": "^6.0||^7.0",
"symfony/mime": "^6.0||^7.0",
"symfony/translation": "^6.0||^7.0",
"symfony/twig-bridge": "^6.0||^7.0",
"symfony/twig-bundle": "^6.0||^7.0",
"symfony/validator": "^6.0||^7.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.0",
"symfony/css-selector": "^6.0",
"symfony/phpunit-bridge": "^6.0",
"symfony/security-bundle": "^6.0",
"symfony/templating": "^6.0",
"symfony/var-dumper": "^6.0",
"symfony/yaml": "^6.0"
"symfony/browser-kit": "^6.0||^7.0",
"symfony/css-selector": "^6.0||^7.0",
"symfony/phpunit-bridge": "^6.0||^7.0",
"symfony/templating": "^6.0||^7.0",
"symfony/var-dumper": "^6.0||^7.0",
"symfony/yaml": "^6.0||^7.0"
},
"config": {
"sort-packages": true,
Expand Down