diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index ce8e30e..18d369c 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -8,6 +8,9 @@ 'no_whitespace_in_blank_line' => true, 'return_type_declaration' => true, 'native_function_invocation' => ['include' => ['@all']], + 'phpdoc_align' => true, + 'phpdoc_separation' => true, + 'phpdoc_line_span' => ['property' => 'single', 'const' => 'single'] ]) ->setFinder(PhpCsFixer\Finder::create() ->exclude('vendor') diff --git a/CHANGELOG.md b/CHANGELOG.md index 0acc185..7793d3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] [v0.16.0](https://github.com/linna/app/compare/v0.16.0...v0.17.0) +## [Unreleased] [v0.17.0](https://github.com/linna/app/compare/v0.16.0...v0.17.0) + + +## [v0.16.1](https://github.com/linna/app/compare/v0.16.0...v0.16.1) - 2022-10-03 + +### Changed +* dependencies updated ## [v0.16.0](https://github.com/linna/app/compare/v0.15.0...v0.16.0) - 2022-09-17 diff --git a/README.md b/README.md index 9987c5e..3d19370 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,11 @@ # About Application Skeleton for Linna framework +## Actual stable environment +* app 0.16.0 +* framework 0.27.0 +* auth-mapper-* 0.2.0 + # Index 1. [Requirements](#requirements) 2. [Installation](#installation) diff --git a/composer.json b/composer.json index b037a41..d2945b7 100644 --- a/composer.json +++ b/composer.json @@ -17,12 +17,12 @@ "require": { "php": ">=8.0", "linna/dotenv": ">=1.1", - "linna/auth-mapper-mysql": "dev-master", + "linna/auth-mapper-mysql": ">=0.2", "linna/framework": ">=0.27" }, "require-dev": { "infection/infection": ">=0.26", - "phpstan/phpstan": ">=1.4", + "phpstan/phpstan": ">=1.8", "phpunit/phpunit": ">=9.0" }, "autoload": { diff --git a/public/index.php b/public/index.php index 1612142..f90b0e2 100644 --- a/public/index.php +++ b/public/index.php @@ -93,7 +93,6 @@ //try to resolve mvc components, if AuthenticationException is throwed //complete script with null objects try { - //start front controller $frontController = new ModelViewController( $container->resolve($route->model), @@ -102,7 +101,6 @@ $route ); } catch (AuthorizationException | AuthenticationException | RedirectException $redirection) { - //hope a valid route else go to unauthorized page $where = $redirection->getPath(); $where = ($where !== '' ? $where : '/error/401'); @@ -128,7 +126,6 @@ $route ); } finally { - //run $frontController->run(); //output diff --git a/src/Linna/App/Controllers/ErrorController.php b/src/Linna/App/Controllers/ErrorController.php index fe0003a..eeedb8c 100644 --- a/src/Linna/App/Controllers/ErrorController.php +++ b/src/Linna/App/Controllers/ErrorController.php @@ -28,9 +28,7 @@ )] class ErrorController extends Controller { - /** - * @var array Status codes - */ + /** @var array Status codes */ private $status = [ 401 => 'Unauthorized', 403 => 'Forbidden', diff --git a/src/Linna/App/Helper/AppDotEnv.php b/src/Linna/App/Helper/AppDotEnv.php index 2e0f7e6..9e65712 100644 --- a/src/Linna/App/Helper/AppDotEnv.php +++ b/src/Linna/App/Helper/AppDotEnv.php @@ -20,9 +20,7 @@ */ class AppDotEnv extends DotEnv { - /** - * @var array Keys to look for into .en file - */ + /** @var array Keys to look for into .en file */ private static $envKeys = [ 'session.name', 'session.expire', diff --git a/src/Linna/App/Models/ErrorModel.php b/src/Linna/App/Models/ErrorModel.php index 8fef2d6..0bb5637 100644 --- a/src/Linna/App/Models/ErrorModel.php +++ b/src/Linna/App/Models/ErrorModel.php @@ -29,8 +29,8 @@ public function __construct() /** * Raise error. * - * @param int $statusCode - * @param string $description + * @param int $statusCode + * @param string $description * * @return void */ diff --git a/src/Linna/App/Templates/HtmlTemplate.php b/src/Linna/App/Templates/HtmlTemplate.php index b6a57c0..f561dfd 100644 --- a/src/Linna/App/Templates/HtmlTemplate.php +++ b/src/Linna/App/Templates/HtmlTemplate.php @@ -19,44 +19,28 @@ */ class HtmlTemplate implements TemplateInterface { - /** - * @var string Template to load - */ + /** @var string Template to load */ protected $template = null; - /** - * @var string Template Title - */ + /** @var string Template Title */ public $title = 'App'; - /** - * @var object Data for template - */ + /** @var object Data for template */ public $data; - /** - * @var array Css file for template - */ + /** @var array Css file for template */ protected $css = []; - /** - * @var array Js file for template - */ + /** @var array Js file for template */ protected $javascript = []; - /** - * @var string Template directory - */ + /** @var string Template directory */ protected $templateDir; - /** - * @var string Css directory - */ + /** @var string Css directory */ protected $cssDir; - /** - * @var string Js directory - */ + /** @var string Js directory */ protected $jsDir; /** diff --git a/src/Linna/App/Templates/JsonTemplate.php b/src/Linna/App/Templates/JsonTemplate.php index cdd3f42..acfe3f1 100644 --- a/src/Linna/App/Templates/JsonTemplate.php +++ b/src/Linna/App/Templates/JsonTemplate.php @@ -18,9 +18,7 @@ */ class JsonTemplate implements TemplateInterface { - /** - * @var object Data for view - */ + /** @var object Data for view */ public $data; /** diff --git a/src/Linna/App/Templates/RawTemplate.php b/src/Linna/App/Templates/RawTemplate.php index 0eea99b..e30bb36 100644 --- a/src/Linna/App/Templates/RawTemplate.php +++ b/src/Linna/App/Templates/RawTemplate.php @@ -19,9 +19,7 @@ */ class RawTemplate implements TemplateInterface { - /** - * @var array Data for view - */ + /** @var array Data for view */ public $data = []; /** diff --git a/src/Linna/App/Views/ErrorView.php b/src/Linna/App/Views/ErrorView.php index db12ef7..a377d76 100644 --- a/src/Linna/App/Views/ErrorView.php +++ b/src/Linna/App/Views/ErrorView.php @@ -22,7 +22,7 @@ class ErrorView extends View /** * Constructor. * - * @param HtmlTemplate $htmlTemplate + * @param HtmlTemplate $htmlTemplate */ public function __construct(HtmlTemplate $htmlTemplate) { diff --git a/tests/Linna/App/Helper/RouteHelperTest.php b/tests/Linna/App/Helper/RouteHelperTest.php index 633344f..33720c5 100644 --- a/tests/Linna/App/Helper/RouteHelperTest.php +++ b/tests/Linna/App/Helper/RouteHelperTest.php @@ -25,14 +25,10 @@ */ class RouteHelperTest extends TestCase { - /** - * @var RouteCollection Routes for test. - */ + /** @var RouteCollection Routes for test. */ protected static RouteCollection $routes; - /** - * @var Router The router object. - */ + /** @var Router The router object. */ protected static RouteHelper $helper; /** diff --git a/tests/Linna/App/Templates/HtmlTemplateTest.php b/tests/Linna/App/Templates/HtmlTemplateTest.php index a3f021e..3b9bc51 100644 --- a/tests/Linna/App/Templates/HtmlTemplateTest.php +++ b/tests/Linna/App/Templates/HtmlTemplateTest.php @@ -21,9 +21,7 @@ */ class HtmlTemplateTest extends TestCase { - /** - * @var TemplateInterface Template. - */ + /** @var TemplateInterface Template. */ protected static $template; /** diff --git a/tests/Linna/App/Templates/JsonTemplateTest.php b/tests/Linna/App/Templates/JsonTemplateTest.php index 9cbf991..dd33714 100644 --- a/tests/Linna/App/Templates/JsonTemplateTest.php +++ b/tests/Linna/App/Templates/JsonTemplateTest.php @@ -20,9 +20,7 @@ */ class JsonTemplateTest extends TestCase { - /** - * @var TemplateInterface Template. - */ + /** @var TemplateInterface Template. */ protected static $template; /** diff --git a/tests/Linna/App/Templates/NullTemplateTest.php b/tests/Linna/App/Templates/NullTemplateTest.php index 1e11f60..f298211 100644 --- a/tests/Linna/App/Templates/NullTemplateTest.php +++ b/tests/Linna/App/Templates/NullTemplateTest.php @@ -20,9 +20,7 @@ */ class NullTemplateTest extends TestCase { - /** - * @var TemplateInterface Template. - */ + /** @var TemplateInterface Template. */ protected static $template; /** diff --git a/tests/Linna/App/Templates/RawTemplateTest.php b/tests/Linna/App/Templates/RawTemplateTest.php index 279f416..0bc06f2 100644 --- a/tests/Linna/App/Templates/RawTemplateTest.php +++ b/tests/Linna/App/Templates/RawTemplateTest.php @@ -20,9 +20,7 @@ */ class RawTemplateTest extends TestCase { - /** - * @var TemplateInterface Template. - */ + /** @var TemplateInterface Template. */ protected static $template; /** diff --git a/tests/Linna/App/TestHelper/Views/RestViewAio.php b/tests/Linna/App/TestHelper/Views/RestViewAio.php index 8c0197a..3d948ce 100644 --- a/tests/Linna/App/TestHelper/Views/RestViewAio.php +++ b/tests/Linna/App/TestHelper/Views/RestViewAio.php @@ -23,7 +23,7 @@ class RestViewAio extends View /** * Class Constructor. * - * @param RawTemplate $rawTemplate + * @param RawTemplate $rawTemplate */ public function __construct(RawTemplate $rawTemplate) {