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

Author: kenjis

admin/framework/.gitattributes

@@ -0,0 +1,3 @@
+/.github export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore

tests/system/Commands/SessionsCommandsTest.php

@@ -14,7 +14,6 @@
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\Test\CIUnitTestCase;
 use DateTimeImmutable;
-use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @internal
@@ -96,29 +95,6 @@ public function testPutRemoveCookiesInStore(): void
         $this->assertFalse($jar->has('dev'));
     }
 
-    public function testCookieDispatching(): void
-    {
-        $cookies = [
-            'dev'  => new Cookie('dev', 'cookie'),
-            'prod' => new Cookie('prod', 'cookie', ['raw' => true]),
-        ];
-
-        $dev  = $cookies['dev']->getOptions();
-        $prod = $cookies['prod']->getOptions();
-
-        /**
-         * @var CookieStore&MockObject $store
-         */
-        $store = $this->getMockBuilder(CookieStore::class)
-            ->setConstructorArgs([$cookies])
-            ->onlyMethods(['setRawCookie', 'setCookie'])
-            ->getMock();
-
-        $store->expects($this->once())->method('setRawCookie')->with('prod', 'cookie', $prod);
-        $store->expects($this->once())->method('setCookie')->with('dev', 'cookie', $dev);
-        $store->dispatch();
-    }
-
     public function testCookiesFunction(): void
     {
         $a = cookies();

tests/system/Cookie/CookieStoreTest.php

@@ -88,6 +88,7 @@ some additional tools to make working with data simpler. Add the
 following code to your model.
 
 .. literalinclude:: news_section/002.php
+    :lines: 11-18
 
 With this code, you can perform two different queries. You can get all
 news records, or get a news item by its slug. You might have
@@ -113,7 +114,7 @@ a new ``News`` controller is defined. Create the new controller at
 .. literalinclude:: news_section/003.php
 
 Looking at the code, you may see some similarity with the files we
-created earlier. First, it extends a core CodeIgniter class, ``Controller``,
+created earlier. First, it extends ``BaseController`` that extends a core CodeIgniter class, ``Controller``,
 which provides a couple of helper methods, and makes sure that you have
 access to the current ``Request`` and ``Response`` objects, as well as the
 ``Logger`` class, for saving information to disk.
@@ -143,10 +144,10 @@ and add the next piece of code.
 
 .. literalinclude:: news_section/005.php
 
-.. note:: We are again using using ``esc()`` to help prevent XSS attacks.
+.. note:: We are again using using :php:func:`esc()` to help prevent XSS attacks.
     But this time we also passed "url" as a second parameter. That's because
     attack patterns are different depending on the context in which the output
-    is used. You can read more about it :doc:`here </general/common_functions>`.
+    is used.
 
 Here, each news item is looped and displayed to the user. You can see we
 wrote our template in PHP mixed with HTML. If you prefer to use a template

user_guide_src/source/tutorial/news_section.rst

@@ -1,7 +1,13 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class NewsModel extends Model
 {
+    protected $table = 'news';
+
     public function getNews($slug = false)
     {
         if ($slug === false) {

user_guide_src/source/tutorial/news_section/002.php

@@ -19,4 +19,6 @@ public function index()
             . view('news/overview')
             . view('templates/footer');
     }
+
+    // ...
 }

user_guide_src/source/tutorial/news_section/004.php

@@ -6,6 +6,8 @@
 
 class News extends BaseController
 {
+    // ...
+
     public function view($slug = null)
     {
         $model = model(NewsModel::class);