Skip to content

Commit e7f5252

Browse files
markstorymarkstory
authored
Merge pull request cakephp#13 from cakephp/5x-upgrade
5x upgrade
2 parents 4e0b34d + 302cfb6 commit e7f5252

26 files changed

+1255
-821
lines changed

‎composer.json

+17-11
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@
55
"type": "project",
66
"license": "MIT",
77
"require": {
8-
"php": ">=7.2",
9-
"cakephp/cakephp": "^4.0",
10-
"cakephp/migrations": "~3.0",
11-
"cakephp/authorization": "~2.0",
12-
"cakephp/authentication": "~2.0",
13-
"cakephp/plugin-installer": "~1.0",
8+
"php": ">=8.1",
9+
"cakephp/cakephp": "^5.0",
10+
"cakephp/migrations": "~4.0",
11+
"cakephp/authorization": "~3.0",
12+
"cakephp/authentication": "~3.0",
13+
"cakephp/plugin-installer": "~2.0",
1414
"josegonzalez/dotenv": "2.*"
1515
},
1616
"require-dev": {
1717
"psy/psysh": "@stable",
18-
"cakephp/debug_kit": "^4.0",
19-
"cakephp/bake": "^2.0",
20-
"cakephp/cakephp-codesniffer": "^4.0"
18+
"cakephp/debug_kit": "^5.0",
19+
"cakephp/bake": "^3.0",
20+
"cakephp/repl": "^2.0",
21+
"cakephp/cakephp-codesniffer": "^5.0"
2122
},
2223
"suggest": {
2324
"markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
@@ -39,7 +40,6 @@
3940
"scripts": {
4041
"post-install-cmd": "App\\Console\\Installer::postInstall",
4142
"post-create-project-cmd": "App\\Console\\Installer::postInstall",
42-
"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump",
4343
"check": [
4444
"@test",
4545
"@cs-check"
@@ -50,5 +50,11 @@
5050
"test": "phpunit --colors=always"
5151
},
5252
"minimum-stability": "dev",
53-
"prefer-stable": true
53+
"prefer-stable": true,
54+
"config": {
55+
"allow-plugins": {
56+
"dealerdirect/phpcodesniffer-composer-installer": true,
57+
"cakephp/plugin-installer": true
58+
}
59+
}
5460
}

‎composer.lock

+786-663
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/app.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?php
2+
declare(strict_types=1);
23

34
use Cake\Cache\Engine\FileEngine;
45
use Cake\Database\Connection;
56
use Cake\Database\Driver\Mysql;
67
use Cake\Error\ExceptionRenderer;
78
use Cake\Log\Engine\FileLog;
89
use Cake\Mailer\Transport\MailTransport;
10+
use function Cake\Core\env;
911

1012
return [
1113
/*
@@ -17,7 +19,7 @@
1719
* Development Mode:
1820
* true: Errors and warnings shown.
1921
*/
20-
'debug' => filter_var(env('DEBUG', false), FILTER_VALIDATE_BOOLEAN),
22+
'debug' => true, //filter_var(env('DEBUG', false), FILTER_VALIDATE_BOOLEAN),
2123

2224
/*
2325
* Configure basic information about the application.

‎config/bootstrap.php

+3
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
use Cake\Routing\Router;
4545
use Cake\Utility\Security;
4646

47+
require_once CAKE . 'Core/functions_global.php';
48+
require_once CAKE . 'I18n/functions_global.php';
49+
4750
/*
4851
* See https://github.com/josegonzalez/php-dotenv for API details.
4952
*

‎src/Application.php

+1-9
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ public function bootstrap(): void
6464
}
6565
$this->addPlugin('Authentication');
6666
$this->addPlugin('Authorization');
67-
68-
// Load more plugins here
6967
}
7068

7169
/**
@@ -114,13 +112,7 @@ public function middleware($middlewareQueue): \Cake\Http\MiddlewareQueue
114112
->add(new AuthorizationMiddleware($this));
115113

116114
if (Configure::read('debug')) {
117-
// Disable authz for debugkit
118-
$middlewareQueue->add(function ($req, $res, $next) {
119-
if ($req->getParam('plugin') === 'DebugKit') {
120-
$req->getAttribute('authorization')->skipAuthorization();
121-
}
122-
return $next($req, $res);
123-
});
115+
Configure::write('DebugKit.ignoreAuthorization', true);
124116
}
125117

126118
return $middlewareQueue;

‎src/Command/ConsoleCommand.php

-86
This file was deleted.

‎src/Controller/AppController.php

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class AppController extends Controller
4040
public function initialize(): void
4141
{
4242
parent::initialize();
43-
$this->loadComponent('RequestHandler');
4443
$this->loadComponent('Flash');
4544
$this->loadComponent('Authentication.Authentication');
4645
$this->loadComponent('Authorization.Authorization');

‎src/Controller/ArticlesController.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,12 @@ public function delete($slug)
8585
}
8686
}
8787

88-
public function tags()
88+
public function tags(array $tags = [])
8989
{
9090
$this->Authorization->skipAuthorization();
9191

92-
// The 'pass' key is provided by CakePHP and contains all
93-
// the passed URL path segments in the request.
94-
$tags = $this->request->getParam('pass');
95-
9692
// Use the ArticlesTable to find tagged articles.
97-
$articles = $this->Articles->find('tagged', [
98-
'tags' => $tags
99-
]);
93+
$articles = $this->Articles->find('tagged', tags: $tags);
10094

10195
// Pass variables into the view template context.
10296
$this->set([

‎src/Controller/ErrorController.php

-10
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,6 @@
2323
*/
2424
class ErrorController extends AppController
2525
{
26-
/**
27-
* Initialization hook method.
28-
*
29-
* @return void
30-
*/
31-
public function initialize(): void
32-
{
33-
$this->loadComponent('RequestHandler');
34-
}
35-
3626
/**
3727
* beforeFilter callback.
3828
*

‎src/Controller/PagesController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
namespace App\Controller;
1616

1717
use Cake\Core\Configure;
18-
use Cake\Network\Exception\ForbiddenException;
19-
use Cake\Network\Exception\NotFoundException;
18+
use Cake\Http\Exception\ForbiddenException;
19+
use Cake\Http\Exception\NotFoundException;
2020
use Cake\View\Exception\MissingTemplateException;
2121

2222
/**

‎src/Controller/TagsController.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ public function index()
3232
*/
3333
public function view($id = null)
3434
{
35-
$tag = $this->Tags->get($id, [
36-
'contain' => ['Articles'],
37-
]);
35+
$tag = $this->Tags->get($id, contain: ['Articles']);
3836

3937
$this->set(compact('tag'));
4038
}
@@ -69,9 +67,7 @@ public function add()
6967
*/
7068
public function edit($id = null)
7169
{
72-
$tag = $this->Tags->get($id, [
73-
'contain' => ['Articles'],
74-
]);
70+
$tag = $this->Tags->get($id, contain: ['Articles']);
7571
if ($this->request->is(['patch', 'post', 'put'])) {
7672
$tag = $this->Tags->patchEntity($tag, $this->request->getData());
7773
if ($this->Tags->save($tag)) {

‎src/Controller/UsersController.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ public function logout()
7575
*/
7676
public function view($id = null)
7777
{
78-
$user = $this->Users->get($id, [
79-
'contain' => ['Articles']
80-
]);
78+
$user = $this->Users->get($id, contain: ['Articles']);
8179

8280
$this->set('user', $user);
8381
$this->set('_serialize', ['user']);
@@ -115,9 +113,7 @@ public function add()
115113
*/
116114
public function edit($id = null)
117115
{
118-
$user = $this->Users->get($id, [
119-
'contain' => []
120-
]);
116+
$user = $this->Users->get($id, contain: []);
121117
if ($this->request->is(['patch', 'post', 'put'])) {
122118
$user = $this->Users->patchEntity($user, $this->request->getData());
123119
if ($this->Users->save($user)) {

‎src/Model/Entity/Article.php

+29-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
namespace App\Model\Entity;
55

6+
use Cake\Collection\Collection;
67
use Cake\ORM\Entity;
8+
use Cake\Utility\Text;
79

810
/**
911
* Article Entity
@@ -14,8 +16,8 @@
1416
* @property string $slug
1517
* @property string|null $body
1618
* @property bool|null $published
17-
* @property \Cake\I18n\FrozenTime|null $created
18-
* @property \Cake\I18n\FrozenTime|null $modified
19+
* @property \Cake\I18n\DateTime|null $created
20+
* @property \Cake\I18n\DateTime|null $modified
1921
*
2022
* @property \App\Model\Entity\User $user
2123
* @property \App\Model\Entity\Tag[] $tags
@@ -31,7 +33,7 @@ class Article extends Entity
3133
*
3234
* @var array
3335
*/
34-
protected $_accessible = [
36+
protected array $_accessible = [
3537
'user_id' => true,
3638
'title' => true,
3739
'slug' => true,
@@ -41,5 +43,29 @@ class Article extends Entity
4143
'modified' => true,
4244
'user' => true,
4345
'tags' => true,
46+
'tag_string' => true,
4447
];
48+
49+
protected function _setTitle(string $title): string
50+
{
51+
$this->slug = Text::slug($title);
52+
53+
return $title;
54+
}
55+
56+
protected function _getTagString(): string
57+
{
58+
if (isset($this->_fields['tag_string'])) {
59+
return $this->_fields['tag_string'];
60+
}
61+
if (empty($this->tags)) {
62+
return '';
63+
}
64+
$tags = new Collection($this->tags);
65+
$str = $tags->reduce(function ($string, $tag) {
66+
return $string . $tag->title . ', ';
67+
}, '');
68+
69+
return trim($str, ', ');
70+
}
4571
}

‎src/Model/Entity/ArticlesTag.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ArticlesTag extends Entity
2525
*
2626
* @var array
2727
*/
28-
protected $_accessible = [
28+
protected array $_accessible = [
2929
'article' => true,
3030
'tag' => true,
3131
];

‎src/Model/Entity/Tag.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
*
1111
* @property int $id
1212
* @property string|null $title
13-
* @property \Cake\I18n\FrozenTime|null $created
14-
* @property \Cake\I18n\FrozenTime|null $modified
13+
* @property \Cake\I18n\DateTime|null $created
14+
* @property \Cake\I18n\DateTime|null $modified
1515
*
1616
* @property \App\Model\Entity\Article[] $articles
1717
*/
@@ -26,7 +26,7 @@ class Tag extends Entity
2626
*
2727
* @var array
2828
*/
29-
protected $_accessible = [
29+
protected array $_accessible = [
3030
'title' => true,
3131
'created' => true,
3232
'modified' => true,

0 commit comments

Comments
 (0)