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

Author: kenjis

.github/scripts/deploy-appstarter

@@ -20,7 +20,7 @@ git checkout master
 rm -rf *
 
 # Copy common files
-releasable='app public writable env LICENSE spark'
+releasable='app public writable env LICENSE spark preload.php'
 for fff in $releasable;
 do
     cp -Rf ${SOURCE}/$fff ./

.github/scripts/deploy-framework

@@ -20,7 +20,7 @@ git checkout master
 rm -rf *
 
 # Copy common files
-releasable='app public writable env LICENSE spark system'
+releasable='app public writable env LICENSE spark system preload.php'
 for fff in $releasable;
 do
     cp -Rf ${SOURCE}/$fff ./

admin/starter/preload.php preload.phpadmin/starter/preload.php renamed to preload.php

@@ -16,7 +16,8 @@
  * See https://www.php.net/manual/en/opcache.preloading.php
  *
  * How to Use:
- *   1. Set preload::$paths.
+ *   0. Copy this file to your project root folder.
+ *   1. Set the $paths property of the preload class below.
  *   2. Set opcache.preload in php.ini.
  *     php.ini:
  *     opcache.preload=/path/to/preload.php

user_guide_src/source/database/query_builder/103.php

@@ -1,11 +1,10 @@
 <?php
 
-$union   = $this->db->table('users')->select('id', 'name');
-$builder = $this->db->table('users')->select('id', 'name');
-
-$builder->union($union)->limit(10)->get();
+$builder = $db->table('users')->select('id, name')->limit(10);
+$union   = $db->table('groups')->select('id, name');
+$builder->union($union)->get();
 /*
  * Produces:
  * SELECT * FROM (SELECT `id`, `name` FROM `users` LIMIT 10) uwrp0
- * UNION SELECT * FROM (SELECT `id`, `name` FROM `users`) uwrp1
+ * UNION SELECT * FROM (SELECT `id`, `name` FROM `groups`) uwrp1
  */

user_guide_src/source/database/query_builder/104.php

@@ -1,9 +1,9 @@
 <?php
 
-$union   = $this->db->table('users')->select('id', 'name')->orderBy('id', 'DESC')->limit(5);
-$builder = $this->db->table('users')->select('id', 'name')->orderBy('id', 'ASC')->limit(5)->union($union);
+$union   = $db->table('users')->select('id, name')->orderBy('id', 'DESC')->limit(5);
+$builder = $db->table('users')->select('id, name')->orderBy('id', 'ASC')->limit(5)->union($union);
 
-$this->db->newQuery()->fromSubquery($builder, 'q')->orderBy('id', 'DESC')->get();
+$db->newQuery()->fromSubquery($builder, 'q')->orderBy('id', 'DESC')->get();
 /*
  * Produces:
  * SELECT * FROM (