Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 5.x => 5.next #1027

Merged
merged 16 commits into from
Dec 14, 2024
Merged

merge 5.x => 5.next #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
61995e1
Update version number in requirements
markstory Sep 14, 2024
083e19b
Fix phpunit deprecation warning
ADmad Sep 17, 2024
0526a86
Merge pull request #1017 from cakephp/phpunit-deprecation
markstory Sep 17, 2024
ad122fa
Update home.php
infoliv Sep 18, 2024
926fccc
Merge pull request #1018 from infoliv/5.x
ADmad Sep 18, 2024
087aeb2
Avoid unintentional jump to new core minor.
ADmad Sep 18, 2024
0af0d61
Merge pull request #1019 from cakephp/ADmad-patch-1
markstory Sep 18, 2024
cb1ff18
Use new methods.
dereuromark Oct 15, 2024
986520f
Merge pull request #1021 from cakephp/5.x-cleanup
ADmad Oct 16, 2024
3da29b8
remove _cake_routes_ config
LordSimal Nov 1, 2024
fa83fcf
Merge pull request #1024 from cakephp/5.x-cleanup
ADmad Nov 1, 2024
59a4c9c
Typehint the array (#1025)
dereuromark Nov 4, 2024
4017ddf
PHPStan level 8
dereuromark Nov 4, 2024
62725ef
Fix badge.
dereuromark Nov 4, 2024
2bd5314
Update home.php
luizcmarin Nov 6, 2024
6b774dc
Merge pull request #1026 from luizcmarin/patch-1
LordSimal Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# CakePHP Application Skeleton

![Build Status](https://github.com/cakephp/app/actions/workflows/ci.yml/badge.svg?branch=master)
![Build Status](https://github.com/cakephp/app/actions/workflows/ci.yml/badge.svg?branch=5.x)
[![Total Downloads](https://img.shields.io/packagist/dt/cakephp/app.svg?style=flat-square)](https://packagist.org/packages/cakephp/app)
[![PHPStan](https://img.shields.io/badge/PHPStan-level%207-brightgreen.svg?style=flat-square)](https://github.com/phpstan/phpstan)
[![PHPStan](https://img.shields.io/badge/PHPStan-level%208-brightgreen.svg?style=flat-square)](https://github.com/phpstan/phpstan)

A skeleton for creating applications with [CakePHP](https://cakephp.org) 5.x.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage": "https://cakephp.org",
"require": {
"php": ">=8.1",
"cakephp/cakephp": "dev-5.next as 5.1.0",
"cakephp/cakephp": "5.1.*",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be set back to 5.next post merge

"cakephp/migrations": "^4.0.0",
"cakephp/plugin-installer": "^2.0",
"mobiledetect/mobiledetectlib": "^4.8.03"
Expand Down
2 changes: 0 additions & 2 deletions config/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@
if (Configure::read('debug')) {
Configure::write('Cache._cake_model_.duration', '+2 minutes');
Configure::write('Cache._cake_translations_.duration', '+2 minutes');
// disable router cache during development
Configure::write('Cache._cake_routes_.duration', '+2 seconds');
}

/*
Expand Down
2 changes: 2 additions & 0 deletions src/Console/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class Installer
{
/**
* An array of directories to be made writable
*
* @var list<string>
*/
public const WRITABLE_DIRS = [
'logs',
Expand Down
6 changes: 2 additions & 4 deletions templates/Pages/home.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,8 @@

<?php if (extension_loaded('openssl')) : ?>
<li class="bullet success">Your version of PHP has the openssl extension loaded.</li>
<?php elseif (extension_loaded('mcrypt')) : ?>
<li class="bullet success">Your version of PHP has the mcrypt extension loaded.</li>
<?php else : ?>
<li class="bullet problem">Your version of PHP does NOT have the openssl or mcrypt extension loaded.</li>
<li class="bullet problem">Your version of PHP does NOT have the openssl extension loaded.</li>
<?php endif; ?>

<?php if (extension_loaded('intl')) : ?>
Expand Down Expand Up @@ -155,7 +153,7 @@
<li class="bullet problem">Your logs directory is NOT writable.</li>
<?php endif; ?>

<?php $settings = Cache::getConfig('_cake_core_'); ?>
<?php $settings = Cache::getConfig('_cake_translations_'); ?>
<?php if (!empty($settings)) : ?>
<li class="bullet success">The <em><?= h($settings['className']) ?></em> is being used for core caching. To change the config edit config/app.php</li>
<?php else : ?>
Expand Down
2 changes: 0 additions & 2 deletions tests/TestCase/Controller/PagesControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

/**
* PagesControllerTest class
*
* @uses \App\Controller\PagesController
*/
class PagesControllerTest extends TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion webroot/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

$url = parse_url(urldecode($_SERVER['REQUEST_URI']));
$file = __DIR__ . $url['path'];
if (strpos($url['path'], '..') === false && strpos($url['path'], '.') !== false && is_file($file)) {
if (!str_contains($url['path'], '..') && str_contains($url['path'], '.') && is_file($file)) {
return false;
}
}
Expand Down
Loading