diff --git a/.env.example b/.env.example index 7643033..4bf4b95 100644 --- a/.env.example +++ b/.env.example @@ -21,16 +21,9 @@ CI_ENVIRONMENT = development #-------------------------------------------------------------------- app.baseURL = 'http://localhost:8080' +# If you have trouble with `.`, you could also use `_`. +# app_baseURL = '' # app.forceGlobalSecureRequests = false - -# app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler' -# app.sessionCookieName = 'ci_session' -# app.sessionExpiration = 7200 -# app.sessionSavePath = NULL -# app.sessionMatchIP = false -# app.sessionTimeToUpdate = 300 -# app.sessionRegenerateDestroy = false - # app.CSPEnabled = false #-------------------------------------------------------------------- @@ -41,11 +34,12 @@ database.default.database = ../writable/database.db database.default.DBDriver = SQLite3 # database.tests.hostname = localhost -# database.tests.database = ci4 +# database.tests.database = ci4_test # database.tests.username = root # database.tests.password = root # database.tests.DBDriver = MySQLi # database.tests.DBPrefix = +# database.tests.port = 3306 #-------------------------------------------------------------------- # CONTENT SECURITY POLICY @@ -56,7 +50,7 @@ database.default.DBDriver = SQLite3 # contentsecuritypolicy.scriptSrc = 'self' # contentsecuritypolicy.styleSrc = 'self' # contentsecuritypolicy.imageSrc = 'self' -# contentsecuritypolicy.base_uri = null +# contentsecuritypolicy.baseURI = null # contentsecuritypolicy.childSrc = null # contentsecuritypolicy.connectSrc = 'self' # contentsecuritypolicy.fontSrc = null @@ -69,6 +63,9 @@ database.default.DBDriver = SQLite3 # contentsecuritypolicy.reportURI = null # contentsecuritypolicy.sandbox = false # contentsecuritypolicy.upgradeInsecureRequests = false +# contentsecuritypolicy.styleNonceTag = '{csp-style-nonce}' +# contentsecuritypolicy.scriptNonceTag = '{csp-script-nonce}' +# contentsecuritypolicy.autoNonce = true #-------------------------------------------------------------------- # COOKIE @@ -106,16 +103,36 @@ database.default.DBDriver = SQLite3 # SECURITY #-------------------------------------------------------------------- +# security.csrfProtection = 'cookie' +# security.tokenRandomize = false # security.tokenName = 'csrf_token_name' # security.headerName = 'X-CSRF-TOKEN' # security.cookieName = 'csrf_cookie_name' # security.expires = 7200 # security.regenerate = true -# security.redirect = true +# security.redirect = false # security.samesite = 'Lax' +#-------------------------------------------------------------------- +# SESSION +#-------------------------------------------------------------------- + +# session.driver = 'CodeIgniter\Session\Handlers\FileHandler' +# session.cookieName = 'ci_session' +# session.expiration = 7200 +# session.savePath = null +# session.matchIP = false +# session.timeToUpdate = 300 +# session.regenerateDestroy = false + #-------------------------------------------------------------------- # LOGGER #-------------------------------------------------------------------- # logger.threshold = 4 + +#-------------------------------------------------------------------- +# CURLRequest +#-------------------------------------------------------------------- + +# curlrequest.shareOptions = true diff --git a/README.md b/README.md index 86936d4..8283f5e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To setup a working playground on your own local device, read through the next se In order to get the playground setup on your own computer, you'll need a few minimum requirements - all of which are listed on [CodeIgniter's repo](https://github.com/codeigniter4/CodeIgniter4#server-requirements). Basically, -as long as you are running PHP 7.2 or later you'll meet most of them. +as long as you are running PHP 7.4 or later you'll meet most of them. While CodeIgniter does not require it, using this repo also requires the use of [Composer](https://getcomposer.org/) to install CodeIgniter as a dependency, and PHPUnit - the test framework. @@ -40,14 +40,16 @@ With those out of the way, it only takes a few small steps to get the project up 1 - Clone the repo if you haven't already, from the CLI: - git clone https://github.com/codeigniter4projects/playground +```console +git clone https://github.com/codeigniter4projects/playground +``` That creates a new directory, `playground`, under your current directory. 2 - Enter the new directory and install the project dependencies with Composer. NOTE: The command shown here assumes that you have Composer loaded globally. If you don't, then pretend we're using `composer.phar`. -``` +```console cd playground composer install ``` @@ -66,7 +68,7 @@ composer install 4 - Back on the command line, we install all of the needed database tables and sample data. -``` +```console php spark migrate php spark db:seed PlaygroundSeeder ``` @@ -74,11 +76,15 @@ php spark db:seed PlaygroundSeeder 5 - That's it! If you're hosting through Apache, Nginx, etc, then head to your site. If you just want a quick way to work with your site locally, go back to the CLI and start up `spark`, CodeIgniter's small server. - php spark serve +```console +php spark serve +``` If you get would like to change the port it's running on, that's no problem: - php spark serve --port 8081 +```console +php spark serve --port 8081 +``` Enjoy! diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php index 05a8612..aa8099a 100644 --- a/app/Config/Boot/development.php +++ b/app/Config/Boot/development.php @@ -7,6 +7,8 @@ | In development, we want to show as many errors as possible to help | make sure they don't make it to production. And save us hours of | painful debugging. + | + | If you set 'display_errors' to '1', CI4's detailed error report will show. */ error_reporting(-1); ini_set('display_errors', '1'); diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php index 21d2580..73c7c60 100644 --- a/app/Config/Boot/production.php +++ b/app/Config/Boot/production.php @@ -6,6 +6,8 @@ |-------------------------------------------------------------------------- | Don't show ANY in production environments. Instead, let the system catch | it and display a generic error message. + | + | If you set 'display_errors' to '1', CI4's detailed error report will show. */ ini_set('display_errors', '0'); error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php index e07a1d4..e84670e 100644 --- a/app/Config/Boot/testing.php +++ b/app/Config/Boot/testing.php @@ -1,5 +1,11 @@ - * @phpstan-var array + * @var array|string> [filter_name => classname] + * or [filter_name => [classname1, classname2, ...]] + * @phpstan-var array> */ public array $aliases = [ 'csrf' => CSRF::class, diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php index c301013..e506f08 100644 --- a/app/Views/errors/html/error_404.php +++ b/app/Views/errors/html/error_404.php @@ -77,7 +77,7 @@ - +

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php index aad8126..a754a59 100644 --- a/app/Views/errors/html/error_exception.php +++ b/app/Views/errors/html/error_exception.php @@ -44,6 +44,7 @@ +
    @@ -66,7 +67,7 @@

  • - +

