Merge branch '5.x' into 5.next

Author: LordSimal

docs/en/appendices/5-4-migration-guide.md

@@ -241,6 +241,9 @@ events are now registered while each plugin is bootstrapped.
   You can set `Security.encryptWithRawKey` to enable this behavior. See [here](https://github.com/cakephp/cakephp/pull/19325) for more details.
 - Added `Text::mask()` method which masks a portion of a string with a repeated character. See [Text Masking](../core-libraries/text.md#text-masking) for more details.
 - Added `Text::maskValue()` method which masks all occurrences of given substrings within a string using a repeated character. See [Text Masking](../core-libraries/text.md#text-masking) for more details.
+- Added `Text::maskRegex()` and `Text::maskPartialRegex()` methods for masking
+  regular expression matches. See [Text Masking](../core-libraries/text.md#text-masking)
+  for more details.
 
 ### View
 

docs/en/core-libraries/text.md

@@ -501,4 +501,58 @@ echo Text::maskValue('4111111111111234', ['411', '112'], '*');
 Output:
 
     ***11111111***34
+
+### Text::maskRegex()
+
+`method` Cake\\Utility\\Text::**maskRegex**(string $string, array|string $patterns, string $maskCharacter = '*'): string
+
+Masks all occurrences of given regular expression pattern(s) within a string
+using a repeated character. Each match is replaced by a sequence of the masking
+character with the same length as the match.
+
+The `$patterns` argument accepts a single regular expression or an array of
+regular expressions. Empty patterns are ignored. `$maskCharacter` must be a
+single character.
+
+```php
+// Called as TextHelper
+echo $this->Text->maskRegex('my pin is 1234', '/\d+/', '*');
+
+// Called as Text
+use Cake\Utility\Text;
+
+echo Text::maskRegex('token: abc123', '/[a-z0-9]+/', 'x');
+```
+
+Output:
+
+    my pin is ****
+    xxxxx: xxxxxx
+
+### Text::maskPartialRegex()
+
+`method` Cake\\Utility\\Text::**maskPartialRegex**(string $string, array|string $patterns, int $showLeading = 0, int $showTrailing = 0, string $maskCharacter = '*'): string
+
+Masks all occurrences of given regular expression pattern(s) within a string,
+while preserving a number of leading and trailing characters from each match.
+
+The `$showLeading` and `$showTrailing` arguments control how many characters at
+the start and end of each match are left unmasked. If their combined value is
+greater than or equal to the match length, the match is left unchanged. These
+values must be non-negative, and `$maskCharacter` must be a single character.
+
+```php
+// Called as TextHelper
+echo $this->Text->maskPartialRegex('card: 4242424242424242', '/\d{16}/', 0, 4);
+
+// Called as Text
+use Cake\Utility\Text;
+
+echo Text::maskPartialRegex('Secret Codeword', '/\b\w+\b/', 1, 1);
+```
+
+Output:
+
+    card: ************4242
+    S****t C******d
 <!-- end-text -->

docs/en/development/dependency-injection.md

@@ -1327,12 +1327,13 @@ class ArticlesController extends AppController
 > - **Clarity**: Controller focuses on HTTP concerns, service handles business logic
 > - **Maintainability**: Complex workflows are organized into focused classes
 
-## Auto Wiring
+## Auto-wiring with league/container
 
 > [!WARNING]
 > Auto-wiring is convenient but can impact performance. Enable caching in production environments.
 
-Auto Wiring is turned off by default. To enable it:
+When using the default `league/container` implementation, auto-wiring is turned
+off by default. To enable it:
 
 ```php
 // In src/Application.php
@@ -1360,3 +1361,55 @@ $container->delegate(
 ```
 
 Read more about auto wiring in the [PHP League Container documentation](https://container.thephpleague.com/4.x/auto-wiring/).
+
+## Built-in Container
+
+::: info Added in version 5.4.0
+:::
+
+CakePHP includes its own PSR-11-compatible dependency injection container in
+the `Cake\Container` namespace. The `league/container` implementation remains
+the default so that existing applications continue to work unchanged. To use
+the built-in container, set `App.container` to `cake` in `config/app.php`:
+
+```php
+return [
+    'App' => [
+        'container' => 'cake',
+    ],
+];
+```
+
+CakePHP exposes the built-in container through a compatibility bridge. Continue
+to type-hint `Cake\Core\ContainerInterface` in your application's `services()`
+method; service definitions using `add()`, `addShared()`, `extend()`, tags, and
+delegates work with either implementation.
+
+### Auto-wiring
+
+Unlike the default `league/container` implementation, the built-in container
+enables auto-wiring and caches auto-wired resolutions by default. It can create
+concrete classes and resolve their class-typed constructor dependencies without
+an explicit service definition:
+
+```php
+class OrderService
+{
+    public function __construct(private PaymentGateway $gateway)
+    {
+    }
+}
+
+// Only the interface needs an explicit mapping. OrderService is auto-wired.
+$container->add(PaymentGateway::class, StripePaymentGateway::class);
+```
+
+Define services explicitly when a constructor needs an interface, a scalar or
+array value, or another value that cannot be determined from its type. Explicit
+definitions also let you configure constructor arguments and control whether a
+service is shared.
+
+When using the built-in container, do not add
+`League\Container\ReflectionContainer`; auto-wiring is already enabled. The
+following [auto-wiring instructions](#auto-wiring-with-leaguecontainer) apply
+only when using the default `league/container` implementation.