From 441639e444b314b42e559a6a2ecfcc1f5d53b396 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 25 Feb 2017 18:16:42 +0100 Subject: [PATCH] Continued: - added "import" of SeekableIterator (SPL) - added "import" of Registry - InvalidFilterChainException is no longer deprecated - added "import" of it - added 'shutdown' filter chain MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../commands/console/class_TestsConsoleMainCommand.php | 1 + .../console/class_TestsConsoleDefaultNewsController.php | 6 ++++-- inc/main/classes/controller/class_BaseController.php | 1 + .../classes/database/result/class_CachedDatabaseResult.php | 3 +++ .../exceptions/filter/class_InvalidFilterChainException.php | 2 +- .../iterator/class_SeekableWritableFileIterator.php | 3 +++ 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php b/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php index 66c8147b..44cb82ba 100644 --- a/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php +++ b/application/tests/classes/commands/console/class_TestsConsoleMainCommand.php @@ -7,6 +7,7 @@ use CoreFramework\Command\BaseCommand; use CoreFramework\Command\Commandable; use CoreFramework\Controller\Controller; use CoreFramework\Factory\ObjectFactory; +use CoreFramework\Registry\Registry; use CoreFramework\Request\Requestable; use CoreFramework\Resolver\Command\CommandResolver; use CoreFramework\Response\Responseable; diff --git a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php index 733d61a9..9583e124 100644 --- a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php +++ b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php @@ -45,10 +45,12 @@ class TestsConsoleDefaultNewsController extends BaseController implements Contro // Init additional filter chains /* - foreach (array('bootstrap', 'activation','shutdown') as $filterChain) { + * @TODO maybe later more: + 'bootstrap', 'activation', + */ + foreach (array('shutdown') as $filterChain) { $this->initFilterChain($filterChain); } // END - foreach - */ } /** diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php index 0126120a..6f8a1ec5 100644 --- a/inc/main/classes/controller/class_BaseController.php +++ b/inc/main/classes/controller/class_BaseController.php @@ -3,6 +3,7 @@ namespace CoreFramework\Controller; // Import framework stuff +use CoreFramework\Chain\Filter\InvalidFilterChainException; use CoreFramework\Factory\ObjectFactory; use CoreFramework\Filter\Filterable; use CoreFramework\Object\BaseFrameworkSystem; diff --git a/inc/main/classes/database/result/class_CachedDatabaseResult.php b/inc/main/classes/database/result/class_CachedDatabaseResult.php index 53109101..9c2586c9 100644 --- a/inc/main/classes/database/result/class_CachedDatabaseResult.php +++ b/inc/main/classes/database/result/class_CachedDatabaseResult.php @@ -12,6 +12,9 @@ use CoreFramework\Result\Search\SearchableResult; use CoreFramework\Result\Update\UpdateableResult; use CoreFramework\Wrapper\Database\DatabaseWrapper; +// Import SPL stuff +use \SeekableIterator; + /** * A database result class * diff --git a/inc/main/exceptions/filter/class_InvalidFilterChainException.php b/inc/main/exceptions/filter/class_InvalidFilterChainException.php index a859a55e..cbaa6821 100644 --- a/inc/main/exceptions/filter/class_InvalidFilterChainException.php +++ b/inc/main/exceptions/filter/class_InvalidFilterChainException.php @@ -1,6 +1,6 @@