Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T15727 refactor logger #15749

Merged
merged 9 commits into from
Nov 1, 2021
Merged

T15727 refactor logger #15749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ebcc2d
removed logger from ext
niden Oct 31, 2021
8a8b531
adjusting tests
niden Oct 31, 2021
0d59447
refactoring logger - minor corrections also
niden Oct 31, 2021
f023ec7
simplified checking config elements for factories
niden Oct 31, 2021
11355bd
corrected alias for zephir stubs
niden Oct 31, 2021
46319ec
minor adjustments
niden Oct 31, 2021
108f185
updating changelog
niden Oct 31, 2021
3efc363
corrected docblock return type
niden Oct 31, 2021
7fbb345
refreshing ext
niden Oct 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions CHANGELOG-5.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
- Changed `Phalcon\Mvc\ModelgetPreparedQuery()` to return `QueryInterface` instead of `Query` [#15562](https://github.com/phalcon/cphalcon/issues/15562)
- Moved `Phalcon\Cache` to `Phalcon\Cache\Cache` [#15728](https://github.com/phalcon/cphalcon/issues/15728)
- Changed `Phalcon\Factory\AdapterFactory` to define the factory exception in `getExceptionClass()` instead of a property. [#15728](https://github.com/phalcon/cphalcon/issues/15728)
- Moved `Phalcon\Logger` to `Phalcon\Logger\Logger` [#15727](https://github.com/phalcon/cphalcon/issues/15727)

## Added
- Added more tests in the suite for additional code coverage [#15691](https://github.com/phalcon/cphalcon/issues/15691)
Expand Down
2 changes: 1 addition & 1 deletion docker/7.4/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fi
alias zephir='./zephir '
alias zf='./zephir fullclean'
alias zg='./zephir generate'
alias zs='./zephir generate'
alias zs='./zephir stubs'
alias cpl='zf && zg && cd ext/ && ./install && ..'
alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept '
alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs '
Expand Down
2 changes: 1 addition & 1 deletion docker/8.0/.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fi
alias zephir='./zephir '
alias zf='./zephir fullclean'
alias zg='./zephir generate'
alias zs='./zephir generate'
alias zs='./zephir stubs'
alias cpl='zf && zg && cd ext/ && ./install && ..'
alias codecept='php -d extension=ext/modules/phalcon.so ./vendor/bin/codecept '
alias phpcs='php -d extension=ext/modules/phalcon.so ./vendor/bin/phpcs '
Expand Down
6 changes: 3 additions & 3 deletions ext/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/validation/abstractvalidator.zep.c
phalcon/events/eventsawareinterface.zep.c
phalcon/html/helper/input/abstractinput.zep.c
phalcon/factory/abstractconfigfactory.zep.c
phalcon/support/collection/collectioninterface.zep.c
phalcon/di/abstractinjectionaware.zep.c
phalcon/factory/abstractconfigfactory.zep.c
phalcon/storage/adapter/adapterinterface.zep.c
phalcon/factory/abstractfactory.zep.c
phalcon/di/injectable.zep.c
phalcon/forms/element/elementinterface.zep.c
phalcon/forms/element/abstractelement.zep.c
phalcon/support/helper/str/abstractstr.zep.c
phalcon/storage/adapter/abstractadapter.zep.c
phalcon/support/collection.zep.c
phalcon/support/helper/str/abstractstr.zep.c
phalcon/support/helper/arr/abstractarr.zep.c
phalcon/dispatcher/dispatcherinterface.zep.c
phalcon/encryption/crypt/padding/padinterface.zep.c
Expand Down Expand Up @@ -420,7 +420,6 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/kernel.zep.c
phalcon/loader.zep.c
phalcon/loader/exception.zep.c
phalcon/logger.zep.c
phalcon/logger/adapter/noop.zep.c
phalcon/logger/adapter/stream.zep.c
phalcon/logger/adapter/syslog.zep.c
Expand All @@ -429,6 +428,7 @@ if test "$PHP_PHALCON" = "yes"; then
phalcon/logger/formatter/json.zep.c
phalcon/logger/formatter/line.zep.c
phalcon/logger/item.zep.c
phalcon/logger/logger.zep.c
phalcon/logger/loggerfactory.zep.c
phalcon/messages/exception.zep.c
phalcon/messages/message.zep.c
Expand Down
8 changes: 4 additions & 4 deletions ext/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/model/query", "scanner.c parser.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/view/engine/volt", "parser.c scanner.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/url", "utils.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c di.zep.c container.zep.c escaper.zep.c kernel.zep.c loader.zep.c logger.zep.c registry.zep.c tag.zep.c text.zep.c url.zep.c validation.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon", "exception.zep.c di.zep.c container.zep.c escaper.zep.c kernel.zep.c loader.zep.c registry.zep.c tag.zep.c text.zep.c url.zep.c validation.zep.c 0__closure.zep.c 1__closure.zep.c 2__closure.zep.c 3__closure.zep.c 4__closure.zep.c 5__closure.zep.c 6__closure.zep.c 7__closure.zep.c 8__closure.zep.c 9__closure.zep.c 10__closure.zep.c 11__closure.zep.c 12__closure.zep.c 13__closure.zep.c 14__closure.zep.c 15__closure.zep.c 16__closure.zep.c 17__closure.zep.c 18__closure.zep.c 19__closure.zep.c 20__closure.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/di", "injectionawareinterface.zep.c abstractinjectionaware.zep.c injectable.zep.c diinterface.zep.c exception.zep.c factorydefault.zep.c serviceinterface.zep.c service.zep.c serviceproviderinterface.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper", "abstracthelper.zep.c abstractseries.zep.c abstractlist.zep.c ol.zep.c style.zep.c anchor.zep.c base.zep.c body.zep.c button.zep.c close.zep.c element.zep.c form.zep.c img.zep.c label.zep.c link.zep.c meta.zep.c script.zep.c title.zep.c ul.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/validation", "validatorinterface.zep.c abstractvalidator.zep.c validatorcompositeinterface.zep.c abstractvalidatorcomposite.zep.c abstractcombinedfieldsvalidator.zep.c validationinterface.zep.c exception.zep.c validatorfactory.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/events", "eventsawareinterface.zep.c abstracteventsaware.zep.c eventinterface.zep.c managerinterface.zep.c event.zep.c exception.zep.c manager.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/html/helper/input", "abstractinput.zep.c checkbox.zep.c color.zep.c date.zep.c datetime.zep.c datetimelocal.zep.c email.zep.c file.zep.c hidden.zep.c image.zep.c input.zep.c month.zep.c numeric.zep.c password.zep.c radio.zep.c range.zep.c search.zep.c select.zep.c submit.zep.c tel.zep.c text.zep.c textarea.zep.c time.zep.c url.zep.c week.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonly.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/factory", "abstractconfigfactory.zep.c abstractfactory.zep.c exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/support/collection", "collectioninterface.zep.c exception.zep.c readonly.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/storage/adapter", "adapterinterface.zep.c abstractadapter.zep.c apcu.zep.c libmemcached.zep.c memory.zep.c redis.zep.c stream.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/forms/element", "elementinterface.zep.c abstractelement.zep.c check.zep.c date.zep.c email.zep.c file.zep.c hidden.zep.c numeric.zep.c password.zep.c radio.zep.c select.zep.c submit.zep.c text.zep.c textarea.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/support", "collection.zep.c debug.zep.c exception.zep.c helperfactory.zep.c version.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/support/helper/str", "abstractstr.zep.c camelize.zep.c concat.zep.c countvowels.zep.c decapitalize.zep.c decrement.zep.c dirfromfile.zep.c dirseparator.zep.c dynamic.zep.c endswith.zep.c firstbetween.zep.c friendly.zep.c humanize.zep.c includes.zep.c increment.zep.c interpolate.zep.c isanagram.zep.c islower.zep.c ispalindrome.zep.c isupper.zep.c len.zep.c lower.zep.c prefix.zep.c random.zep.c reduceslashes.zep.c startswith.zep.c suffix.zep.c ucwords.zep.c uncamelize.zep.c underscore.zep.c upper.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/support", "collection.zep.c debug.zep.c exception.zep.c helperfactory.zep.c version.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/support/helper/arr", "abstractarr.zep.c blacklist.zep.c chunk.zep.c first.zep.c firstkey.zep.c flatten.zep.c get.zep.c group.zep.c has.zep.c isunique.zep.c last.zep.c lastkey.zep.c order.zep.c pluck.zep.c set.zep.c sliceleft.zep.c sliceright.zep.c split.zep.c toobject.zep.c validateall.zep.c validateany.zep.c whitelist.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/dispatcher", "dispatcherinterface.zep.c abstractdispatcher.zep.c exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/encryption/crypt/padding", "padinterface.zep.c ansi.zep.c iso10126.zep.c isoiek.zep.c noop.zep.c pkcs7.zep.c space.zep.c zero.zep.c", "phalcon");
Expand Down Expand Up @@ -112,7 +112,7 @@ if (PHP_PHALCON != "no") {
ADD_SOURCES(configure_module_dirname + "/phalcon/http/server", "abstractmiddleware.zep.c abstractrequesthandler.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/image", "enum.zep.c exception.zep.c imagefactory.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/loader", "exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/logger", "adapterfactory.zep.c exception.zep.c item.zep.c loggerfactory.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/logger", "adapterfactory.zep.c exception.zep.c item.zep.c logger.zep.c loggerfactory.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/application", "exception.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/controller", "bindmodelinterface.zep.c", "phalcon");
ADD_SOURCES(configure_module_dirname + "/phalcon/mvc/dispatcher", "exception.zep.c", "phalcon");
Expand Down
12 changes: 6 additions & 6 deletions ext/phalcon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ zend_class_entry *phalcon_exception_ce;
zend_class_entry *phalcon_html_helper_abstracthelper_ce;
zend_class_entry *phalcon_validation_abstractvalidator_ce;
zend_class_entry *phalcon_html_helper_input_abstractinput_ce;
zend_class_entry *phalcon_di_abstractinjectionaware_ce;
zend_class_entry *phalcon_factory_abstractconfigfactory_ce;
zend_class_entry *phalcon_di_abstractinjectionaware_ce;
zend_class_entry *phalcon_factory_abstractfactory_ce;
zend_class_entry *phalcon_di_injectable_ce;
zend_class_entry *phalcon_forms_element_abstractelement_ce;
zend_class_entry *phalcon_support_helper_str_abstractstr_ce;
zend_class_entry *phalcon_storage_adapter_abstractadapter_ce;
zend_class_entry *phalcon_support_collection_ce;
zend_class_entry *phalcon_support_helper_str_abstractstr_ce;
zend_class_entry *phalcon_support_helper_arr_abstractarr_ce;
zend_class_entry *phalcon_validation_validator_file_abstractfile_ce;
zend_class_entry *phalcon_http_message_abstractcommon_ce;
Expand Down Expand Up @@ -464,11 +464,11 @@ zend_class_entry *phalcon_logger_adapter_noop_ce;
zend_class_entry *phalcon_logger_adapter_stream_ce;
zend_class_entry *phalcon_logger_adapter_syslog_ce;
zend_class_entry *phalcon_logger_adapterfactory_ce;
zend_class_entry *phalcon_logger_ce;
zend_class_entry *phalcon_logger_exception_ce;
zend_class_entry *phalcon_logger_formatter_json_ce;
zend_class_entry *phalcon_logger_formatter_line_ce;
zend_class_entry *phalcon_logger_item_ce;
zend_class_entry *phalcon_logger_logger_ce;
zend_class_entry *phalcon_logger_loggerfactory_ce;
zend_class_entry *phalcon_messages_exception_ce;
zend_class_entry *phalcon_messages_message_ce;
Expand Down Expand Up @@ -786,14 +786,14 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Html_Helper_AbstractHelper);
ZEPHIR_INIT(Phalcon_Validation_AbstractValidator);
ZEPHIR_INIT(Phalcon_Html_Helper_Input_AbstractInput);
ZEPHIR_INIT(Phalcon_Di_AbstractInjectionAware);
ZEPHIR_INIT(Phalcon_Factory_AbstractConfigFactory);
ZEPHIR_INIT(Phalcon_Di_AbstractInjectionAware);
ZEPHIR_INIT(Phalcon_Factory_AbstractFactory);
ZEPHIR_INIT(Phalcon_Di_Injectable);
ZEPHIR_INIT(Phalcon_Forms_Element_AbstractElement);
ZEPHIR_INIT(Phalcon_Support_Helper_Str_AbstractStr);
ZEPHIR_INIT(Phalcon_Storage_Adapter_AbstractAdapter);
ZEPHIR_INIT(Phalcon_Support_Collection);
ZEPHIR_INIT(Phalcon_Support_Helper_Str_AbstractStr);
ZEPHIR_INIT(Phalcon_Support_Helper_Arr_AbstractArr);
ZEPHIR_INIT(Phalcon_Validation_Validator_File_AbstractFile);
ZEPHIR_INIT(Phalcon_Http_Message_AbstractCommon);
Expand Down Expand Up @@ -1098,7 +1098,6 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Kernel);
ZEPHIR_INIT(Phalcon_Loader);
ZEPHIR_INIT(Phalcon_Loader_Exception);
ZEPHIR_INIT(Phalcon_Logger);
ZEPHIR_INIT(Phalcon_Logger_AdapterFactory);
ZEPHIR_INIT(Phalcon_Logger_Adapter_Noop);
ZEPHIR_INIT(Phalcon_Logger_Adapter_Stream);
Expand All @@ -1107,6 +1106,7 @@ static PHP_MINIT_FUNCTION(phalcon)
ZEPHIR_INIT(Phalcon_Logger_Formatter_Json);
ZEPHIR_INIT(Phalcon_Logger_Formatter_Line);
ZEPHIR_INIT(Phalcon_Logger_Item);
ZEPHIR_INIT(Phalcon_Logger_Logger);
ZEPHIR_INIT(Phalcon_Logger_LoggerFactory);
ZEPHIR_INIT(Phalcon_Messages_Exception);
ZEPHIR_INIT(Phalcon_Messages_Message);
Expand Down
6 changes: 3 additions & 3 deletions ext/phalcon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
#include "phalcon/validation/abstractvalidator.zep.h"
#include "phalcon/events/eventsawareinterface.zep.h"
#include "phalcon/html/helper/input/abstractinput.zep.h"
#include "phalcon/factory/abstractconfigfactory.zep.h"
#include "phalcon/support/collection/collectioninterface.zep.h"
#include "phalcon/di/abstractinjectionaware.zep.h"
#include "phalcon/factory/abstractconfigfactory.zep.h"
#include "phalcon/storage/adapter/adapterinterface.zep.h"
#include "phalcon/factory/abstractfactory.zep.h"
#include "phalcon/di/injectable.zep.h"
#include "phalcon/forms/element/elementinterface.zep.h"
#include "phalcon/forms/element/abstractelement.zep.h"
#include "phalcon/support/helper/str/abstractstr.zep.h"
#include "phalcon/storage/adapter/abstractadapter.zep.h"
#include "phalcon/support/collection.zep.h"
#include "phalcon/support/helper/str/abstractstr.zep.h"
#include "phalcon/support/helper/arr/abstractarr.zep.h"
#include "phalcon/dispatcher/dispatcherinterface.zep.h"
#include "phalcon/encryption/crypt/padding/padinterface.zep.h"
Expand Down Expand Up @@ -415,7 +415,6 @@
#include "phalcon/kernel.zep.h"
#include "phalcon/loader.zep.h"
#include "phalcon/loader/exception.zep.h"
#include "phalcon/logger.zep.h"
#include "phalcon/logger/adapter/noop.zep.h"
#include "phalcon/logger/adapter/stream.zep.h"
#include "phalcon/logger/adapter/syslog.zep.h"
Expand All @@ -424,6 +423,7 @@
#include "phalcon/logger/formatter/json.zep.h"
#include "phalcon/logger/formatter/line.zep.h"
#include "phalcon/logger/item.zep.h"
#include "phalcon/logger/logger.zep.h"
#include "phalcon/logger/loggerfactory.zep.h"
#include "phalcon/messages/exception.zep.h"
#include "phalcon/messages/message.zep.h"
Expand Down
Loading