+
@@ -382,7 +384,8 @@

Displayed at — PHP: — - CodeIgniter: + CodeIgniter: -- + Environment:

diff --git a/composer.lock b/composer.lock index 435fb77..901f526 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "codeigniter4/framework", - "version": "v4.4.2", + "version": "v4.4.3", "source": { "type": "git", "url": "https://github.com/codeigniter4/framework.git", - "reference": "c84d3223de9320d58a770601aa427e2c1ae845d9" + "reference": "a0339851ed3fa122a4a0e7930c62a1463e0cb257" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/codeigniter4/framework/zipball/c84d3223de9320d58a770601aa427e2c1ae845d9", - "reference": "c84d3223de9320d58a770601aa427e2c1ae845d9", + "url": "https://api.github.com/repos/codeigniter4/framework/zipball/a0339851ed3fa122a4a0e7930c62a1463e0cb257", + "reference": "a0339851ed3fa122a4a0e7930c62a1463e0cb257", "shasum": "" }, "require": { @@ -78,7 +78,7 @@ "slack": "https://codeigniterchat.slack.com", "source": "https://github.com/codeigniter4/CodeIgniter4" }, - "time": "2023-10-19T21:36:24+00:00" + "time": "2023-10-26T22:45:01+00:00" }, { "name": "laminas/laminas-escaper", @@ -1082,16 +1082,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.35.1", + "version": "v3.36.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "ec1ccc264994b6764882669973ca435cf05bab08" + "reference": "e5148ae59b3759ad170ad87bd56bdc687d001031" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ec1ccc264994b6764882669973ca435cf05bab08", - "reference": "ec1ccc264994b6764882669973ca435cf05bab08", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e5148ae59b3759ad170ad87bd56bdc687d001031", + "reference": "e5148ae59b3759ad170ad87bd56bdc687d001031", "shasum": "" }, "require": { @@ -1163,7 +1163,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.35.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.36.0" }, "funding": [ { @@ -1171,7 +1171,7 @@ "type": "github" } ], - "time": "2023-10-12T13:47:26+00:00" + "time": "2023-10-27T10:06:50+00:00" }, { "name": "mikey179/vfsstream", @@ -2573,16 +2573,16 @@ }, { "name": "rector/rector", - "version": "0.18.5", + "version": "0.18.6", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "2a3b82f317e431fc142d21f3303891a4e64c96eb" + "reference": "02041b220704b9cbe075f0310d0954b2fda5c40c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/2a3b82f317e431fc142d21f3303891a4e64c96eb", - "reference": "2a3b82f317e431fc142d21f3303891a4e64c96eb", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/02041b220704b9cbe075f0310d0954b2fda5c40c", + "reference": "02041b220704b9cbe075f0310d0954b2fda5c40c", "shasum": "" }, "require": { @@ -2617,7 +2617,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.18.5" + "source": "https://github.com/rectorphp/rector/tree/0.18.6" }, "funding": [ { @@ -2625,7 +2625,7 @@ "type": "github" } ], - "time": "2023-10-05T11:25:40+00:00" + "time": "2023-10-24T15:00:59+00:00" }, { "name": "roave/security-advisories", @@ -2633,12 +2633,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "071e279195120273036c983c79580a2e92508d04" + "reference": "85369a784d2c97074c3e3432a510bfcae8eee02e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/071e279195120273036c983c79580a2e92508d04", - "reference": "071e279195120273036c983c79580a2e92508d04", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/85369a784d2c97074c3e3432a510bfcae8eee02e", + "reference": "85369a784d2c97074c3e3432a510bfcae8eee02e", "shasum": "" }, "conflict": { @@ -2682,7 +2682,7 @@ "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", "barzahlen/barzahlen-php": "<2.0.1", - "baserproject/basercms": "<4.7.5", + "baserproject/basercms": "<4.8", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", "billz/raspap-webgui": "<=2.9.2", @@ -2966,6 +2966,7 @@ "october/october": "<=3.4.4", "october/rain": "<1.0.472|>=1.1,<1.1.2", "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.0.66", + "omeka/omeka-s": "<4.0.3", "onelogin/php-saml": "<2.10.4", "oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5", "open-web-analytics/open-web-analytics": "<1.7.4", @@ -3310,7 +3311,7 @@ "type": "tidelift" } ], - "time": "2023-10-20T23:04:46+00:00" + "time": "2023-10-26T21:04:25+00:00" }, { "name": "sebastian/cli-parser",