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

Author: kenjis

system/Autoloader/Autoloader.php

@@ -281,11 +281,13 @@ protected function loadInNamespace(string $class)
         }
 
         foreach ($this->prefixes as $namespace => $directories) {
-            foreach ($directories as $directory) {
-                $directory = rtrim($directory, '\\/');
+            if (strpos($class, $namespace) === 0) {
+                $relativeClassPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace)));
 
-                if (strpos($class, $namespace) === 0) {
-                    $filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
+                foreach ($directories as $directory) {
+                    $directory = rtrim($directory, '\\/');
+
+                    $filePath = $directory . $relativeClassPath . '.php';
                     $filename = $this->includeFile($filePath);
 
                     if ($filename) {

system/I18n/TimeTrait.php

@@ -268,7 +268,8 @@ public static function createFromFormat($format, $datetime, $timezone = null)
     public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
     {
         $time = new self(gmdate('Y-m-d H:i:s', $timestamp), 'UTC', $locale);
-        $timezone ??= 'UTC';
+
+        $timezone ??= date_default_timezone_get();
 
         return $time->setTimezone($timezone);
     }

tests/system/I18n/TimeTest.php

@@ -261,17 +261,21 @@ public function testCreateFromFormatWithInvalidFormat(): void
 
     public function testCreateFromTimestamp(): void
     {
-        // Set the timezone temporarily to UTC to make sure the test timestamp is correct
+        // Save the current timezone.
         $tz = date_default_timezone_get();
-        date_default_timezone_set('UTC');
 
-        $timestamp = strtotime('2017-03-18 midnight');
+        // Change the timezone other than UTC.
+        date_default_timezone_set('Asia/Tokyo'); // +09:00
 
-        date_default_timezone_set($tz);
+        $timestamp = strtotime('2017-03-18 midnight');
 
         $time = Time::createFromTimestamp($timestamp);
 
-        $this->assertSame(date('2017-03-18 00:00:00'), $time->toDateTimeString());
+        $this->assertSame('Asia/Tokyo', $time->getTimezone()->getName());
+        $this->assertSame('2017-03-18 00:00:00', $time->format('Y-m-d H:i:s'));
+
+        // Restore timezone.
+        date_default_timezone_set($tz);
     }
 
     public function testCreateFromTimestampWithTimezone(): void

user_guide_src/source/changelogs/v4.4.6.rst

@@ -14,6 +14,15 @@ Release Date: Unreleased
 BREAKING
 ********
 
+Time::createFromTimestamp()
+===========================
+
+A bug that caused :ref:`Time::createFromTimestamp() <time-createfromtimestamp>`
+to return a Time instance with a timezone of UTC has been fixed.
+
+Starting with this version, when you do not specify a timezone, a Time instance
+with the app's timezone is returned by default.
+
 ***************
 Message Changes
 ***************

user_guide_src/source/database/events.rst

@@ -15,14 +15,19 @@ uses this to collect the queries to display in the Toolbar.
 The Events
 **********
 
+.. _database-events-dbquery:
+
 DBQuery
 =======
 
-This event is triggered whenever a new query has been run, whether successful or not. The only parameter is
-a :doc:`Query </database/queries>` instance of the current query. You could use this to display all queries
-in STDOUT, or logging to a file, or even creating tools to do automatic query analysis to help you spot
-potentially missing indexes, slow queries, etc.
+This event is triggered whenever a new query has been run, whether successful or
+not. The only parameter is a :doc:`Query </database/queries>` instance of the
+current query.
+
+You could use this to display all queries in STDOUT, or logging to a file, or
+even creating tools to do automatic query analysis to help you spot potentially
+missing indexes, slow queries, etc.
 
-An example usage might be:
+An example to log all queries:
 
 .. literalinclude:: events/001.php

user_guide_src/source/installation/running.rst

@@ -426,6 +426,85 @@ Setting Environment
 
 See :ref:`Handling Multiple Environments <environment-nginx>`.
 
+
+.. _deployment-to-shared-hosting-services:
+
+*************************************
+Deployment to Shared Hosting Services
+*************************************
+
+.. important::
+    **index.php** is no longer in the root of the project! It has been moved inside
+    the **public** folder, for better security and separation of components.
+
+    This means that you should configure your web server to "point" to your project's
+    **public** folder, and not to the project root.
+
+Specifying the Document Root
+============================
+
+The best way is to set the document root to the **public** folder in the server
+configuration::
+
+    └── example.com/ (project folder)
+        └── public/  (document root)
+
+Check with your hosting service provider to see if you can change the document root.
+Unfortunately, if you cannot change the document root, go to the next way.
+
+Using Two Directories
+=====================
+
+The second way is to use two directories, and adjust the path.
+One is for the application and the other is the default document root.
+
+Upload the contents of the **public** folder to **public_html** (the default
+document root) and the other files to the directory for the application::
+
+    ├── example.com/ (for the application)
+    │       ├── app/
+    │       ├── vendor/ (or system/)
+    │       └── writable/
+    └── public_html/ (the default document root)
+            ├── .htaccess
+            ├── favicon.ico
+            ├── index.php
+            └── robots.txt
+
+See
+`Install CodeIgniter 4 on Shared Hosting (cPanel) <https://forum.codeigniter.com/showthread.php?tid=76779>`_
+for details.
+
+Adding .htaccess
+================
+
+The last resort is to add **.htaccess** to the project root.
+
+It is not recommended that you place the project folder in the document root.
+However, if you have no other choice, you can use this.
+
+Place your project folder as follows, where **public_html** is the document root,
+and create the **.htaccess** file::
+
+    └── public_html/     (the default document root)
+        └── example.com/ (project folder)
+            ├── .htaccess
+            └── public/
+
+And edit **.htaccess** as follows:
+
+.. code-block:: apache
+
+    <IfModule mod_rewrite.c>
+        RewriteEngine On
+        RewriteRule ^(.*)$ public/$1 [L]
+    </IfModule>
+
+    <FilesMatch "^\.">
+        Require all denied
+        Satisfy All
+    </FilesMatch>
+
 *********************
 Bootstrapping the App
 *********************

user_guide_src/source/installation/troubleshooting.rst

@@ -102,9 +102,4 @@ After that, reload the page. You will see the error and the back trace.
 CodeIgniter Error Logs
 ----------------------
 
-CodeIgniter logs error messages, according to the settings in **app/Config/Logger.php**.
-
-You can adjust the error threshold to see more or fewer messages. See :ref:`Logging <logging-configuration>` for details.
-
-The default configuration has daily log files stored in **writable/logs**.
-It would be a good idea to check them if things aren't working the way you expect!
+See :ref:`codeigniter-error-logs`.

user_guide_src/source/installation/upgrade_446.rst

@@ -20,6 +20,20 @@ Mandatory File Changes
 Breaking Changes
 ****************
 
+Time::createFromTimestamp() Timezone Change
+===========================================
+
+When you do not specify a timezone, now
+:ref:`Time::createFromTimestamp() <time-createfromtimestamp>` returns a Time
+instance with the app's timezone is returned.
+
+If you want to keep the timezone UTC, you need to call ``setTimezone('UTC')``::
+
+    use CodeIgniter\I18n\Time;
+
+    $time = Time::createFromTimestamp(1501821586)->setTimezone('UTC');
+
+
 *********************
 Breaking Enhancements
 *********************

user_guide_src/source/libraries/cookies/004.php

@@ -22,7 +22,7 @@
 $cookie->getName();             // 'remember_token'
 $cookie->getPrefix();           // '__Secure-'
 $cookie->getPrefixedName();     // '__Secure-remember_token'
-$cookie->getExpiresTimestamp(); // Unix timestamp
+$cookie->getExpiresTimestamp(); // UNIX timestamp
 $cookie->getExpiresString();    // 'Fri, 14-Feb-2025 00:00:00 GMT'
 $cookie->isExpired();           // false
 $cookie->getMaxAge();           // the difference from time() to expires

user_guide_src/source/libraries/time.rst

@@ -114,13 +114,18 @@ and returns a ``Time`` instance, instead of DateTimeImmutable:
 
 .. literalinclude:: time/011.php
 
+.. _time-createfromtimestamp:
+
 createFromTimestamp()
 =====================
 
 This method takes a UNIX timestamp and, optionally, the timezone and locale, to create a new Time instance:
 
 .. literalinclude:: time/012.php
 
+.. note:: Due to a bug, prior to v4.4.6, this method returned a Time instance
+    in timezone UTC when you do not specify a timezone.
+
 createFromInstance()
 ====================
 

user_guide_src/source/models/model.rst

@@ -209,7 +209,7 @@ $dateFormat
 
 This value works with `$useTimestamps`_ and `$useSoftDeletes`_ to ensure that the correct type of
 date value gets inserted into the database. By default, this creates DATETIME values, but
-valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using `$useSoftDeletes`_ or
+valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a UNIX timestamp). Using `$useSoftDeletes`_ or
 `$useTimestamps`_ with an invalid or missing `$dateFormat`_ will cause an exception.
 
 $createdField

user_guide_src/source/testing/debugging.rst

@@ -1,20 +1,46 @@
-**************************
+##########################
 Debugging Your Application
-**************************
+##########################
 
 .. contents::
     :local:
     :depth: 2
 
-================
-Replace var_dump
-================
+*************
+Checking Logs
+*************
 
-While using XDebug and a good IDE can be indispensable to debug your application, sometimes a quick ``var_dump()`` is
-all you need. CodeIgniter makes that even better by bundling in the excellent `Kint <https://kint-php.github.io/kint/>`_
-debugging tool for PHP. This goes way beyond your usual tool, providing many alternate pieces of data, like formatting
-timestamps into recognizable dates, showing you hexcodes as colors, display array data like a table for easy reading,
-and much, much more.
+.. _codeigniter-error-logs:
+
+CodeIgniter Error Logs
+======================
+
+CodeIgniter logs error messages, according to the settings in **app/Config/Logger.php**.
+
+The default configuration has daily log files stored in **writable/logs**.
+It would be a good idea to check them if things aren't working the way you expect!
+
+You can adjust the error threshold to see more or fewer messages. See
+:ref:`Logging <logging-configuration>` for details.
+
+Logging All SQL Queries
+=======================
+
+All SQL queries issued by CodeIgniter can be logged.
+See :ref:`Database Events <database-events-dbquery>` for details.
+
+********************
+Replacing var_dump()
+********************
+
+While using Xdebug and a good IDE can be indispensable to debug your application,
+sometimes a quick ``var_dump()`` is all you need. CodeIgniter makes that even
+better by bundling in the excellent `Kint <https://kint-php.github.io/kint/>`_
+debugging tool for PHP.
+
+This goes way beyond your usual tool, providing many alternate pieces of data,
+like formatting timestamps into recognizable dates, showing you hexcodes as colors,
+display array data like a table for easy reading, and much, much more.
 
 Enabling Kint
 =============
@@ -33,6 +59,7 @@ The ``d()`` method dumps all of the data it knows about the contents passed as t
 allows the script to continue executing:
 
 .. literalinclude:: debugging/001.php
+    :lines: 2-
 
 dd()
 ----
@@ -45,14 +72,15 @@ trace()
 This provides a backtrace to the current execution point, with Kint's own unique spin:
 
 .. literalinclude:: debugging/002.php
+    :lines: 2-
 
 For more information, see `Kint's page <https://kint-php.github.io/kint//>`_.
 
 .. _the-debug-toolbar:
 
-=================
+*****************
 The Debug Toolbar
-=================
+*****************
 
 The Debug Toolbar provides at-a-glance information about the current page request, including benchmark results,
 queries you have run, request and response data, and more. This can all prove very useful during development