Merge remote-tracking branch 'upstream/develop' into 4.3

Conflicts:
	system/Test/FeatureTestTrait.php
	user_guide_src/source/changelogs/index.rst
	user_guide_src/source/models/model.rst
	user_guide_src/source/tutorial/create_news_items.rst

Author: kenjis

system/Autoloader/FileLocator.php

@@ -71,13 +71,13 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $namespaces = $this->autoloader->getNamespace();
 
         foreach (array_keys($namespaces) as $namespace) {
-            if (substr($file, 0, strlen($namespace)) === $namespace) {
+            if (substr($file, 0, strlen($namespace) + 1) === $namespace . '\\') {
+                $fileWithoutNamespace = substr($file, strlen($namespace));
+
                 // There may be sub-namespaces of the same vendor,
                 // so overwrite them with namespaces found later.
-                $paths = $namespaces[$namespace];
-
-                $fileWithoutNamespace = substr($file, strlen($namespace));
-                $filename             = ltrim(str_replace('\\', '/', $fileWithoutNamespace), '/');
+                $paths    = $namespaces[$namespace];
+                $filename = ltrim(str_replace('\\', '/', $fileWithoutNamespace), '/');
             }
         }
 

system/Test/FeatureTestTrait.php

@@ -15,9 +15,9 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\RouteCollection;
+use Config\App;
 use Config\Services;
 use Exception;
 use ReflectionException;
@@ -285,8 +285,8 @@ public function options(string $path, ?array $params = null)
     protected function setupRequest(string $method, ?string $path = null): IncomingRequest
     {
         $path    = URI::removeDotSegments($path);
-        $config  = config('App');
-        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+        $config  = config(App::class);
+        $request = Services::request($config, true);
 
         // $path may have a query in it
         $parts                   = explode('?', $path);

tests/system/Autoloader/FileLocatorTest.php

@@ -44,6 +44,8 @@ protected function setUp(): void
             'CodeIgniter\\Devkit' => [
                 TESTPATH . '_support/',
             ],
+            'Acme\SampleProject' => TESTPATH . '_support',
+            'Acme\Sample'        => TESTPATH . '_support/does/not/exists',
         ]);
 
         $this->locator = new FileLocator($autoloader);
@@ -151,6 +153,15 @@ public function testLocateFileNotFoundWithBadNamespace()
         $this->assertFalse($this->locator->locateFile($file, 'Views'));
     }
 
+    public function testLocateFileWithProperNamespace()
+    {
+        $file = 'Acme\SampleProject\View\Views\simple';
+
+        $expected = ROOTPATH . 'tests/_support/View/Views/simple.php';
+
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
+    }
+
     public function testSearchSimple()
     {
         $expected = APPPATH . 'Config/App.php';

user_guide_src/source/changelogs/index.rst

@@ -13,6 +13,7 @@ See all the changes.
     :titlesonly:
 
     v4.3.0
+    v4.2.11
     v4.2.10
     v4.2.9
     v4.2.8

user_guide_src/source/changelogs/v4.2.11.rst

@@ -0,0 +1,17 @@
+Version 4.2.11
+##############
+
+Release Date: Unreleased
+
+**4.2.11 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+Bugs Fixed
+**********
+
+- Fixed a ``FileLocator::locateFile()`` bug where a similar namespace name could be replaced by another, causing a failure to find a file that exists.
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.

user_guide_src/source/cli/cli_controllers.rst

@@ -41,8 +41,8 @@ works exactly like a normal route definition:
 
 For more information, see the :ref:`Routes <command-line-only-routes>` page.
 
-.. warning:: If you enable :ref:`auto-routing` and place the command file in **app/Controllers**,
-    anyone could access the command with the help of auto-routing via HTTP.
+.. warning:: If you enable :ref:`auto-routing-legacy` and place the command file in **app/Controllers**,
+    anyone could access the command with the help of :ref:`auto-routing-legacy` via HTTP.
 
 Run via CLI
 ===========

user_guide_src/source/concepts/services.rst

@@ -106,14 +106,14 @@ CodeIgniter's classes provide an interface that they adhere to. When you want to
 core classes, you only need to ensure you meet the requirements of the interface and you know that
 the classes are compatible.
 
-For example, the ``RouterCollection`` class implements the ``RouterCollectionInterface``. When you
+For example, the ``RouteCollection`` class implements the ``RouteCollectionInterface``. When you
 want to create a replacement that provides a different way to create routes, you just need to
-create a new class that implements the ``RouterCollectionInterface``:
+create a new class that implements the ``RouteCollectionInterface``:
 
 .. literalinclude:: services/006.php
 
-Finally, modify **app/Config/Services.php** to create a new instance of ``MyRouter``
-instead of ``CodeIgniter\Router\RouterCollection``:
+Finally, add the ``routes()`` method to **app/Config/Services.php** to create a new instance of ``MyRouteCollection``
+instead of ``CodeIgniter\Router\RouteCollection``:
 
 .. literalinclude:: services/007.php
 

user_guide_src/source/concepts/services/006.php

@@ -4,7 +4,7 @@
 
 use CodeIgniter\Router\RouteCollectionInterface;
 
-class MyRouter implements RouteCollectionInterface
+class MyRouteCollection implements RouteCollectionInterface
 {
     // Implement required methods here.
 }

user_guide_src/source/concepts/services/007.php

@@ -6,10 +6,10 @@
 
 class Services extends BaseService
 {
+    // ...
+
     public static function routes()
     {
-        return new \App\Router\MyRouter();
+        return new \App\Router\MyRouteCollection(static::locator(), config('Modules'));
     }
-
-    // ...
 }

user_guide_src/source/concepts/services/008.php

@@ -6,10 +6,10 @@
 
 class Services extends BaseService
 {
+    // ...
+
     public static function renderer($viewPath = APPPATH . 'views/')
     {
         return new \CodeIgniter\View\View($viewPath);
     }
-
-    // ...
 }