Skip to content
This repository has been archived by the owner on Feb 15, 2020. It is now read-only.

Commit

Permalink
Merge 16d5de6 into 6c32197
Browse files Browse the repository at this point in the history
  • Loading branch information
miloshavlicek committed Mar 15, 2018
2 parents 6c32197 + 16d5de6 commit 3203414
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 25 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
composer.lock
vendor
tests/tmp

#IDE
.idea
nbproject
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ checks:
build:
environment:
php:
version: 7.0.7
version: 7.0.20

dependencies:
before:
Expand Down
2 changes: 1 addition & 1 deletion .travis.composer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

$composer['require']['nette/application'] = $version;
$composer['require']['nette/di'] = $version;
$composer['require']['nette/utils'] = $version;
$composer['require']['nette/utils'] = '2.5.1';
$content = json_encode($composer);
file_put_contents($file, $content);
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@ language: php

env:
- NETTE=default
- NETTE=~2.3.0
- NETTE=~2.4.0

php:
- 7.0
- 7.1
- 7.2
- hhvm

matrix:
allow_failures:
- php: hhvm

before_script:
- php .travis.composer.php
- composer self-update
- composer install --no-interaction --prefer-source --dev
- composer install --no-interaction --prefer-source

script:
- vendor/bin/tester -s -p php -c ./tests/php.ini-unix tests
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
"require": {
"php" : ">=7.0.0",

"nette/application" : "~2.3@dev",
"nette/di" : "~2.3@dev",
"nette/utils" : "~2.3@dev",
"nette/security" : "~2.3@dev",
"nette/application" : ">=2.4@dev",
"nette/di" : ">=2.4@dev",
"nette/utils" : ">=2.5@dev",
"nette/security" : ">=2.4@dev",

"latte/latte" : "~2.3@dev"
"latte/latte" : ">=2.4@dev"
},

"require-dev": {
"nette/bootstrap" : "~2.3@dev",
"nette/mail" : "~2.3@dev",
"nette/safe-stream" : "~2.3@dev",
"nette/robot-loader" : "~2.3@dev",
"nette/bootstrap" : ">=2.4@dev",
"nette/mail" : ">=2.4@dev",
"nette/safe-stream" : ">=2.3@dev",
"nette/robot-loader" : ">=2.4@dev",
"nette/tester" : "@dev",

"tracy/tracy" : "@dev"
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Access/AnnotationChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
final class AnnotationChecker extends Nette\Object implements IChecker, ICheckRequirements
final class AnnotationChecker implements IChecker, ICheckRequirements
{
use Nette\SmartObject;

/**
* @var NS\User
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Access/LatteChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
final class LatteChecker extends Nette\Object implements IChecker
final class LatteChecker implements IChecker
{
use Nette\SmartObject;

/**
* @var NS\User
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Access/LinkChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
final class LinkChecker extends Nette\Object implements IChecker
final class LinkChecker implements IChecker
{
use Nette\SmartObject;

/**
* @var Application\IPresenterFactory
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
class Configuration extends Nette\Object
class Configuration
{
use Nette\SmartObject;

/**
* @var string|NULL
*/
Expand Down
6 changes: 3 additions & 3 deletions src/IPub/Permissions/Entities/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

use Nette;
use Nette\Utils;

use IPub;
use IPub\Permissions\Security;

class Permission extends Nette\Object implements IPermission
class Permission implements IPermission
{
use Nette\SmartObject;

/**
* Permission resource
*
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Entities/Resource.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@

use Nette;

class Resource extends Nette\Object implements IResource
class Resource implements IResource
{
use Nette\SmartObject;

/**
* @var string
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Entities/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
use IPub;
use IPub\Permissions\Exceptions;

class Role extends Nette\Object implements IRole
class Role implements IRole
{
use Nette\SmartObject;

/**
* @var string
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Providers/PermissionsProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
class PermissionsProvider extends Nette\Object implements IPermissionsProvider
class PermissionsProvider implements IPermissionsProvider
{
use Nette\SmartObject;

/**
* @var Entities\IPermission[]
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Providers/ResourcesProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
class ResourcesProvider extends Nette\Object implements IResourcesProvider
class ResourcesProvider implements IResourcesProvider
{
use Nette\SmartObject;

/**
* @var Entities\IResource[]
*/
Expand Down
4 changes: 3 additions & 1 deletion src/IPub/Permissions/Providers/RolesProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
*
* @author Adam Kadlec <adam.kadlec@ipublikuj.eu>
*/
class RolesProvider extends Nette\Object implements IRolesProvider
class RolesProvider implements IRolesProvider
{
use Nette\SmartObject;

/**
* @var Entities\IRole[]
*/
Expand Down

0 comments on commit 3203414

Please sign in to comment.