Symfony 3.4 directory structure

joebordes · Oct 25, 2019 · 679f724 · 679f724
1 parent 31e7880
commit 679f724
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,21 +19,34 @@
 
 /app/cache/*
 !/app/cache/.gitkeep
-
-/app/config/local*.php
-/app/config/config_local.php
-/app/config/paths_local.php
+/var/cache/*
+!/var/cache/.gitkeep
 
 /app/logs/*
 !/app/logs/.gitkeep
+/var/logs/*
+!/var/logs/.gitkeep
 
-/app/Resources/SensioGeneratorBundle
 /app/spool/*
+!/app/spool/.gitkeep
+/var/spool/*
+!/var/spool/.gitkeep
+
+/var/tmp/*
+!/var/tmp/.gitkeep
+
+/app/Resources/SensioGeneratorBundle
+
+/app/config/local*.php
+/app/config/config_local.php
+/app/config/paths_local.php
 
 /vendor/*
 !/vendor/.htaccess
 
 /bin/*
+!/bin/console
+
 /bundles
 /node_modules
 /build/coverage

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -27,14 +27,14 @@ class AppKernel extends Kernel
      *
      * @const integer
      */
-    const MAJOR_VERSION = 2;
+    const MAJOR_VERSION = 3;
 
     /**
      * Minor version number.
      *
      * @const integer
      */
-    const MINOR_VERSION = 16;
+    const MINOR_VERSION = 0;
 
     /**
      * Patch version number.
@@ -51,7 +51,7 @@ class AppKernel extends Kernel
      *
      * @const string
      */
-    const EXTRA_VERSION = '-dev';
+    const EXTRA_VERSION = '-alpha';
 
     /**
      * @var array
@@ -158,7 +158,7 @@ public function registerBundles()
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
-            new Bazinga\OAuthServerBundle\BazingaOAuthServerBundle(),
+            //new Bazinga\OAuthServerBundle\BazingaOAuthServerBundle(),
             new FOS\RestBundle\FOSRestBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Oneup\UploaderBundle\OneupUploaderBundle(),
@@ -375,6 +375,14 @@ public function getDatabaseConnection($params = [])
         }
     }
 
+    /**
+     * @return string
+     */
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
     /**
      * {@inheritdoc}
      *
@@ -388,7 +396,7 @@ public function getCacheDir()
 
             return str_replace('%kernel.root_dir%', $this->getRootDir(), $parameters['cache_path'].$envFolder);
         } else {
-            return parent::getCacheDir();
+            return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
         }
     }
 
@@ -403,7 +411,7 @@ public function getLogDir()
         if (isset($parameters['log_path'])) {
             return str_replace('%kernel.root_dir%', $this->getRootDir(), $parameters['log_path']);
         } else {
-            return parent::getLogDir();
+            return dirname(__DIR__).'/var/logs';
         }
     }
 

diff --git a/app/bundles/ConfigBundle/Tests/Form/Helper/RestrictionHelperTest.php b/app/bundles/ConfigBundle/Tests/Form/Helper/RestrictionHelperTest.php
@@ -88,7 +88,7 @@ class RestrictionHelperTest extends TypeTestCase
                 'mailer_auth_mode'             => null,
                 'mailer_amazon_region'         => 'email-smtp.us-east-1.amazonaws.com',
                 'mailer_spool_type'            => 'memory',
-                'mailer_spool_path'            => '%kernel.root_dir%/spool',
+                'mailer_spool_path'            => '%kernel.root_dir%/var/spool',
                 'mailer_spool_msg_limit'       => null,
                 'mailer_spool_time_limit'      => null,
                 'mailer_spool_recover_timeout' => 900,

diff --git a/app/bundles/ConfigBundle/Tests/Mapper/ConfigMapperTest.php b/app/bundles/ConfigBundle/Tests/Mapper/ConfigMapperTest.php
@@ -38,7 +38,7 @@ class ConfigMapperTest extends \PHPUnit_Framework_TestCase
                 'mailer_auth_mode'             => null,
                 'mailer_amazon_region'         => 'email-smtp.us-east-1.amazonaws.com',
                 'mailer_spool_type'            => 'memory',
-                'mailer_spool_path'            => '%kernel.root_dir%/spool',
+                'mailer_spool_path'            => '%kernel.root_dir%/var/spool',
                 'mailer_spool_msg_limit'       => null,
                 'mailer_spool_time_limit'      => null,
                 'mailer_spool_recover_timeout' => 900,

diff --git a/app/bundles/CoreBundle/Config/config.php b/app/bundles/CoreBundle/Config/config.php
@@ -1010,10 +1010,10 @@
     'parameters' => [
         'site_url'                        => '',
         'webroot'                         => '',
-        'cache_path'                      => '%kernel.root_dir%/cache',
-        'log_path'                        => '%kernel.root_dir%/logs',
+        'cache_path'                      => '%kernel.root_dir%/var/cache',
+        'log_path'                        => '%kernel.root_dir%/var/logs',
         'image_path'                      => 'media/images',
-        'tmp_path'                        => '%kernel.root_dir%/cache',
+        'tmp_path'                        => '%kernel.root_dir%/var/tmp',
         'theme'                           => 'Mauve',
         'theme_import_allowed_extensions' => ['json', 'twig', 'css', 'js', 'htm', 'html', 'txt', 'jpg', 'jpeg', 'png', 'gif'],
         'db_driver'                       => 'pdo_mysql',

diff --git a/app/bundles/EmailBundle/Config/config.php b/app/bundles/EmailBundle/Config/config.php
@@ -773,7 +773,7 @@
         'mailer_amazon_region'         => 'email-smtp.us-east-1.amazonaws.com',
         'mailer_custom_headers'        => [],
         'mailer_spool_type'            => 'memory', //memory = immediate; file = queue
-        'mailer_spool_path'            => '%kernel.root_dir%/spool',
+        'mailer_spool_path'            => '%kernel.root_dir%/var/spool',
         'mailer_spool_msg_limit'       => null,
         'mailer_spool_time_limit'      => null,
         'mailer_spool_recover_timeout' => 900,

diff --git a/app/bundles/InstallBundle/Configurator/Step/CheckStep.php b/app/bundles/InstallBundle/Configurator/Step/CheckStep.php
@@ -44,14 +44,14 @@ class CheckStep implements StepInterface
      *
      * @var string
      */
