pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Style fixes.

Browse source
This commit is contained in:
Henrik Hautakoski 2023-04-30 16:52:38 +02:00
parent a7a59b690a
commit 8b44550f06
42 changed files with 186 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/ApiController.php
View file

@ -59,7 +59,7 @@ class ApiController extends ControllerBase
*/
public function activationLinkAction($id)
{
$link = UserActivation::findFirst(['activation_key = ?0', 'bind' => [ $id ]]);
$link = UserActivation::findFirst(['activation_key = ?0', 'bind' => [$id]]);
if ($link) {
if ($link->isValid()) {

15
app/controllers/AuthController.php
View file

@ -33,8 +33,8 @@ class AuthController extends ControllerBase
} else {
$msg = '<ul>';
foreach($form->getMessages() as $message) {
$msg .= '<li><strong>' . $message->getField() . '</strong> '. $message->getMessage() . '</li>';
foreach ($form->getMessages() as $message) {
$msg .= '<li><strong>' . $message->getField() . '</strong> ' . $message->getMessage() . '</li>';
}
$msg .= '</ul>';
@ -47,7 +47,7 @@ class AuthController extends ControllerBase
public function oauthAction($provider_name)
{
$client = $this->getDI()->get('oauth', [ $provider_name ]);
$client = $this->getDI()->get('oauth', [$provider_name]);
$code = $this->request->get('code');
$state = $this->request->get('state');
@ -92,7 +92,7 @@ class AuthController extends ControllerBase
// User is logged in.
$this->response->redirect('/');
}
} catch(\Exception $e) {
} catch (\Exception $e) {
throw $e;
$this->flash->message('error', 'Failed to authenticate.');
if ($this->auth->getUser()) {
@ -118,8 +118,11 @@ class AuthController extends ControllerBase
}
$user = new User();
$user->assign($data->toArray(), null,
[ 'email', 'username', 'firstname', 'lastname' ]);
$user->assign(
$data->toArray(),
null,
['email', 'username', 'firstname', 'lastname']
);
$form = new RegistrationForm($user);

12
app/controllers/CallbackController.php
View file

@ -55,24 +55,23 @@ class CallbackController extends ControllerBase
return $this->response->redirect(array(
'for' => 'cb-created',
'id' => $callback->getPublicId()));
'id' => $callback->getPublicId()
));
} else {
foreach($callback->getMessages() as $msg) {
foreach ($callback->getMessages() as $msg) {
$this->flash->error($msg);
}
}
} else {
$msg = '<ul>';
foreach($form->getMessages() as $message) {
$msg .= '<li><strong>' . $message->getField() . '</strong>: '. $message->getMessage() . '</li>';
foreach ($form->getMessages() as $message) {
$msg .= '<li><strong>' . $message->getField() . '</strong>: ' . $message->getMessage() . '</li>';
}
$msg .= '</ul>';
$this->flash->message('error', $msg);
}
}
$this->view->form = $form;
@ -85,7 +84,6 @@ class CallbackController extends ControllerBase
{
$row = CallbackModel::get($id);
if (!$row) {
}
$this->view->id = $id;
}

1
app/controllers/IndexController.php
View file

@ -15,4 +15,3 @@ class IndexController extends ControllerBase
{
}
}

9
app/controllers/UserController.php
View file

@ -44,8 +44,11 @@ class UserController extends ControllerBase
]);
// Send the email.
$this->di->getMail()->send('Httpcb password activation',
$user->getEmail(), $content);
$this->di->getMail()->send(
'Httpcb password activation',
$user->getEmail(),
$content
);
$msg = "For security reasons. Before a password can be created "
. "a email has been sent to <strong>{$user->getEmail()}</strong> with "
@ -137,7 +140,7 @@ class UserController extends ControllerBase
$msg = '<p>You are about to unlink the last OAuth provider.'
. ' Your <strong>only</strong> login option will be <strong>password</strong> if you do this.</p>'
. '<p>Are you sure? <a class="alert-link" href="' . $url .'">Yes</a></p>';
. '<p>Are you sure? <a class="alert-link" href="' . $url . '">Yes</a></p>';
$this->flash->message('warning', $msg);
$this->response->redirect('/settings');

2
app/forms/CallbackCreate.php
View file

@ -7,12 +7,14 @@ use Phalcon\Forms\Form;
/**
* Element types
*/
use Phalcon\Forms\Element\Text;
use Phalcon\Forms\Element\Submit;
/**
* Validators
*/
use Phalcon\Validation\Validator\StringLength;
class CallbackCreate extends Form

2
app/forms/Login.php
View file

