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

Author: kenjis

.gitattributes

@@ -5,31 +5,33 @@
 
 # git files
 .gitattributes export-ignore
-.gitignore export-ignore
+.gitignore     export-ignore
 
-# Don't give admin files
-.github/ export-ignore
-admin/ export-ignore
-contributing/ export-ignore
-.editorconfig export-ignore
-.nojekyll export-ignore
+# admin files
+.github/           export-ignore
+admin/             export-ignore
+contributing/      export-ignore
+.editorconfig      export-ignore
 CODE_OF_CONDUCT.md export-ignore
-CONTRIBUTING.md export-ignore
+CONTRIBUTING.md    export-ignore
 
-# They don't want our test files
-tests/AutoReview/ export-ignore
-tests/system/ export-ignore
-utils/ export-ignore
-deptrac.yaml export-ignore
-rector.php export-ignore
-phpunit.xml.dist export-ignore
-phpstan-baseline.neon.dist export-ignore
-phpstan.neon.dist export-ignore
-phpstan-bootstrap.php export-ignore
-.php-cs-fixer.dist.php export-ignore
-.php-cs-fixer.no-header.php export-ignore
+# contributor/development files
+tests/                       export-ignore
+utils/                       export-ignore
+.php-cs-fixer.dist.php       export-ignore
+.php-cs-fixer.no-header.php  export-ignore
 .php-cs-fixer.user-guide.php export-ignore
+deptrac.yaml                 export-ignore
+phpstan-baseline.neon.dist   export-ignore
+phpstan-bootstrap.php        export-ignore
+phpstan.neon.dist            export-ignore
+phpunit.xml.dist             export-ignore
+psalm_autoload.php           export-ignore
+psalm-baseline.php           export-ignore
+psalm.xml                    export-ignore
+rector.php                   export-ignore
 
-# The source user guide, either
+# source user guide
 user_guide_src/ export-ignore
+.nojekyll       export-ignore
 phpdoc.dist.xml export-ignore

user_guide_src/source/installation/upgrade_447.rst

@@ -118,6 +118,7 @@ All Changes
 This is a list of all files in the **project space** that received changes;
 many will be simple comments or formatting that have no effect on the runtime:
 
+- app/Config/App.php
 - app/Config/Cache.php
 - app/Config/ContentSecurityPolicy.php
 - app/Config/Database.php

user_guide_src/source/installation/upgrade_4xx.rst

@@ -251,6 +251,7 @@ Upgrading Libraries
     upgrade_encryption
     upgrade_file_upload
     upgrade_html_tables
+    upgrade_images
     upgrade_localization
     upgrade_migrations
     upgrade_pagination

user_guide_src/source/installation/upgrade_images.rst

@@ -0,0 +1,42 @@
+Upgrade Image Manipulation Class
+################################
+
+.. contents::
+    :local:
+    :depth: 2
+
+Documentations
+==============
+
+- `Image Manipulation Class Documentation CodeIgniter 3.X <https://www.codeigniter.com/userguide3/libraries/image_lib.html>`_
+- :doc:`Image Manipulation Class Documentation CodeIgniter 4.X <../libraries/images>`
+
+What has been changed
+=====================
+- The preferences passed to the constructor or ``initialize()`` method in CI3
+  have been changed to be specified in the new methods in CI4.
+- Some preferences like ``create_thumb`` are removed.
+- In CI4, the ``save()`` method must be called to save the manipulated image.
+- The ``display_errors()`` has been removed, and an exception will be thrown
+  if an error occurs.
+
+Upgrade Guide
+=============
+1. Within your class change the ``$this->load->library('image_lib');`` to
+   ``$image = \Config\Services::image();``.
+2. Change the preferences passed to the constructor or ``initialize()`` method
+   to be specified in the corresponding methods.
+3. Call the ``save()`` method to save the file.
+
+Code Example
+============
+
+CodeIgniter Version 3.x
+------------------------
+
+.. literalinclude:: upgrade_images/ci3sample/001.php
+
+CodeIgniter Version 4.x
+-----------------------
+
+.. literalinclude:: upgrade_images/001.php

user_guide_src/source/installation/upgrade_images/001.php

@@ -0,0 +1,8 @@
+<?php
+
+$image = \Config\Services::image();
+
+$image
+    ->withFile('/path/to/image/mypic.jpg')
+    ->resize(75, 50, true)
+    ->save('/path/to/image/mypic_thumb.jpg');

user_guide_src/source/installation/upgrade_images/ci3sample/001.php

@@ -0,0 +1,12 @@
+<?php
+
+$config['image_library']  = 'gd2';
+$config['source_image']   = '/path/to/image/mypic.jpg';
+$config['create_thumb']   = TRUE;
+$config['maintain_ratio'] = TRUE;
+$config['width']          = 75;
+$config['height']         = 50;
+
+$this->load->library('image_lib', $config);
+
+$this->image_lib->resize();