From 59383a85a988f2abaf312a985160646698124a60 Mon Sep 17 00:00:00 2001 From: MGatner Date: Fri, 5 Aug 2022 14:57:24 +0000 Subject: [PATCH] Release v4.2.2 --- .github/workflows/close-pull-request.yml | 18 ++++ app/Config/App.php | 2 +- app/Config/Constants.php | 18 ++-- app/Config/Logger.php | 2 +- app/Config/Paths.php | 4 +- app/Views/errors/html/error_404.php | 2 +- app/Views/welcome_message.php | 7 +- env | 2 + phpunit.xml.dist | 108 +++++++++++------------ preload.php | 2 +- public/index.php | 12 +++ spark | 12 +++ tests/README.md | 77 +++++++++------- 13 files changed, 160 insertions(+), 106 deletions(-) create mode 100644 .github/workflows/close-pull-request.yml diff --git a/.github/workflows/close-pull-request.yml b/.github/workflows/close-pull-request.yml new file mode 100644 index 00000000..4e01f30f --- /dev/null +++ b/.github/workflows/close-pull-request.yml @@ -0,0 +1,18 @@ +name: Close Pull Request + +on: + pull_request_target: + types: [opened] + +jobs: + main: + runs-on: ubuntu-latest + steps: + - name: Close PR with nice message + uses: superbrothers/close-pull-request@v3 + with: + comment: > + Thank you for your pull request. However, you have submitted your PR on a read-only + split of `codeigniter4/CodeIgniter4`. This repository, unfortunately, does + not accept PRs. Please submit your PR at https://github.com/codeigniter4/CodeIgniter4 + repository.

Thank you. diff --git a/app/Config/App.php b/app/Config/App.php index c6c71682..1a5e562d 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -44,7 +44,7 @@ class App extends BaseConfig * URI PROTOCOL * -------------------------------------------------------------------------- * - * This item determines which getServer global should be used to retrieve the + * This item determines which server global should be used to retrieve the * URI string. The default setting of 'REQUEST_URI' works for most servers. * If your links do not seem to work, try one of the other delicious flavors: * diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 0c1b5348..47b92f83 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -67,16 +67,16 @@ | http://tldp.org/LDP/abs/html/exitcodes.html | */ -defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0); // no errors -defined('EXIT_ERROR') || define('EXIT_ERROR', 1); // generic error -defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3); // configuration error -defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4); // file not found -defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5); // unknown class +defined('EXIT_SUCCESS') || define('EXIT_SUCCESS', 0); // no errors +defined('EXIT_ERROR') || define('EXIT_ERROR', 1); // generic error +defined('EXIT_CONFIG') || define('EXIT_CONFIG', 3); // configuration error +defined('EXIT_UNKNOWN_FILE') || define('EXIT_UNKNOWN_FILE', 4); // file not found +defined('EXIT_UNKNOWN_CLASS') || define('EXIT_UNKNOWN_CLASS', 5); // unknown class defined('EXIT_UNKNOWN_METHOD') || define('EXIT_UNKNOWN_METHOD', 6); // unknown class member -defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user input -defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error -defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code -defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code +defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user input +defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error +defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code +defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code /** * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead. diff --git a/app/Config/Logger.php b/app/Config/Logger.php index 406d9aac..fe389d8a 100644 --- a/app/Config/Logger.php +++ b/app/Config/Logger.php @@ -60,7 +60,7 @@ class Logger extends BaseConfig * The logging system supports multiple actions to be taken when something * is logged. This is done by allowing for multiple Handlers, special classes * designed to write the log to their chosen destinations, whether that is - * a file on the getServer, a cloud-based service, or even taking actions such + * a file on the server, a cloud-based service, or even taking actions such * as emailing the dev team. * * Each handler is defined by the class name used for that handler, and it diff --git a/app/Config/Paths.php b/app/Config/Paths.php index d97bbb35..3ff97302 100644 --- a/app/Config/Paths.php +++ b/app/Config/Paths.php @@ -34,8 +34,8 @@ class Paths * * If you want this front controller to use a different "app" * folder than the default one you can set its name here. The folder - * can also be renamed or relocated anywhere on your getServer. If - * you do, use a full getServer path. + * can also be renamed or relocated anywhere on your server. If + * you do, use a full server path. * * @see http://codeigniter.com/user_guide/general/managing_apps.html * diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php index f81717fd..5ba9f8ad 100644 --- a/app/Views/errors/html/error_404.php +++ b/app/Views/errors/html/error_404.php @@ -73,7 +73,7 @@

404 - File Not Found

- + Sorry! Cannot seem to find the page you were looking for. diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index c66a9615..c5325b57 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -200,9 +200,10 @@