New directory structure

Author: dunglas

app/AppKernel.php

@@ -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');

app/config/routing.yml

@@ -10,14 +10,13 @@
         }
     ],
     "autoload": {
-        "psr-4": { "App\\": "src/" },
-        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
+        "psr-4": { "App\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Tests\\": "tests/" }
     },
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=7.0.0",
         "symfony/symfony": "dev-autowirable_controller as 3.3.0",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
@@ -52,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"

app/config/services/app.yml

@@ -1,7 +1,7 @@
 imports:
     - { resource: 'parameters.yml' }
     - { resource: 'security.yml' }
-    - { resource: 'services/*' }
+    - { 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:

app/config/services/framework.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 }
 

bin/console

@@ -11,4 +11,4 @@ _errors:
     prefix:   /_error
 
 _main:
-    resource: routing.yml
+    resource: '../routing.yml'

composer.json

@@ -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

composer.lock

@@ -1,5 +1,5 @@
 imports:
-    - { resource: config.yml }
+    - { resource: '../config.yml' }
 
 #doctrine:
 #    orm:

app/.htaccess renamed to conf/.htaccess

@@ -0,0 +1,3 @@
+action:
+    resource: "../src/Controller/"
+    type:     annotation

app/autoload.php renamed to conf/autoload.php

@@ -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

app/config/config.yml renamed to conf/config.yml

@@ -1,5 +1,5 @@
 imports:
-    - { resource: config_dev.yml }
+    - { resource: '../dev/config.yml' }
 
 framework:
     test: ~

app/config/config_dev.yml renamed to conf/dev/config.yml

@@ -1,5 +1,7 @@
 <?php
 
+namespace App;
+
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
 
 class AppCache extends HttpCache

app/config/routing_dev.yml renamed to conf/dev/routing.yml

@@ -0,0 +1,67 @@
+<?php
+
+namespace App;
+
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
+use Sensio\Bundle\DistributionBundle\SensioDistributionBundle;
+use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
+use Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle;
+use Symfony\Bundle\DebugBundle\DebugBundle;
+use Symfony\Bundle\MonologBundle\MonologBundle;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
+use Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
+use Symfony\Bundle\WebServerBundle\WebServerBundle;
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = [
+            new FrameworkBundle(),
+            new SecurityBundle(),
+            new MonologBundle(),
+            new SwiftmailerBundle(),
+            new TwigBundle(),
+            new DoctrineBundle(),
+            new SensioFrameworkExtraBundle(),
+        ];
+
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
+            $bundles[] = new DebugBundle();
+            $bundles[] = new WebProfilerBundle();
+            $bundles[] = new SensioDistributionBundle();
+
+            if ('dev' === $this->getEnvironment()) {
+                $bundles[] = new SensioGeneratorBundle();
+                $bundles[] = new WebServerBundle();
+            }
+        }
+
+        return $bundles;
+    }
+
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__).'/../var/cache/'.$this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__).'/../var/logs';
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir().'/../conf/'.$this->getEnvironment().'/config.yml');
+    }
+}

conf/parameters.yml

@@ -1,4 +1,4 @@
-{% extends 'base.html.twig' %}
+{% extends 'layout.html.twig' %}
 
 {% block body %}
     <div id="wrapper">

app/config/parameters.yml.dist renamed to conf/parameters.yml.dist

@@ -1,17 +1,12 @@
 <?php
 
+use App\AppCache;
+use App\AppKernel;
 use Symfony\Component\HttpFoundation\Request;
 
 /** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
-if (PHP_VERSION_ID < 70000) {
-    include_once __DIR__.'/../var/bootstrap.php.cache';
-}
-
+$loader = require __DIR__.'/../conf/autoload.php';
 $kernel = new AppKernel('prod', false);
-if (PHP_VERSION_ID < 70000) {
-    $kernel->loadClassCache();
-}
 //$kernel = new AppCache($kernel);
 
 // When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter

app/config/config_prod.yml renamed to conf/prod/config.yml

@@ -1,5 +1,6 @@
 <?php
 
+use App\AppKernel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Debug\Debug;
 
@@ -19,13 +20,10 @@
 }
 
 /** @var \Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
+$loader = require __DIR__.'/../conf/autoload.php';
 Debug::enable();
 
 $kernel = new AppKernel('dev', true);
-if (PHP_VERSION_ID < 70000) {
-    $kernel->loadClassCache();
-}
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();