Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

[WIP] Support for controller autoregistration and autowiring #959

Closed
wants to merge 5 commits into from
Closed

[WIP] Support for controller autoregistration and autowiring #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36c51d8
Support for controller autoregistration and autowiring
dunglas Mar 20, 2016
e97c2ca
Don't extend Controller
dunglas Mar 20, 2016
7b7491f
Update dependencies
dunglas Mar 20, 2016
ef77658
Remove useless config
dunglas Mar 20, 2016
bcf4726
Remove useless comment
dunglas Mar 20, 2016
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
1 change: 1 addition & 0 deletions app/AppKernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public function registerBundles()
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new Dunglas\ActionBundle\DunglasActionBundle(),
new AppBundle\AppBundle(),
];

Expand Down
2 changes: 1 addition & 1 deletion app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ framework:
form: ~
csrf_protection: ~
validation: { enable_annotations: true }
#serializer: { enable_annotations: true }
serializer: { enable_annotations: true }
templating:
engines: ['twig']
default_locale: "%locale%"
Expand Down
4 changes: 2 additions & 2 deletions app/config/routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
app:
resource: "@AppBundle/Controller/"
type: annotation
resource: "@AppBundle/Action/"
type: action-annotation
6 changes: 3 additions & 3 deletions bin/symfony_requirements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $lineSize = 70;
$symfonyRequirements = new SymfonyRequirements();
$iniPath = $symfonyRequirements->getPhpIniConfigPath();

echo_title('Symfony2 Requirements Checker');
echo_title('Symfony Requirements Checker');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should not be part of this PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is automatically updated when running composer update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure but as this file is always overwritten I think it doesn't hurt.


echo '> PHP is using the following php.ini file:'.PHP_EOL;
if ($iniPath) {
Expand Down Expand Up @@ -43,9 +43,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) {
}

if ($checkPassed) {
echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
} else {
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');

echo_title('Fix the following mandatory requirements', 'red');

Expand Down
11 changes: 9 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,24 @@
"autoload-dev": {
"psr-4": { "Tests\\": "tests/" }
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/dunglas/symfony"
}
],
"require": {
"php": ">=5.5.9",
"symfony/symfony": "3.1.*@dev",
"symfony/symfony": "dev-action as 3.1.0",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-cache-bundle": "^1.2",
"symfony/swiftmailer-bundle": "^2.3",
"symfony/monolog-bundle": "^2.8",
"sensio/distribution-bundle": "^5.0",
"sensio/framework-extra-bundle": "^3.0.2",
"incenteev/composer-parameter-handler": "^2.0"
"incenteev/composer-parameter-handler": "^2.0",
"dunglas/action-bundle": "dev-master"
},
"require-dev": {
"sensio/generator-bundle": "^3.0",
Expand Down
Loading