symfony · dunglas · Dec 8, 2016 · Feb 22, 2017 · Feb 22, 2017 · BPScott
diff --git a/app/AppKernel.php b/app/AppKernel.php
diff --git a/app/config/routing.yml b/app/config/routing.yml
diff --git a/app/config/services.yml b/app/config/services.yml
diff --git a/bin/console b/bin/console
@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php

+use App\AppKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;
@@ -13,7 +14,7 @@ use Symfony\Component\Debug\Debug;
 set_time_limit(0);

 /** @var Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+$loader = require __DIR__.'/../conf/autoload.php';

 $input = new ArgvInput();
 $env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');

diff --git a/composer.json b/composer.json
@@ -3,16 +3,21 @@
    "license": "MIT",
    "type": "project",
    "description": "The \"Symfony Standard Edition\" distribution",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/dunglas/symfony"
+        }
+    ],
    "autoload": {
-        "psr-4": { "": "src/" },
-        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
+        "psr-4": { "App\\": "src/" }
    },
    "autoload-dev": {
        "psr-4": { "Tests\\": "tests/" }
    },
    "require": {
-        "php": ">=5.5.9",
-        "symfony/symfony": "3.3.x-dev",
+        "php": ">=7.0.0",
+        "symfony/symfony": "dev-autowirable_controller as 3.3.0",
        "doctrine/orm": "^2.5",
        "doctrine/doctrine-bundle": "^1.6",
        "doctrine/doctrine-cache-bundle": "^1.2",
@@ -46,18 +51,18 @@
    },
    "config": {
        "platform": {
-            "php": "5.5.9"
+            "php": "7.0.0"
        }
    },
    "extra": {
-        "symfony-app-dir": "app",
+        "symfony-app-dir": "conf",
        "symfony-bin-dir": "bin",
        "symfony-var-dir": "var",
        "symfony-web-dir": "web",
        "symfony-tests-dir": "tests",
        "symfony-assets-install": "relative",
        "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
+            "file": "conf/parameters.yml"
        },
        "branch-alias": {
            "dev-master": "3.3-dev"

diff --git a/composer.lock b/composer.lock
diff --git a/app/.htaccess → conf/.htaccess b/app/.htaccess → conf/.htaccess
diff --git a/app/autoload.php → conf/autoload.php b/app/autoload.php → conf/autoload.php
diff --git a/app/config/config.yml → conf/config.yml b/app/config/config.yml → conf/config.yml
@@ -1,7 +1,7 @@
 imports:
-    - { resource: parameters.yml }
-    - { resource: security.yml }
-    - { resource: services.yml }
+    - { resource: 'parameters.yml' }
+    - { resource: 'security.yml' }
+    - { resource: 'services.yml' }

 # Put parameters here that don't need to change on each machine where the app is deployed
 # http://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
@@ -13,7 +13,7 @@ framework:
    #translator:      { fallbacks: ["%locale%"] }
    secret:          "%secret%"
    router:
-        resource: "%kernel.root_dir%/config/routing.yml"
+        resource: "%kernel.root_dir%/../conf/routing.yml"
        strict_requirements: ~
    form:            ~
    csrf_protection: ~
@@ -38,6 +38,8 @@ framework:
 twig:
    debug:            "%kernel.debug%"
    strict_variables: "%kernel.debug%"
+    paths:
+        - '%kernel.root_dir%/../templates'

 # Doctrine Configuration
 doctrine:
@@ -60,6 +62,13 @@ doctrine:
        auto_generate_proxy_classes: "%kernel.debug%"
        naming_strategy: doctrine.orm.naming_strategy.underscore
        auto_mapping: true
+        mappings:
+            App:
+                type:      annotation
+                is_bundle: false
+                dir:       '%kernel.root_dir%/../src/Entity'
+                prefix:    'Entity'
+                alias:     App

 # Swiftmailer Configuration
 swiftmailer:

diff --git a/app/config/config_dev.yml → conf/dev/config.yml b/app/config/config_dev.yml → conf/dev/config.yml
@@ -1,9 +1,9 @@
 imports:
-    - { resource: config.yml }
+    - { resource: '../config.yml' }

 framework:
    router:
-        resource: "%kernel.root_dir%/config/routing_dev.yml"
+        resource: "%kernel.root_dir%/../conf/dev/routing.yml"
        strict_requirements: true
    profiler: { only_exceptions: false }


diff --git a/app/config/routing_dev.yml → conf/dev/routing.yml b/app/config/routing_dev.yml → conf/dev/routing.yml
@@ -11,4 +11,4 @@ _errors:
    prefix:   /_error

 _main:
-    resource: routing.yml
+    resource: '../routing.yml'
diff --git a/conf/parameters.yml b/conf/parameters.yml
@@ -0,0 +1,12 @@
+# This file is auto-generated during the composer install
+parameters:
+    database_host: 127.0.0.1
+    database_port: null
+    database_name: symfony
+    database_user: root
+    database_password: null
+    mailer_transport: smtp
+    mailer_host: 127.0.0.1
+    mailer_user: null
+    mailer_password: null
+    secret: ThisTokenIsNotSoSecretChangeIt
diff --git a/app/config/parameters.yml.dist → conf/parameters.yml.dist b/app/config/parameters.yml.dist → conf/parameters.yml.dist
diff --git a/app/config/config_prod.yml → conf/prod/config.yml b/app/config/config_prod.yml → conf/prod/config.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: config.yml }
+    - { resource: '../config.yml' }

 #doctrine:
 #    orm:

diff --git a/conf/routing.yml b/conf/routing.yml
@@ -0,0 +1,3 @@
+action:
+    resource: "../src/Controller/"
+    type:     annotation
diff --git a/app/config/security.yml → conf/security.yml b/app/config/security.yml → conf/security.yml
diff --git a/conf/services.yml b/conf/services.yml
@@ -0,0 +1,40 @@
+# Learn more about services, parameters and containers at
+# http://symfony.com/doc/current/service_container.html
+parameters:
+#    parameter_name: value
+
+services:
+#    'My\ClassName': ~
+
+# Auto-register common directories
+    _defaults:
+        # Enable constructor and getter autowiring for all services defined in this file
+        autowire: ['__construct', 'get*']
+        public: false
+
+    _instanceof:
+        # Add some common tags to enable feature auto-registration
+        Symfony\Component\Console\Command\Command:
+            tags: ['console.command']
+            public: true  # Mandatory
+
+        Twig_ExtensionInterface:
+            tags: ['twig.extension']
+
+        Symfony\Component\EventDispatcher\EventSubscriberInterface:
+            tags: ['kernel.event_subscriber']
+
+        Symfony\Component\Form\FormTypeInterface:
+            tags: ['form.type']
+            public: true  # Mandatory
+
+        Symfony\Component\Security\Core\Authorization\VoterInterface:
+            tags: ['security.voter']
+
+    # Register all classes in these directories as services
+    App\:
+        resource: '../src/{Command,EventSubscriber,Twig,Form,Voter}'
+
+    App\Controller\:
+        resource: '../src/Controller'
+        public: true # Mandatory
diff --git a/app/config/config_test.yml → conf/test/config.yml b/app/config/config_test.yml → conf/test/config.yml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: config_dev.yml }
+    - { resource: '../dev/config.yml' }

 framework:
    test: ~

diff --git a/src/AppBundle/AppBundle.php b/src/AppBundle/AppBundle.php