Merge pull request #7348 from kenjis/fix-docs-autoloader.rst

docs: fix out of dated description in autoloader.rst

Author: samsonasik

user_guide_src/source/concepts/autoloader.rst

@@ -47,25 +47,26 @@ Namespaces
 
 The recommended method for organizing your classes is to create one or more namespaces for your
 application's files. This is most important for any business-logic related classes, entity classes,
-etc. The ``psr4`` array in the configuration file allows you to map the namespace to the directory
+etc. The ``$psr4`` array in the configuration file allows you to map the namespace to the directory
 those classes can be found in:
 
 .. literalinclude:: autoloader/001.php
 
 The key of each row is the namespace itself. This does not need a trailing back slash.
-The value is the location to the directory the classes can be found in. They should
-have a trailing slash.
+The value is the location to the directory the classes can be found in.
 
 .. note:: You can check the namespace configuration by ``spark namespaces`` command::
 
     > php spark namespaces
 
-By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers,
-libraries, or models in the application directory, if you do, they will be found under the ``App`` namespace.
+By default, the application directory is namespace to the ``App`` namespace. You must namespace the controllers,
+libraries, or models in the application directory, and they will be found under the ``App`` namespace.
+
 You may change this namespace by editing the **app/Config/Constants.php** file and setting the
 new namespace value under the ``APP_NAMESPACE`` setting:
 
 .. literalinclude:: autoloader/002.php
+   :lines: 2-
 
 You will need to modify any existing files that are referencing the current namespace.
 

user_guide_src/source/concepts/autoloader/001.php

@@ -1,6 +1,16 @@
 <?php
 
-$psr4 = [
-    'App'         => APPPATH,
-    'CodeIgniter' => SYSTEMPATH,
-];
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
+class Autoload extends AutoloadConfig
+{
+    // ...
+    public $psr4 = [
+        APP_NAMESPACE => APPPATH, // For custom app namespace
+        'Config'      => APPPATH . 'Config',
+    ];
+
+    // ...
+}

user_guide_src/source/concepts/autoloader/002.php

@@ -1,3 +1,3 @@
 <?php
 
-define('APP_NAMESPACE', 'App');
+defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');

user_guide_src/source/concepts/autoloader/003.php

@@ -1,5 +1,15 @@
 <?php
 
-$classmap = [
-    'Markdown' => APPPATH . 'third_party/markdown.php',
-];
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
+class Autoload extends AutoloadConfig
+{
+    // ...
+    public $classmap = [
+        'Markdown' => APPPATH . 'ThirdParty/markdown.php',
+    ];
+
+    // ...
+}