fix valStr in Database\BaseBuilder

Author: tada5hi

README.md

@@ -9,7 +9,7 @@
 CodeIgniter is a PHP full-stack web framework that is light, fast, flexible, and secure. 
 More information can be found at the [official site](http://codeigniter.com).
 
-This repository holds the alpha code for CodeIgniter 4 only. 
+This repository holds the source code for CodeIgniter 4 only. 
 Version 4 is a complete rewrite to bring the quality and the code into a more modern version, 
 while still keeping as many of the things intact that has made people love the framework over the years. 
 
@@ -19,9 +19,12 @@ More information about the plans for version 4 can be found in [the announcement
 
 ### Documentation
 
-The current in-progress documentation can be found [here](https://codeigniter4.github.io/CodeIgniter4/). 
-As with the rest of the framework, it is currently a work in progress, and will see changes over time to structure, explanations, etc.
+The [User Guide](https://codeigniter4.github.io/userguide/) is the primary documentation for CodeIgniter 4. 
 
+The current **in-progress** User Guide can be found [here](https://codeigniter4.github.io/CodeIgniter4/). 
+As with the rest of the framework, it is a work in progress, and will see changes over time to structure, explanations, etc.
+
+You might also be interested in the [API documentation](https://codeigniter4.github.io/api/) for the framework components.
 
 ## Important Change with index.php
 

admin/framework/README.md

@@ -31,26 +31,12 @@ The user guide updating and deployment is a bit awkward at the moment, but we ar
 
 ## Repository Management
 
-We use Github issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use Github issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
 
-If you raise an issue here that pertains to support or a feature request, it will
-be closed! If you are not sure if you have found a bug, raise a thread on the forum first -
-someone else may have encountered the same thing.
-
-Before raising a new Github issue, please check that your bug hasn't already
-been reported or fixed. 
-
-We use pull requests (PRs) for CONTRIBUTIONS to the repository.
-We are looking for contributions that address one of the reported bugs or
-approved work packages.
-
-Do not use a PR as a form of feature request.
-Unsolicited contributions will only be considered if they fit nicely
-into the framework roadmap.
-Remember that some components that were part of CodeIgniter 3 are being moved
-to optional packages, with their own repository.
+This repository is a "distribution" one, built by our release preparation script. 
+Problems with it can be raised on our forum, or as issues in the main repository.
 
 ## Contributing
 

admin/framework/composer.json

@@ -25,7 +25,7 @@
     },
     "scripts": {
         "post-update-cmd": [
-            "composer dump-autoload",
+            "@composer dump-autoload",
             "CodeIgniter\\ComposerScripts::postUpdate"
         ]
     },

admin/framework/phpunit.xml.dist

@@ -12,17 +12,11 @@
     <testsuites>
         <testsuite name="app">
             <directory>./tests</directory>
-            <exclude>./tests/system</exclude>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./system</directory>
-            <exclude>
-                <directory>./system</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+    
+    <php>
+        <env name="app.baseURL" value="http://example.com"/>
+    </php>
 
 </phpunit>

admin/release-appstarter

@@ -20,6 +20,10 @@ for fff in $releasable ; do
     cp -rf ${CI_DIR}/$fff .
 done
 
+rm -rf tests
+mkdir tests
+cp -rf ${CI_DIR}/tests/_support tests/
+
 echo -e "${BOLD}Override as needed...${NORMAL}"
 cp -rf ${CI_DIR}/admin/starter/* .
 

admin/release-deploy

@@ -7,18 +7,18 @@ echo '-------------------------------'
 
 . admin/release-config
 
-echo -e "${BOLD}Merge release into master${NORMAL}"
-git checkout master
-git merge $branch
-git push origin master
-git push ${CI_ORG}/CodeIgniter4 master
-
 echo -e "${BOLD}Merge release into develop${NORMAL}"
 git checkout develop
 git merge $branch
 git push origin develop
 git push ${CI_ORG}/CodeIgniter4 develop
 
+echo -e "${BOLD}Merge develop into master${NORMAL}"
+git checkout master
+git merge develop
+git push origin master
+git push ${CI_ORG}/CodeIgniter4 master
+
 echo -e "${BOLD}Pushing to the user guide repository${NORMAL}"
 cd ${CI_DIR}/dist/userguide
 git push origin master

admin/starter/.gitignore

@@ -123,4 +123,4 @@ nb-configuration.xml
 .vscode/
 
 /results/
-/phpunit*.xml
+/phpunit*.xml

admin/starter/README.md

@@ -11,13 +11,6 @@ It has been built from the
 
 **This is pre-release code and should not be used in production sites.**
 
---- 
- 
-**CAUTION: This app starter is EXPERIMENTAL, and likely to change before
-the framework release. We are looking for feedback and suggestions!**  
-
----
-
 More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
 
 The user guide corresponding to this version of the framework can be found
@@ -28,6 +21,10 @@ The user guide corresponding to this version of the framework can be found
 `composer create-project codeigniter4/appstarter` then `composer update` whenever
 there is a new release of the framework.
 
+When updating, check the release notes to see if there are any changes you might need to apply
+to your `app` folder. The affected files can be copied or merged from
+`vendor/codeigniter4/framework/app`.
+
 ## Setup
 
 Copy `env` to `.env` and tailor for your app, specifically the baseURL
@@ -45,6 +42,15 @@ framework are exposed.
 **Please** read the user guide for a better explanation of how CI4 works!
 The user guide updating and deployment is a bit awkward at the moment, but we are working on it!
 
+## Repository Management
+
+We use Github issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
+FEATURE REQUESTS.
+
+This repository is a "distribution" one, built by our release preparation script. 
+Problems with it can be raised on our forum, or as issues in the main repository.
+
 ## Server Requirements
 
 PHP version 7.2 or higher is required, with the following extensions installed: 

admin/starter/composer.json

@@ -14,7 +14,7 @@
     },
     "scripts": {
         "post-update-cmd": [
-            "composer dump-autoload"
+            "@composer dump-autoload"
         ]
     },
     "support": {

admin/starter/phpunit.xml.dist

@@ -12,17 +12,11 @@
     <testsuites>
         <testsuite name="app">
             <directory>./tests</directory>
-            <exclude>./tests/system</exclude>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./system</directory>
-            <exclude>
-                <directory>./system</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+    <php>
+        <env name="app.baseURL" value="http://example.com"/>
+    </php>
 
 </phpunit>