@ -7,6 +7,7 @@ use Phalcon\Forms\Form;
/**
* Element types
*/
use Phalcon\Forms\Element\Text;
use Phalcon\Forms\Element\Password;
use Phalcon\Forms\Element\Submit;
@ -14,6 +15,7 @@ use Phalcon\Forms\Element\Submit;
/**
* Validators
*/
use Phalcon\Validation\Validator\PresenceOf;
use Phalcon\Validation\Validator\Email as EmailValidator;
use Phalcon\Validation\Validator\StringLength;

14
app/forms/Registration.php
View file

@ -5,16 +5,19 @@ namespace App\Form;
/**
* Models
*/
use App\Model\Data\User;
/**
* Phalcon Form
*/
use Httpcb\Form as FormBase;
/**
* Element types
*/
use Phalcon\Forms\Element\Text,
Phalcon\Forms\Element\Password,
Phalcon\Forms\Element\Submit;
@ -22,6 +25,7 @@ use Phalcon\Forms\Element\Text,
/**
* Validators
*/
use Phalcon\Validation,
Phalcon\Validation\Validator\Callback as CallbackValidator,
Phalcon\Validation\Validator\Alnum as AlnumValidator,
@ -54,7 +58,9 @@ class Registration extends FormBase
'messageMinimum' => 'Username must be at least :min characters long.',
]),
new CallbackValidator([
'callback' => function($data) { return User::findFirstByUsername($data['username']) === false; },
'callback' => function ($data) {
return User::findFirstByUsername($data['username']) === false;
},
'message' => 'The username already exists.',
'attribute' => 'username',
])
@ -63,7 +69,7 @@ class Registration extends FormBase
$this->add($username);
// Names
foreach([ 'first-name' => 'Firstname', 'last-name' => 'Lastname' ] as $id => $label) {
foreach (['first-name' => 'Firstname', 'last-name' => 'Lastname'] as $id => $label) {
$name = new Text($id, array(
'class' => 'form-control',
@ -87,7 +93,9 @@ class Registration extends FormBase
$email->addValidators([
new CallbackValidator([
'callback' => function($data) { return User::findFirstByEmail($data['email']) === false; },
'callback' => function ($data) {
return User::findFirstByEmail($data['email']) === false;
},
'message' => 'This email already exist.',
])
]);

26
app/forms/UserSettings.php
View file

@ -5,16 +5,19 @@ namespace App\Form;
/**
* Models
*/
use App\Model\Data\User as UserModel;
/**
* Form
*/
use Httpcb\Form as FormBase;
/**
* Element types
*/
use Phalcon\Forms\Element\Text,
Phalcon\Forms\Element\Password,
Phalcon\Forms\Element\Submit;
@ -22,6 +25,7 @@ use Phalcon\Forms\Element\Text,
/**
* Validators
*/
use Phalcon\Validation\Validator\Callback as CallbackValidator,
Phalcon\Validation\Validator\Uniqueness as UniquenessValidator,
Phalcon\Validation\Validator\Alnum as AlnumValidator,
@ -56,15 +60,15 @@ class UserSettings extends FormBase
// Id
if ($entity && $entity->getId()) {
$id = new Text('id', array(
'class' => 'form-control',
'readonly' => '',
'disabled' => 'disabled',
));
$id = new Text('id', array(
'class' => 'form-control',
'readonly' => '',
'disabled' => 'disabled',
));
$id->addValidator(new IdenticalValidator([
'accepted' => $entity->getId(),
'allowEmpty' => true
'allowEmpty' => true
]));
$id->setLabel('ID');
@ -86,7 +90,7 @@ class UserSettings extends FormBase
);
if ($entity && strlen($entity->getUsername())) {
$validator_options['except'] = [ $entity->getUsername() ];
$validator_options['except'] = [$entity->getUsername()];
}
$username->addValidators([
@ -116,12 +120,12 @@ class UserSettings extends FormBase
'class' => 'form-control',
'placeholder' => 'Email',
'readonly' => '',
'disabled' => 'disabled',
'disabled' => 'disabled',
));
$email->addValidator(new IdenticalValidator([
'accepted' => $entity->getEmail(),
'allowEmpty' => true
'allowEmpty' => true
]));
} else {
$email = new Text('email', array(
@ -136,7 +140,7 @@ class UserSettings extends FormBase
];
if ($entity && strlen($entity->getEmail())) {
$validator_options['except'] = [ $entity->getEmail() ];
$validator_options['except'] = [$entity->getEmail()];
}
$email->addValidators([
@ -191,7 +195,7 @@ class UserSettings extends FormBase
if ($this->_admin === false && $entity && strlen($entity->getPassword()) > 0) {
$validation->add('passwordCurrent', new CallbackValidator([
'callback' => function($data) {
'callback' => function ($data) {
$new_pw = $data['passwordNew'];
if (strlen($new_pw) > 0) {
$value = $data['passwordCurrent'];

29
app/library/Acl.php
View file

@ -3,7 +3,7 @@
namespace Httpcb;
use Phalcon\Config,
Phalcon\Acl\Enum,
Phalcon\Acl\Enum,
Phalcon\Acl\Role,
Phalcon\Acl\Adapter\Memory as Adapter;
@ -40,7 +40,7 @@ class Acl
$pos = strpos($resource, '/');
if ($pos !== false) {
// Construct the wildcard resource.
$wildcard = substr($resource, 0, $pos+1) . '*';
$wildcard = substr($resource, 0, $pos + 1) . '*';
// If we have this wildcard resource, check against that instead.
if ($this->hasResource($wildcard)) {
@ -62,7 +62,7 @@ class Acl
public function fromConfig(Config $config)
{
// Add roles.
foreach($config->roles as $name => $def) {
foreach ($config->roles as $name => $def) {
$inherits = null;
$description = null;
@ -70,7 +70,6 @@ class Acl
if ($def instanceof Config) {
$inherits = $def->get('inherits');
$description = $def->get('description');
}
$role = new Role($name, $description);
@ -78,33 +77,33 @@ class Acl
}
// Zones
foreach($config->zones as $name => $resources) {
foreach ($config->zones as $name => $resources) {
if (!($resources instanceof Config)) {
$resources = new Config([ $resources ]);
$resources = new Config([$resources]);
}
foreach($resources as $resource) {
foreach ($resources as $resource) {
$this->_adapter->addComponent($resource, 'All');
}
}
// Grant access for roles and resources.
foreach($config->roles as $name => $def) {
foreach ($config->roles as $name => $def) {
$zones = $def->get('allowed-zones', []);
if (is_string($zones)) {
$zones = [ $zones ];
$zones = [$zones];
}
foreach($zones as $zone) {
foreach ($zones as $zone) {
$resources = $config->zones->get($zone);
if (!($resources instanceof Config)) {
$resources = new Config([ $resources ]);
}
foreach($resources as $resource) {
$this->_adapter->allow($name, $resource, 'All');
if (!($resources instanceof Config)) {
$resources = new Config([$resources]);
}
foreach ($resources as $resource) {
$this->_adapter->allow($name, $resource, 'All');
}
}
}

7
app/library/Auth.php
View file

@ -63,8 +63,11 @@ class Auth extends Injectable
$this->setIdentity($user->getId());
$this->eventsManager->fire('auth:onLogin', $this,
"OAuth {$data->getProvider()}");
$this->eventsManager->fire(
'auth:onLogin',
$this,
"OAuth {$data->getProvider()}"
);
return new Result(Result::SUCCESS);

5
app/library/Debug.php
View file

@ -2,12 +2,13 @@
namespace Httpcb;
class Debug {
class Debug
{
public static function dump($var, $label = null, $echo = true)
{
// format the label
$label = ($label===null) ? '' : rtrim($label) . ' ';
$label = ($label === null) ? '' : rtrim($label) . ' ';
// var_dump the variable into a buffer and keep the output
ob_start();
var_dump($var);

19
app/library/Form.php
View file

@ -11,7 +11,7 @@ class Form extends FormBase
{
$options = [
'label-class' => 'col-form-label text-end',
'class' => [ 'col-sm-10' ],
'class' => ['col-sm-10'],
'message' => ''
];
@ -31,7 +31,7 @@ class Form extends FormBase
if ($len === 'full') {
$options['class'] = [];
} else {
$options['class'] = [ 'col-sm-' . $len ];
$options['class'] = ['col-sm-' . $len];
}
unset($opt['length']);
@ -42,10 +42,10 @@ class Form extends FormBase
protected function _render(AbstractElement $ele, $opt)
{
$classes = ['class' => 'form-control'];
if ($ele->hasMessages()) {
$classes['class'] .= ' is-invalid';
}
$classes = ['class' => 'form-control'];
if ($ele->hasMessages()) {
$classes['class'] .= ' is-invalid';
}
$xhtml = '';
@ -53,14 +53,17 @@ class Form extends FormBase
$xhtml .= sprintf(
'<label class="%s" for="%s">%s</label>',
$opt['label-class'], $ele->getName(), $ele->getLabel());
$opt['label-class'],
$ele->getName(),
$ele->getLabel()
);
}
$xhtml .= '<div class="' . implode(' ', $opt['class']) . '">'
. $ele->render($classes);
if ($ele->hasMessages()) {
$msg = $ele->getMessages()->current();
$msg = $ele->getMessages()->current();
$xhtml .= '<span class="invalid-feedback">' . $msg . '</span>';
}

17
app/library/Menu.php
View file

@ -90,7 +90,7 @@ class Menu extends Tag
{
$xhtml = '';
foreach($nodes as $node) {
foreach ($nodes as $node) {
$xhtml .= $this->_renderNode($node, $depth, $max_depth);
}
@ -126,15 +126,22 @@ class Menu extends Tag
return $xhtml;
}
$xhtml = self::tagHtml('li', $node->isActive()
$xhtml = self::tagHtml(
'li',
$node->isActive()
? array('class' => $this->_activeClass) : null,
false, false, true);
false,
false,
true
);
// Generate the link.
$xhtml .= self::linkTo($node->getHref(), $node->getCaption());
if ($node->isActive() && $node->hasChildren()
&& ($max_depth === null || $depth < $max_depth)) {
if (
$node->isActive() && $node->hasChildren()
&& ($max_depth === null || $depth < $max_depth)
) {
$xhtml .= $this->_renderMenu($node->getChildren(), $depth + 1, $max_depth);
}

10
app/library/Mvc/Model/Behavior/RandomId.php
View file

@ -44,10 +44,10 @@ class RandomId extends Behavior implements BehaviorInterface
*/
public function notify($type, \Phalcon\Mvc\ModelInterface $model)
{
switch($type) {
case 'beforeValidationOnCreate' :
$this->generateId($model);
break;
switch ($type) {
case 'beforeValidationOnCreate':
$this->generateId($model);
break;
}
}
@ -69,7 +69,7 @@ class RandomId extends Behavior implements BehaviorInterface
if ($model->$field === null) {
$random = new \Phalcon\Security\Random();
for($i = 0; $i < 3; $i++) {
for ($i = 0; $i < 3; $i++) {
$id = substr($random->base64Safe(), 0, $len);
$count = $model->count(array(

2
app/library/Navigation.php
View file

@ -11,7 +11,7 @@ class Navigation extends Navigation\Container
*/
public function __construct($config)
{
foreach($config as $node) {
foreach ($config as $node) {
$this->addChild($node);
}
}

7
app/library/Navigation/Container.php
View file

@ -38,7 +38,7 @@ class Container
$node = new Node();
foreach($child as $k => $v) {
foreach ($child as $k => $v) {
if ($k == 'children') {
continue;
@ -49,7 +49,7 @@ class Container
if (isset($child['children'])) {
foreach($child['children'] as $c_data) {
foreach ($child['children'] as $c_data) {
$node->addChild($c_data);
}
}
@ -75,10 +75,9 @@ class Container
*/
public function addChildren($children)
{
foreach($children as $child) {
foreach ($children as $child) {
$this->addChild($child);
}
return $this;
}
}

2
app/library/Navigation/Node.php
View file

@ -225,7 +225,7 @@ class Node extends Container
}
// first. Check children.
foreach($this->getChildren() as $child) {
foreach ($this->getChildren() as $child) {
if ($child->isActive() == true) {
$this->setActive(true);

2
app/library/OAuth/Adapter/League.php
View file

@ -61,7 +61,7 @@ class League implements AdapterInterface
try {
$reflection = new \ReflectionClass($this->_provider);
return $reflection->getShortName();
} catch(\ReflectionException $ex) {
} catch (\ReflectionException $ex) {
return '';
}
}

31
app/library/Services.php
View file

@ -12,7 +12,7 @@ use Phalcon\Di\FactoryDefault as DiDefault,
Phalcon\Flash\Direct as FlashDirect,
Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData,
Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData,
Phalcon\Mvc\ViewBaseInterface,
Phalcon\Mvc\ViewBaseInterface,
Phalcon\Cache\Frontend\Data as FrontendDataCache,
Phalcon\Cache\Backend\Apc as BackendApcCache,
Phalcon\Translate\Adapter\NativeArray as TranslateAdapter,
@ -44,13 +44,12 @@ class Services extends DiDefault
$reflection = new \ReflectionObject($this);
$methods = $reflection->getMethods(\ReflectionMethod::IS_PROTECTED);
foreach($methods as $method) {
foreach ($methods as $method) {
if (substr($method->getName(),0, 11) == '_initShared') {
if (substr($method->getName(), 0, 11) == '_initShared') {
$service = lcfirst(substr($method->getName(), 11));
$this->setShared($service, $method->getClosure($this));
}
else if (substr($method->getName(),0, 5) == '_init') {
} else if (substr($method->getName(), 0, 5) == '_init') {
$service = lcfirst(substr($method->getName(), 5));
$this->set($service, $method->getClosure($this));
}
@ -84,7 +83,7 @@ class Services extends DiDefault
try {
$tmp = new Config($basePath . $file);
$config->merge($tmp);
} catch(\Phalcon\Config\Exception $e) {
} catch (\Phalcon\Config\Exception $e) {
// Sometime went wrong. Log here?
}
}
@ -118,7 +117,7 @@ class Services extends DiDefault
$eventsManager = new \Phalcon\Events\Manager();
$eventsManager->attach("dispatch", function($event, $dispatcher) {
$eventsManager->attach("dispatch", function ($event, $dispatcher) {
$actionName = lcfirst(\Phalcon\Text::camelize($dispatcher->getActionName(), '-_'));
$dispatcher->setActionName($actionName);
});
@ -194,7 +193,7 @@ class Services extends DiDefault
protected function _initSession()
{
$config = $this->get('config');
$session = new \Phalcon\Session\Manager();
$session = new \Phalcon\Session\Manager();
if (isset($config->session)) {
$data = $config->session->toArray();
@ -212,7 +211,7 @@ class Services extends DiDefault
$adapter = new \Phalcon\Session\Adapter\Stream();
}
$session->setAdapter($adapter);
$session->setAdapter($adapter);
// Start session.
$session->start();
@ -228,7 +227,7 @@ class Services extends DiDefault
$view = new View();
$view->setViewsDir([ $config->application->viewsDir ]);
$view->setViewsDir([$config->application->viewsDir]);
$view->setLayoutsDir('_layouts/');
$view->setPartialsDir('_partials/');
@ -322,7 +321,7 @@ class Services extends DiDefault
$router = new Router(false);
$router->removeExtraSlashes($config->get('removeExtraSlashes', false));
foreach($config->routes as $name => $def) {
foreach ($config->routes as $name => $def) {
if (!($def instanceof \Phalcon\Config)) {
continue;
@ -366,10 +365,10 @@ class Services extends DiDefault
protected function _initSharedLogger()
{
$path = $this->get('config')->application->logDir;
return new \Phalcon\Logger('default', [
'main' => new \Phalcon\Logger\Adapter\Stream($path . 'app.txt')
]);
$path = $this->get('config')->application->logDir;
return new \Phalcon\Logger('default', [
'main' => new \Phalcon\Logger\Adapter\Stream($path . 'app.txt')
]);
}
protected function _initTemplate()
@ -379,7 +378,7 @@ class Services extends DiDefault
$view = new SimpleView();
$view->setViewsDir($config->application->templateDir);
$view->registerEngines([
'.volt' => function (ViewBaseInterface $view) use ($config) {
'.volt' => function (ViewBaseInterface $view) use ($config) {
$volt = new VoltEngine($view, $this);
$volt->setOptions(array(

4
app/library/Validation/Validator/Alpha.php
View file

@ -21,7 +21,7 @@ class Alpha extends AbstractValidator
* @param string $field
* @return bool
*/
public function validate(\Phalcon\Validation $validation, $field) : bool
public function validate(\Phalcon\Validation $validation, $field): bool
{
$allowSpace = $this->getOption('allowSpace', false);
@ -44,7 +44,7 @@ class Alpha extends AbstractValidator
$message = $validation->getDefaultMessage('Alpha');
}
$replace = [ ":field" => $label ];
$replace = [":field" => $label];
$code = $this->getOption("code");
if (is_array($code)) {

4
app/library/ViewHelper/AbstractHelper.php
View file

@ -14,7 +14,7 @@ abstract class AbstractHelper implements InjectionAwareInterface
*
* @param DiInterface $container
*/
public function setDI(DiInterface $container) : void
public function setDI(DiInterface $container): void
{
$this->_di = $container;
}
@ -24,7 +24,7 @@ abstract class AbstractHelper implements InjectionAwareInterface
*
* @return DiInterface
*/
public function getDI() : DiInterface
public function getDI(): DiInterface
{
return $this->_di;
}

2
app/library/ViewHelper/Icon.php
View file

@ -27,7 +27,7 @@ class Icon extends AbstractHelper
if (is_array($args)) {
foreach($args as $arg) {
foreach ($args as $arg) {
$classes[] .= 'fa-' . $arg;
}
}

3
app/library/ViewHelper/ServerUrl.php
View file

@ -33,7 +33,8 @@ class ServerUrl extends AbstractHelper
// remove port if it's the default port.
if (($scheme == 'http' && $port == 80)
|| ($scheme == 'https' && $port == 443)) {
|| ($scheme == 'https' && $port == 443)
) {
$port = null;
}

4
app/library/ViewHelper/Service.php
View file

@ -16,7 +16,7 @@ class Service implements InjectionAwareInterface
*
* @param DiInterface $container
*/
public function setDI(DiInterface $container) : void
public function setDI(DiInterface $container): void
{
$this->_di = $container;
}
@ -26,7 +26,7 @@ class Service implements InjectionAwareInterface
*
* @return DiInterface
*/
public function getDI() : DiInterface
public function getDI(): DiInterface
{
return $this->_di;
}

4
app/listeners/AccessListener.php
View file

@ -3,7 +3,7 @@
namespace App\Listener;
use Phalcon\Di\Injectable,
Phalcon\Events\Event,
Phalcon\Events\Event,
Phalcon\Mvc\Dispatcher,
Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
@ -22,7 +22,7 @@ class AccessListener extends Injectable
* @return bool
* @throws DispatcherException
*/
public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher) : bool
public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher): bool
{
// If we have an identity, fetch type from authed user.
if ($this->auth->hasIdentity()) {

2
app/listeners/ActivityLog.php
View file

@ -81,7 +81,7 @@ class ActivityLog extends Injectable
{
$ip = (new \Phalcon\Http\Request())->getClientAddress(true);
return (new ActivityLogger())->assign([
return (new ActivityLogger())->assign([
'user_id' => $user->getId(),
'ip' => $ip,
'message' => $message

12
app/listeners/DispatchListener.php
View file

@ -4,7 +4,7 @@ namespace App\Listener;
use Exception,
Phalcon\Events\Event,
Phalcon\Di\Injectable,
Phalcon\Di\Injectable,
Phalcon\Mvc\Dispatcher,
Phalcon\Mvc\Dispatcher\Exception as DispatcherException;
@ -38,11 +38,11 @@ class DispatchListener extends Injectable
// was that an controller or action was not found.
if ($exception instanceof DispatcherException) {
switch ($exception->getCode()) {
case Dispatcher::EXCEPTION_HANDLER_NOT_FOUND :
case Dispatcher::EXCEPTION_ACTION_NOT_FOUND :
// in this case, forward to 404 page.
$dispatcher->forward($this->_route_notfound);
return false;
case Dispatcher::EXCEPTION_HANDLER_NOT_FOUND:
case Dispatcher::EXCEPTION_ACTION_NOT_FOUND:
// in this case, forward to 404 page.
$dispatcher->forward($this->_route_notfound);
return false;
}
}

2
app/migrations/20180321115827_create_user_table.php
View file

@ -21,7 +21,7 @@ class CreateUserTable extends AbstractMigration
$table->addColumn('status', 'enum', [
'null' => false,
'default' => 'Active',
'values' => [ 'Active', 'Deleted', 'Suspended']
'values' => ['Active', 'Deleted', 'Suspended']
]);
$table->addColumn('password', 'string', [

4
app/migrations/20180321131740_create_callback_table.php
View file

@ -11,11 +11,11 @@ class CreateCallbackTable extends AbstractMigration
$table->addColumn('public_id', 'string', [
'length' => 12,
'null' => false,
])->addIndex('public_id', [ 'name' => 'UNIQUE_public_id', 'unique' => true ]);
])->addIndex('public_id', ['name' => 'UNIQUE_public_id', 'unique' => true]);
$table->addColumn('userid', 'integer', [
'null' => true,
])->addForeignKey('userid', 'user', ['id'], [ 'constraint' => 'FK_user' ]);
])->addForeignKey('userid', 'user', ['id'], ['constraint' => 'FK_user']);
$table->addColumn('name', 'string', [
'length' => 64,

10
app/migrations/20180321133533_create_request_meta_table.php
View file

@ -10,8 +10,12 @@ class CreateRequestMetaTable extends AbstractMigration
$table = $this->table('request_meta');
$table->addColumn('callbackid', 'integer');
$table->addForeignKey('callbackid', 'callback', [ 'id' ],
[ 'constraint' => 'FK_callback' ]);
$table->addForeignKey(
'callbackid',
'callback',
['id'],
['constraint' => 'FK_callback']
);
$table->addColumn('source_ip', 'string', [
'limit' => 50,
@ -21,7 +25,7 @@ class CreateRequestMetaTable extends AbstractMigration
$table->addColumn('method', 'enum', [
'null' => false,
'default' => 'GET',
'values' => [ 'GET', 'POST' ]
'values' => ['GET', 'POST']
]);
$table->addColumn('uri', 'string', [

8
app/migrations/20180321133715_create_request_object_table.php
View file

@ -9,8 +9,12 @@ class CreateRequestObjectTable extends AbstractMigration
{
$table = $this->table('request_object');
$table->addForeignKey('id', 'request_meta', ['id'],
[ 'constraint' => 'FK_request_meta' ]);
$table->addForeignKey(
'id',
'request_meta',
['id'],
['constraint' => 'FK_request_meta']
);
$table->addColumn('headers', 'blob', [
'null' => true,

8
app/migrations/20180611202847_password_link.php
View file

@ -8,11 +8,11 @@ class PasswordLink extends AbstractMigration
public function up()
{
$this->table('password_link')
->addColumn('public_id', 'string', ['length' => 12 ])
->addColumn('public_id', 'string', ['length' => 12])
->addColumn('user_id', 'integer')
->addForeignKey('user_id', 'user', ['id'], [ 'constraint' => 'FK_password_link_user' ])
->addColumn('date', 'datetime', [ 'default' => 'CURRENT_TIMESTAMP' ])
->addColumn('password', 'string', [ 'limit' => 255, 'null' => true ])
->addForeignKey('user_id', 'user', ['id'], ['constraint' => 'FK_password_link_user'])
->addColumn('date', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
->addColumn('password', 'string', ['limit' => 255, 'null' => true])
->save();
}
}

6
app/migrations/20180814172405_user_split_name.php
View file

@ -12,7 +12,7 @@ class UserSplitName extends AbstractMigration
// Rename "name" to "firstname" and add "lastname".
$this->table('user')
->renameColumn('name', 'firstname')
->addColumn('lastname','string', [
->addColumn('lastname', 'string', [
'length' => 128,
'after' => 'firstname',
'null' => true
@ -20,7 +20,7 @@ class UserSplitName extends AbstractMigration
->save();
// Update row data, moving everything after first space to from lastname.
foreach($this->fetchAll("SELECT `id`,`firstname` FROM `user`") as $row) {
foreach ($this->fetchAll("SELECT `id`,`firstname` FROM `user`") as $row) {
$builder = $this->getQueryBuilder()->update('user')
->where(['id' => $row['id']]);
@ -31,7 +31,7 @@ class UserSplitName extends AbstractMigration
$pos = strpos($firstname, ' ');
if ($pos !== false) {
// Set everything after the first space to lastname.
$builder->set('lastname', substr($firstname, $pos+1));
$builder->set('lastname', substr($firstname, $pos + 1));
// Remove everything after first space from firstname.
$firstname = substr($firstname, 0, $pos);

2
app/migrations/20181003134001_user_type.php
View file

@ -11,7 +11,7 @@ class UserType extends AbstractMigration
->addColumn('type', 'enum', [
'null' => false,
'default' => 'user',
'values' => [ 'user', 'admin' ],
'values' => ['user', 'admin'],
'after' => 'regdate'
])
->save();

2
app/models/Data/Base.php
View file

@ -18,7 +18,7 @@ class Base extends Model
* @param boolean $allFields
* @return bool
*/
public function hasChanged($fieldName = null, bool $allFields = false) : bool
public function hasChanged($fieldName = null, bool $allFields = false): bool
{
return $this->hasSnapshotData() === false
|| parent::hasChanged($fieldName, $allFields);

4
app/models/Data/Callback.php
View file

@ -216,8 +216,8 @@ class Callback extends Model
*/
public function initialize()
{
// Set table name mapped in the model.
$this->setSource('callback');
// Set table name mapped in the model.
$this->setSource('callback');
$this->useDynamicUpdate(true);

2
app/models/Data/Request.php
View file

@ -53,7 +53,7 @@ class Request extends Model
*/
public function setHeaders($headers)
{
foreach($headers as $k => $v) {
foreach ($headers as $k => $v) {
if (strlen($v) < 1) {
unset($headers[$k]);

6
app/models/Data/RequestMeta.php
View file

@ -161,7 +161,7 @@ class RequestMeta extends Model
$query = (string) parse_url($this->getUri(), PHP_URL_QUERY);
$ret = array();
foreach(explode('&', $query) as $v) {
foreach (explode('&', $query) as $v) {
@list($k, $v) = explode('=', $v, 2);
if (strlen($k) > 0) {
$ret[$k] = $v;
@ -211,7 +211,7 @@ class RequestMeta extends Model
{
$headers = $this->getHeaders();
foreach($headers as $k => $v) {
foreach ($headers as $k => $v) {
if ($k == 'Content-Length') {
return $v;
@ -224,7 +224,7 @@ class RequestMeta extends Model
{
$headers = $this->getHeaders();
foreach($headers as $k => $v) {
foreach ($headers as $k => $v) {
if ($k == 'Content-Type') {
return substr($v, strrpos($v, '/') + 1);

12
app/models/Data/User.php
View file

@ -61,7 +61,7 @@ class User extends Base
'message' => 'The username already exists.'
]),
'email' => new CallbackValidator([
'callback' => function() {
'callback' => function () {
return $this->findFirstByEmail($this->getEmail()) === false;
},
'message' => 'The email address already exists.'
@ -69,7 +69,7 @@ class User extends Base
];
$validation = new Validation();
foreach($rules as $field => $validator) {
foreach ($rules as $field => $validator) {
// Only validate changed fields.
if ($this->hasChanged($field)) {
@ -414,7 +414,7 @@ class User extends Base
{
return self::findFirst([
"(email = :v: OR username = :v:) AND status != :s:",
"bind" => [ 'v' => $value, 's' => self::STATUS_DELETED ]
"bind" => ['v' => $value, 's' => self::STATUS_DELETED]
]);
}
@ -422,7 +422,7 @@ class User extends Base
{
return self::findFirst([
"email = :email: AND status != :s:",
"bind" => [ 'email' => $email, 's' => self::STATUS_DELETED ]
"bind" => ['email' => $email, 's' => self::STATUS_DELETED]
]);
}
@ -430,7 +430,7 @@ class User extends Base
{
return self::findFirst([
"username = :username: AND status != :s:",
"bind" => [ 'username' => $username, 's' => self::STATUS_DELETED ]
"bind" => ['username' => $username, 's' => self::STATUS_DELETED]
]);
}
@ -440,7 +440,7 @@ class User extends Base
return self::findFirst([
"{$column}_id = :id: AND status != :s:",
"bind" => [ 'id' => $oauth->getId(), 's' => self::STATUS_DELETED ]
"bind" => ['id' => $oauth->getId(), 's' => self::STATUS_DELETED]
]);
}

16
app/models/Data/UserActivation.php
View file

@ -79,7 +79,7 @@ class UserActivation extends Base
* @param int $id
* @return PasswordLink
*/
public function setId(int $id) : UserActivation
public function setId(int $id): UserActivation
{
$this->id = $id;
return $this;
@ -97,7 +97,7 @@ class UserActivation extends Base
* @param string $public_id
* @return UserActivation
*/
public function setActivationKey(string $key) : UserActivation
public function setActivationKey(string $key): UserActivation
{
$this->activation_key = $key;
return $this;
@ -115,7 +115,7 @@ class UserActivation extends Base
* @param int $user_id
* @return UserActivation
*/
public function setUserId(int $user_id) : UserActivation
public function setUserId(int $user_id): UserActivation
{
$this->user_id = $user_id;
return $this;
@ -133,7 +133,7 @@ class UserActivation extends Base
* @param string $password
* @return UserActivation
*/
public function setPassword(string $password) : UserActivation
public function setPassword(string $password): UserActivation
{
$this->password = $password;
return $this;
@ -144,7 +144,7 @@ class UserActivation extends Base
*
* @return bool
*/
public function isUsed() : bool
public function isUsed(): bool
{
return (bool) $this->used;
}
@ -154,7 +154,7 @@ class UserActivation extends Base
*
* @return bool
*/
public function isValid() : bool
public function isValid(): bool
{
// Used links are not valid.
if ($this->isUsed()) {
@ -175,9 +175,9 @@ class UserActivation extends Base
public function beforeCreate()
{
// Creating a new link automatically removes old ones.
$links = self::find(["user_id = ?0", 'bind' => [ $this->user_id ]]);
$links = self::find(["user_id = ?0", 'bind' => [$this->user_id]]);
foreach($links as $link) {
foreach ($links as $link) {
$link->delete();
}
}

3
app/modules/Base.php
View file

@ -39,9 +39,8 @@ abstract class Base implements ModuleDefinitionInterface
$dispatcher->setDefaultNamespace($this->_controllerNamespace);
$di->get('view')->setViewsDir(array_merge(
[ $this->_viewDir ],
[$this->_viewDir],
(array) $di->get('view')->getViewsDir()
));
}
}