Skip to content

Commit

Permalink
Merge pull request #1 from phalcon/4.0.x
Browse files Browse the repository at this point in the history 
4.0.x upstream
  • Loading branch information
@npfedwards
npfedwards authored Dec 18, 2018
2 parents 4f9a8b2 + ec51add commit 6b8a16f
Show file tree
Hide file tree
Showing 70 changed files with 2,485 additions and 2,073 deletions.
32 changes: 32 additions & 0 deletions CHANGELOG-4.0.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,38 @@
- Scope SQL Column Aliases (on nesting level), in `Phalcon\Mvc\Model\Query`, to prevent overwrite _root_ query's `_sqlColumnAliases` by sub-queries. [#13006](https://github.com/phalcon/cphalcon/issues/13006), [#12548](https://github.com/phalcon/cphalcon/issues/12548) and [#1731](https://github.com/phalcon/cphalcon/issues/1731)
- CLI parameters now work like MVC parameters [#12375](https://github.com/phalcon/cphalcon/pull/12375)
- Changed `Phalcon\Db\Dialect\Postgresql::addPrimaryKey` to make primary key contraints names unique by prefixing them with the table name. [#12629](https://github.com/phalcon/cphalcon/pull/12629)
- Changed `Phalcon\Http\RequestInterface` to align with `Phalcon\Http\Request` [#13061](https://github.com/phalcon/cphalcon/pull/13061)
- Renamed `Phalcon\Acl\Resource` to `Phalcon\Acl\Subject` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\ResourceInterface` to `Phalcon\Acl\SubjectInterface` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\ResourceAware` to `Phalcon\Acl\SubjectAware` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Role` to `Phalcon\Acl\Operation` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\RoleInterface` to `Phalcon\Acl\OperationInterface` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\RoleAware` to `Phalcon\Acl\OperationAware` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::addRole()` to `Phalcon\Acl\AdapterInterface::addOperation()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::isRole()` to `Phalcon\Acl\AdapterInterface::isOperation()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::isResource()` to `Phalcon\Acl\AdapterInterface::isSubject()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::addResource()` to `Phalcon\Acl\AdapterInterface::addSubject()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::addResourceAccess()` to `Phalcon\Acl\AdapterInterface::addSubjectAccess()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::dropResourceAccess()` to `Phalcon\Acl\AdapterInterface::dropSubjectAccess()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::getActiveRole()` to `Phalcon\Acl\AdapterInterface::getActiveOperation()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::getActiveResource()` to `Phalcon\Acl\AdapterInterface::getActiveSubject()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::getRoless()` to `Phalcon\Acl\AdapterInterface::getOperations()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\AdapterInterface::getResources()` to `Phalcon\Acl\AdapterInterface::getSubjects()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter::getActiveRole()` to `Phalcon\Acl\AdapterInterface::getActiveOperation()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter::getActiveResource()` to `Phalcon\Acl\AdapterInterface::getActiveSubject()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::addRole()` to `Phalcon\Acl\Adapter\Memory::addOperation()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::isRole()` to `Phalcon\Acl\Adapter\Memory::isOperation()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::isResource()` to `Phalcon\Acl\Adapter\Memory::isSubject()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::addResource()` to `Phalcon\Acl\Adapter\Memory::addSubject()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::addResourceAccess()` to `Phalcon\Acl\Adapter\Memory::addSubjectAccess()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::dropResourceAccess()` to `Phalcon\Acl\Adapter\Memory::dropSubjectAccess()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::getRoless()` to `Phalcon\Acl\Adapter\Memory::getOperations()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Renamed `Phalcon\Acl\Adapter\Memory::getResources()` to `Phalcon\Acl\Adapter\Memory::getSubjects()` [#13639](https://github.com/phalcon/cphalcon/issues/13639)
- Changed `Phalcon\Http\Response::setHeaders()` now merges the headers with any pre-existing ones in the internal collection [#12836](https://github.com/phalcon/cphalcon/issues/12836)
- Changed `Phalcon\DI\FactoryDefault` to not load by default
- the `Phalcon\Session\Adapter\Files` using the name `session`
- the `Phalcon\Session\Bag` using the name `sessionBag`
[#12921](https://github.com/phalcon/cphalcon/issues/12921)

## Removed
- PHP < 7.2 no longer supported
Expand Down
10 changes: 5 additions & 5 deletions phalcon/acl/adapter.zep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface
protected _accessGranted = false;

/**
* Role which the list is checking if it's allowed to certain resource/access
* Operation which the list is checking if it's allowed to certain subject/access
*
* @var string
*/
protected _activeRole { get };
protected _activeOperation { get };

/**
* Resource which the list is checking if some role can access it
* Subject which the list is checking if some operation can access it
*
* @var string
*/
protected _activeResource { get };
protected _activeSubject { get };

/**
* Active access which the list is checking if some role can access it
* Active access which the list is checking if some operation can access it
*
* @var string
*/
Expand Down
Loading

0 comments on commit 6b8a16f

Please sign in to comment.