-    public $cache_path = '%kernel.root_dir%/cache';
+    public $cache_path = '%kernel.root_dir%/var/cache';
 
     /**
      * Absolute path to log directory.
      *
      * @var string
      */
-    public $log_path = '%kernel.root_dir%/logs';
+    public $log_path = '%kernel.root_dir%/var/logs';
 
     /**
      * Set the domain URL for use in getting the absolute URL for cli/cronjob generated URLs.

diff --git a/app/bundles/InstallBundle/Configurator/Step/EmailStep.php b/app/bundles/InstallBundle/Configurator/Step/EmailStep.php
@@ -95,7 +95,7 @@ class EmailStep implements StepInterface
      *
      * @var string
      */
-    public $mailer_spool_path = '%kernel.root_dir%/spool';
+    public $mailer_spool_path = '%kernel.root_dir%/var/spool';
 
     /**
      * @param Session $session

diff --git a/app/console → bin/console b/app/console → bin/console
@@ -16,8 +16,8 @@ defined('IN_MAUTIC_CONSOLE') or define('IN_MAUTIC_CONSOLE', 1);
 
 define('MAUTIC_ROOT_DIR', realpath(__DIR__.'/..'));
 
-require_once __DIR__.'/autoload.php';
-require_once __DIR__.'/AppKernel.php';
+require_once __DIR__.'/../app/autoload.php';
+require_once __DIR__.'/../app/AppKernel.php';
 
 use Mautic\CoreBundle\Console\Output\ConsoleDatetimeOutput;
 use Symfony\Bundle\FrameworkBundle\Console\Application;

diff --git a/index.php b/index.php
@@ -17,6 +17,7 @@
 use Symfony\Component\ClassLoader\ApcClassLoader;
 
 $loader = require_once __DIR__.'/app/autoload.php';
+//include_once __DIR__.'/var/bootstrap.php.cache';
 
 /*
  * Use APC for autoloading to improve performance. Change 'sf2' to a unique prefix

diff --git a/var/.htaccess b/var/.htaccess
@@ -0,0 +1 @@
+deny from all
diff --git a/var/cache/.gitkeep b/var/cache/.gitkeep
diff --git a/var/logs/.gitkeep b/var/logs/.gitkeep
diff --git a/var/spool/.gitkeep b/var/spool/.gitkeep
diff --git a/var/tmp/.gitkeep b/var/tmp/.gitkeep