Skip to content

Commit

Permalink
v0.16.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
s3b4stian committed Oct 3, 2022
1 parent 1cfccd9 commit dc562bc
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 64 deletions.
3 changes: 3 additions & 0 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
3 changes: 0 additions & 3 deletions public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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');
Expand All @@ -128,7 +126,6 @@
$route
);
} finally {

//run
$frontController->run();
//output
Expand Down
4 changes: 1 addition & 3 deletions src/Linna/App/Controllers/ErrorController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
)]
class ErrorController extends Controller
{
/**
* @var array Status codes
*/
/** @var array Status codes */
private $status = [
401 => 'Unauthorized',
403 => 'Forbidden',
Expand Down
4 changes: 1 addition & 3 deletions src/Linna/App/Helper/AppDotEnv.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions src/Linna/App/Models/ErrorModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public function __construct()
/**
* Raise error.
*
* @param int $statusCode
* @param string $description
* @param int $statusCode
* @param string $description
*
* @return void
*/
Expand Down
32 changes: 8 additions & 24 deletions src/Linna/App/Templates/HtmlTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Linna/App/Templates/JsonTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
*/
class JsonTemplate implements TemplateInterface
{
/**
* @var object Data for view
*/
/** @var object Data for view */
public $data;

/**
Expand Down
4 changes: 1 addition & 3 deletions src/Linna/App/Templates/RawTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
*/
class RawTemplate implements TemplateInterface
{
/**
* @var array Data for view
*/
/** @var array Data for view */
public $data = [];

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Linna/App/Views/ErrorView.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ErrorView extends View
/**
* Constructor.
*
* @param HtmlTemplate $htmlTemplate
* @param HtmlTemplate $htmlTemplate
*/
public function __construct(HtmlTemplate $htmlTemplate)
{
Expand Down
8 changes: 2 additions & 6 deletions tests/Linna/App/Helper/RouteHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
4 changes: 1 addition & 3 deletions tests/Linna/App/Templates/HtmlTemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
*/
class HtmlTemplateTest extends TestCase
{
/**
* @var TemplateInterface Template.
*/
/** @var TemplateInterface Template. */
protected static $template;

/**
Expand Down
4 changes: 1 addition & 3 deletions tests/Linna/App/Templates/JsonTemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
*/
class JsonTemplateTest extends TestCase
{
/**
* @var TemplateInterface Template.
*/
/** @var TemplateInterface Template. */
protected static $template;

/**
Expand Down
4 changes: 1 addition & 3 deletions tests/Linna/App/Templates/NullTemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
*/
class NullTemplateTest extends TestCase
{
/**
* @var TemplateInterface Template.
*/
/** @var TemplateInterface Template. */
protected static $template;

/**
Expand Down
4 changes: 1 addition & 3 deletions tests/Linna/App/Templates/RawTemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
*/
class RawTemplateTest extends TestCase
{
/**
* @var TemplateInterface Template.
*/
/** @var TemplateInterface Template. */
protected static $template;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/Linna/App/TestHelper/Views/RestViewAio.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class RestViewAio extends View
/**
* Class Constructor.
*
* @param RawTemplate $rawTemplate
* @param RawTemplate $rawTemplate
*/
public function __construct(RawTemplate $rawTemplate)
{
Expand Down

0 comments on commit dc562bc

Please sign in to comment.