Skip to content

Commit 958d91e

Browse files
sitchisitchi
committed
Upgrade to Phalcon v5
1 parent 6ec3d6e commit 958d91e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+16205
-273
lines changed

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ pass: Demo2020
1515

1616
### Requirements
1717

18-
* PHP >= 7.3
18+
* PHP >= 8.1
1919
* [Apache][1] Web Server with [mod_rewrite][2] enabled or [Nginx][3] Web Server
20-
* Phalcon >= 4.0.6 [Phalcon Framework release][4] extension enabled
20+
* Phalcon >= 5.3.1 [Phalcon Framework release][4] extension enabled
2121
* [MariaDB][5] >= 10.3
2222

2323
### Installation

Diff for: ‎app/config/config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* NOTE: please remove this comment.
66
*/
77

8-
use Phalcon\Config;
8+
use Phalcon\Config\Config;
99

1010
defined('BASE_PATH') || define('BASE_PATH', getenv('BASE_PATH') ?: realpath(dirname(__FILE__) . '/../..'));
1111
defined('APP_PATH') || define('APP_PATH', BASE_PATH . '/app');

Diff for: ‎app/config/loader.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
use Phalcon\Loader;
3+
use Phalcon\Autoload\Loader;
44

55
$loader = new Loader();
66

77
/**
88
* We're a registering a set of directories taken from the configuration file
99
*/
10-
$loader->registerNamespaces([
10+
$loader->setNamespaces([
1111
'PSA\Controllers' => $config->application->controllersDir,
1212
'PSA\Forms' => $config->application->formsDir,
1313
'PSA\Helpers' => $config->application->helpersDir,

Diff for: ‎app/config/privateResources.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
declare(strict_types=1);
33

4-
use Phalcon\Config;
4+
use Phalcon\Config\Config;
55

66
return new Config([
77
'privateResources' => [

Diff for: ‎app/config/services.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?php
22
declare(strict_types=1);
33

4-
use Phalcon\Escaper;
4+
use Phalcon\Html\Escaper;
55
use Phalcon\Events\Manager;
66
use Phalcon\Flash\Direct as Flash;
77
use Phalcon\Flash\Session as FlashSession;
8-
use Phalcon\Logger;
9-
use Phalcon\Logger\Adapter\Stream;
8+
use Phalcon\Logger\Logger;
109
use Phalcon\Logger\Formatter\Line;
10+
use Phalcon\Logger\Adapter\Stream;
1111
use Phalcon\Mvc\Model\Metadata\Memory as MetaDataAdapter;
1212
use Phalcon\Mvc\Dispatcher;
1313
use Phalcon\Mvc\View;
1414
use Phalcon\Mvc\View\Engine\Php as PhpEngine;
1515
use Phalcon\Mvc\View\Engine\Volt as VoltEngine;
1616
use Phalcon\Session\Adapter\Stream as SessionAdapter;
1717
use Phalcon\Session\Manager as SessionManager;
18-
use Phalcon\Url as UrlResolver;
18+
use Phalcon\Mvc\Url as UrlResolver;
1919
use Phalcon\Crypt;
2020
use PSA\Auth\Auth;
2121
use PSA\Acl\Acl;

Diff for: ‎app/controllers/ChangeHistoryController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ChangeHistoryController extends ControllerBase
1818
public function initialize()
1919
{
2020
$this->view->setTemplateBefore('private');
21-
$this->tag->setTitle(' Change History');
21+
$this->tag->title()->set(' Change History');
2222
}
2323

2424
/**

Diff for: ‎app/controllers/DashboardController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ public function initialize()
1818
*/
1919
public function indexAction()
2020
{
21-
$this->tag->setTitle('Simple Admin');
21+
$this->tag->title()->set('Simple Admin');
2222
}
2323
}

Diff for: ‎app/controllers/ErrorController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ public function initialize()
2121

2222
public function show404Action()
2323
{
24-
$this->tag->setTitle('Error 404');
24+
$this->tag->title()->set('Error 404');
2525
$this->response->setStatusCode(404, 'Not Found');
2626
}
2727

2828
public function show500Action()
2929
{
30-
$this->tag->setTitle('Error 500');
30+
$this->tag->title()->set('Error 500');
3131
$this->response->setStatusCode(500, 'Internal Server Error');
3232
}
3333
}

Diff for: ‎app/controllers/IndexController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class IndexController extends ControllerBase
2323
public function initialize()
2424
{
2525
$this->view->setTemplateBefore('public');
26-
$this->tag->setTitle('Simple Admin');
26+
$this->tag->title()->set('Simple Admin');
2727
// check auth users
2828
if ($this->auth->getIdentity()) {
2929
$this->response->redirect('dashboard');

Diff for: ‎app/controllers/RolesController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class RolesController extends ControllerBase
2323
public function initialize()
2424
{
2525
$this->view->setTemplateBefore('private');
26-
$this->tag->setTitle('Roles');
26+
$this->tag->title()->set('Roles');
2727
}
2828

2929
/**

Diff for: ‎app/controllers/UserControlController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function indexAction()
3333
'action' => 'index',
3434
]);
3535
}
36-
$this->tag->setTitle('Profile');
36+
$this->tag->title()->set('Profile');
3737
}
3838

3939
/**
@@ -213,6 +213,6 @@ public function changePasswordAction()
213213
";
214214
$this->view->form = $form;
215215

216-
$this->tag->setTitle('Change Password');
216+
$this->tag->title()->set('Change Password');
217217
}
218218
}

Diff for: ‎app/controllers/UsersController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class UsersController extends ControllerBase
1919
public function initialize()
2020
{
2121
$this->view->setTemplateBefore('private');
22-
$this->tag->setTitle('Users');
22+
$this->tag->title()->set('Users');
2323
}
2424

2525
/**

Diff for: ‎app/forms/ChangePasswordForm.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
use Phalcon\Forms\Element\Hidden;
77
use Phalcon\Forms\Element\Password;
88
use Phalcon\Forms\Form;
9-
use Phalcon\Validation\Validator\Confirmation;
10-
use Phalcon\Validation\Validator\Identical;
11-
use Phalcon\Validation\Validator\PresenceOf;
12-
use Phalcon\Validation\Validator\StringLength;
9+
use Phalcon\Filter\Validation\Validator\Confirmation;
10+
use Phalcon\Filter\Validation\Validator\Identical;
11+
use Phalcon\Filter\Validation\Validator\PresenceOf;
12+
use Phalcon\Filter\Validation\Validator\StringLength;
1313

1414
class ChangePasswordForm extends Form
1515
{

Diff for: ‎app/forms/ForgotPasswordForm.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
use Phalcon\Forms\Element\Submit;
88
use Phalcon\Forms\Element\Text;
99
use Phalcon\Forms\Form;
10-
use Phalcon\Validation\Validator\Email;
11-
use Phalcon\Validation\Validator\Identical;
12-
use Phalcon\Validation\Validator\PresenceOf;
10+
use Phalcon\Filter\Validation\Validator\Email;
11+
use Phalcon\Filter\Validation\Validator\Identical;
12+
use Phalcon\Filter\Validation\Validator\PresenceOf;
1313

1414
class ForgotPasswordForm extends Form
1515
{

Diff for: ‎app/forms/LoginForm.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
use Phalcon\Forms\Element\Submit;
1010
use Phalcon\Forms\Element\Text;
1111
use Phalcon\Forms\Form;
12-
use Phalcon\Validation\Validator\Email;
13-
use Phalcon\Validation\Validator\Identical;
14-
use Phalcon\Validation\Validator\PresenceOf;
12+
use Phalcon\Filter\Validation\Validator\Email;
13+
use Phalcon\Filter\Validation\Validator\Identical;
14+
use Phalcon\Filter\Validation\Validator\PresenceOf;
1515

1616
class LoginForm extends Form
1717
{
@@ -48,6 +48,7 @@ public function initialize()
4848
$remember = new Check('remember', [
4949
'value' => 'yes',
5050
'id' => 'remember',
51+
'class' => 'form-check-input'
5152
]);
5253
$remember->setLabel('Remember me');
5354

Diff for: ‎app/forms/RolesForm.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use Phalcon\Forms\Element\Select;
88
use Phalcon\Forms\Element\Text;
99
use Phalcon\Forms\Form;
10-
use Phalcon\Validation\Validator\Identical;
11-
use Phalcon\Validation\Validator\PresenceOf;
10+
use Phalcon\Filter\Validation\Validator\Identical;
11+
use Phalcon\Filter\Validation\Validator\PresenceOf;
1212

1313
class RolesForm extends Form
1414
{

Diff for: ‎app/forms/SignUpForm.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
use Phalcon\Forms\Element\Submit;
1010
use Phalcon\Forms\Element\Text;
1111
use Phalcon\Forms\Form;
12-
use Phalcon\Validation\Validator\Confirmation;
13-
use Phalcon\Validation\Validator\Email;
14-
use Phalcon\Validation\Validator\Identical;
15-
use Phalcon\Validation\Validator\PresenceOf;
16-
use Phalcon\Validation\Validator\StringLength;
12+
use Phalcon\Filter\Validation\Validator\Confirmation;
13+
use Phalcon\Filter\Validation\Validator\Email;
14+
use Phalcon\Filter\Validation\Validator\Identical;
15+
use Phalcon\Filter\Validation\Validator\PresenceOf;
16+
use Phalcon\Filter\Validation\Validator\StringLength;
1717

1818
class SignUpForm extends Form
1919
{
@@ -88,6 +88,7 @@ public function initialize($entity = null, array $options = [])
8888
// Remember
8989
$terms = new Check('terms', [
9090
'value' => 'yes',
91+
'class' => 'form-check-input'
9192
]);
9293

9394
$terms->setLabel('I agree to therm');

Diff for: ‎app/forms/UsersForm.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
use Phalcon\Forms\Element\Select;
99
use Phalcon\Forms\Element\Text;
1010
use Phalcon\Forms\Form;
11-
use Phalcon\Validation\Validator\Confirmation;
12-
use Phalcon\Validation\Validator\Email;
13-
use Phalcon\Validation\Validator\Identical;
14-
use Phalcon\Validation\Validator\PresenceOf;
15-
use Phalcon\Validation\Validator\StringLength;
11+
use Phalcon\Filter\Validation\Validator\Confirmation;
12+
use Phalcon\Filter\Validation\Validator\Email;
13+
use Phalcon\Filter\Validation\Validator\Identical;
14+
use Phalcon\Filter\Validation\Validator\PresenceOf;
15+
use Phalcon\Filter\Validation\Validator\StringLength;
1616
use PSA\Models\Roles;
1717

1818
class UsersForm extends Form

Diff for: ‎app/helpers/Datatables.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ class Datatables extends Injectable
1010

1111
public static function css()
1212
{
13-
$css = "<link href='/css/dataTables.bootstrap4.min.css' rel='stylesheet' type='text/css'>";
14-
$css .= "<link href='/css/responsive.bootstrap4.min.css' rel='stylesheet' type='text/css'>";
13+
$css = "<link href='/css/dataTables.bootstrap5.min.css' rel='stylesheet' type='text/css'>";
14+
$css .= "<link href='/css/responsive.bootstrap5.min.css' rel='stylesheet' type='text/css'>";
1515
return $css;
1616
}
1717

1818
public static function js()
1919
{
2020
$js = "<script src='/js/jquery.dataTables.min.js'></script>";
21-
$js .= "<script src='/js/dataTables.bootstrap4.min.js'></script>";
21+
$js .= "<script src='/js/dataTables.bootstrap5.min.js'></script>";
2222
$js .= "<script src='/js/dataTables.responsive.min.js'></script>";
23-
$js .= "<script src='/js/responsive.bootstrap4.min.js'></script>";
23+
$js .= "<script src='/js/responsive.bootstrap5.min.js'></script>";
2424
return $js;
2525
}
2626

Diff for: ‎app/library/Avatar/Gravatar.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
namespace PSA\Avatar;
2121

2222
use InvalidArgumentException;
23-
use Phalcon\Config;
23+
use Phalcon\Config\Config;
2424

2525
/**
2626
* Phalcon Gravatar.
@@ -150,7 +150,7 @@ public function __construct($config)
150150

151151
if (!is_array($config)) {
152152
throw new InvalidArgumentException(
153-
'Config must be either an array or \Phalcon\Config instance'
153+
'Config must be either an array or \Phalcon\Config\Config instance'
154154
);
155155
}
156156

Diff for: ‎app/models/Blameable.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function auditBeforeCreate(ModelInterface $model, $eventType)
5050
// Get the request service
5151
$request = $model->getDI()->getRequest();
5252

53-
$audit->valueID = reset($model);
53+
$audit->valueID = array_values(get_object_vars($model))[0];
5454

5555
// Get the user id
5656
$user = new \PSA\Auth\Auth();
@@ -121,7 +121,7 @@ public function auditBeforeUpdate(ModelInterface $model, $eventType)
121121
// Get the request service
122122
$request = $model->getDI()->getRequest();
123123

124-
$audit->valueID = reset($model);
124+
$audit->valueID = array_values(get_object_vars($model))[0];
125125

126126
// Get the user id
127127
$user = new \PSA\Auth\Auth();
@@ -182,7 +182,7 @@ public function auditBeforeDelete(ModelInterface $model, $eventType)
182182
// Get the request service
183183
$request = $model->getDI()->getRequest();
184184

185-
$audit->valueID = reset($model);
185+
$audit->valueID = array_values(get_object_vars($model))[0];
186186

187187
// Get the user id
188188
$user = new \PSA\Auth\Auth();

Diff for: ‎app/models/Users.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
use Phalcon\Mvc\Model;
77
use Phalcon\Security;
8-
use Phalcon\Validation;
9-
use Phalcon\Validation\Validator\Uniqueness;
8+
use Phalcon\Filter\Validation;
9+
use Phalcon\Filter\Validation\Validator\Uniqueness;
1010
use PSA\Models\UsersRoles;
1111

1212
/**

Diff for: ‎app/views/changeHistory/index.volt

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
<div class="modal-content">
3434
<div class="modal-header">
3535
<h5 class="modal-title">Details</h5>
36-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
37-
<span aria-hidden="true">&times;</span>
38-
</button>
36+
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
3937
</div>
4038
<div id="modal-detail"></div>
4139
</div>

Diff for: ‎app/views/index.volt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
4+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
76
<link rel="icon" href="/img/favicon.ico" type="image/x-icon"/>
8-
{{ renderTitle() }}
7+
{{ tag.title() }}
98
{{ cssBefore is not empty ? cssBefore : null }}
109
{{ stylesheet_link('/css/all.min.css') }}
1110
{{ stylesheet_link('/css/adminlte.min.css') }}
@@ -14,7 +13,7 @@
1413

1514
{{ content() }}
1615

17-
{{ javascript_include('/js/jquery-3.6.0.min.js', false) }}
16+
{{ javascript_include('/js/jquery-3.7.1.min.js', false) }}
1817
{{ javascript_include('/js/bootstrap.bundle.min.js', false) }}
1918
{{ javascript_include('/js/adminlte.min.js', false) }}
2019
{{ js is not empty ? js : null }}

Diff for: ‎app/views/index/forgotPassword.volt

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
{{ form() }}
77
<div class="input-group mb-3">
88
{{ form.render('email', ["class":"form-control", 'id': 'forgot-email-input']) }}
9-
<div class="input-group-append">
10-
<div class="input-group-text">
11-
<span class="fas fa-user"></span>
12-
</div>
9+
<div class="input-group-text">
10+
<span class="fas fa-user"></span>
1311
</div>
1412
</div>
1513
<div class="row">
1614
<div class="col-4">
17-
{{ form.render('csrf', ['value': security.getToken()]) }}
18-
19-
{{ form.render('Send') }}
15+
<div class="d-grid gap-2">
16+
{{ form.render('csrf', ['value': security.getToken()]) }}
17+
{{ form.render('Send') }}
18+
</div>
2019
</div>
2120
</div>
2221
<!-- /.col -->

0 commit comments

Comments
 (0)