app/bootstrap.php.cache -> var/bootstrap.php.cache

symfony · Nov 28, 2015 · af7052b · af7052b
1 parent 6614c0f
commit af7052b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/cookbook/configuration/apache_router.rst b/cookbook/configuration/apache_router.rst
@@ -145,7 +145,7 @@ to ``ApacheRequest`` in ``web/app.php``::
 
     // web/app.php
 
-    require_once __DIR__.'/../app/bootstrap.php.cache';
+    require_once __DIR__.'/../var/bootstrap.php.cache';
     require_once __DIR__.'/../app/AppKernel.php';
     // require_once __DIR__.'/../app/AppCache.php';
 

diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst
@@ -91,8 +91,7 @@ in your ``app.php`` and ``app_dev.php`` front controllers. If you simply
 renamed the directory, you're fine. But if you moved it in some way, you
 may need to modify these paths inside those files::
 
-    require_once __DIR__.'/../Symfony/app/bootstrap.php.cache';
-    require_once __DIR__.'/../Symfony/app/AppKernel.php';
+    require_once __DIR__.'/../Symfony/var/bootstrap.php.cache';
 
 You also need to change the ``extra.symfony-web-dir`` option in the ``composer.json``
 file:

diff --git a/cookbook/debugging.rst b/cookbook/debugging.rst
@@ -30,22 +30,21 @@ The ``app_dev.php`` front controller reads as follows by default::
 
     // ...
 
-    $loader = require_once __DIR__.'/../app/bootstrap.php.cache';
-    require_once __DIR__.'/../app/AppKernel.php';
+    $loader = require __DIR__.'/../app/autoload.php';
+    Debug::enable();
 
     $kernel = new AppKernel('dev', true);
     $kernel->loadClassCache();
     $request = Request::createFromGlobals();
+    // ...
 
-To make your debugger happier, disable all PHP class caches by removing the
-call to ``loadClassCache()`` and by replacing the require statements like
-below::
+To make your debugger happier, disable all PHP class caches by removing (or
+commenting) the call to ``loadClassCache()``::
 
     // ...
 
-    // $loader = require_once __DIR__.'/../app/bootstrap.php.cache';
     $loader = require_once __DIR__.'/../app/autoload.php';
-    require_once __DIR__.'/../app/AppKernel.php';
+    Debug::enable();
 
     $kernel = new AppKernel('dev', true);
     // $kernel->loadClassCache();

diff --git a/cookbook/workflow/new_project_svn.rst b/cookbook/workflow/new_project_svn.rst
@@ -78,14 +78,14 @@ with these steps:
         $ svn add --depth=empty app var/cache var/logs app/config web
 
         $ svn propset svn:ignore "vendor" .
-        $ svn propset svn:ignore "bootstrap*" app/
+        $ svn propset svn:ignore "bootstrap*" var/
         $ svn propset svn:ignore "parameters.yml" app/config/
         $ svn propset svn:ignore "*" var/cache/
         $ svn propset svn:ignore "*" var/logs/
 
         $ svn propset svn:ignore "bundles" web
 
-        $ svn ci -m "commit basic Symfony ignore list (vendor, app/bootstrap*, app/config/parameters.yml, var/cache/*, var/logs/*, web/bundles)"
+        $ svn ci -m "commit basic Symfony ignore list (vendor, var/bootstrap*, app/config/parameters.yml, var/cache/*, var/logs/*, web/bundles)"
 
 #. The rest of the files can now be added and committed to the project: