Skip to content

Commit

Permalink
Merge pull request #71 from niden/master
Browse files Browse the repository at this point in the history
5.0.0beta1
  • Loading branch information
niden authored Dec 27, 2021
2 parents 9655438 + 58be2e0 commit f8aac42
Show file tree
Hide file tree
Showing 182 changed files with 1,168 additions and 6,216 deletions.
24 changes: 0 additions & 24 deletions src/Acl/ComponentAware.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Acl/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Class for exceptions thrown by Phalcon\Acl
*/
class Exception extends \Phalcon\Exception
class Exception extends \Exception
{


Expand Down
24 changes: 0 additions & 24 deletions src/Acl/RoleAware.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Annotations/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Class for exceptions thrown by Phalcon\Annotations
*/
class Exception extends \Phalcon\Exception
class Exception extends \Exception
{


Expand Down
2 changes: 1 addition & 1 deletion src/Application/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Exceptions thrown in Phalcon\Application class will use this class
*/
class Exception extends \Phalcon\Exception
class Exception extends \Exception
{


Expand Down
2 changes: 1 addition & 1 deletion src/Assets/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ public function setFilter(bool $filter): AssetInterface
*
* @return AssetInterface
*/
public function setLocal(bool $flag): AssetInterface
public function setIsLocal(bool $flag): AssetInterface
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/Assets/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Exceptions thrown in Phalcon\Assets will use this class
*/
class Exception extends \Phalcon\Exception
class Exception extends \Exception
{


Expand Down
7 changes: 4 additions & 3 deletions src/Crypt/Exception.php → src/Autoload/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
* For the full copyright and license information, please view the LICENSE.txt
* file that was distributed with this source code.
*/
namespace Phalcon\Crypt;
namespace Phalcon\Autoload;

/**
* Exceptions thrown in Phalcon\Crypt use this class
* Exceptions thrown in Phalcon\Autoload will use this class
*/
class Exception extends \Phalcon\Exception
class Exception extends \Exception
{


}
Loading

0 comments on commit f8aac42

Please sign in to comment.