Update from LTS #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
reversed order is deprecated from php 7.4 on
PHP Deprecated: Array and string offset access syntax with curly braces is deprecated
* add php 7.4 to travis.yml
* Fix unused variables in Backend Crons * Update doc * Replaced deprecated each (PHP 7.2)
correct argument order of implode calls
fix php7.4 syntax deprecated warnings
* This commit only contains copyright updates
Magento 1.9.4.4
app/code/core/Mage/Compiler/controllers/Adminhtml/Compiler/ProcessController.php app/design/adminhtml/default/default/template/compiler/process.phtml
Upstream merge 1.9.4.4
Added mod_expires headers for common file types.
Especially the `$order` which is really really good to have there. It allows to custom the success page without loading the order again.
* Suggestion on implementing a proper POST of JSON data using Mage curl client. * Better solution to solving the JSON POST issue * Updating php doc comment
* Do not sum columns with undefined total function This function only supports non-empty total functions (avg, sum, or total with slash) so we can safely ignore fields which have 'total' undefined (null). Fixes: #915 * Add mising space between bracket
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) - fix: `Cannot use [] for read` in Mage_Directory_Model_Resource_Country_Collection`::addCountryCodeFilter() (tested) Co-authored-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
This patch fixes "vsprintf(): Too few arguments" notice, when magento tries to prepare JS language labels in Mage_Core_Helper_Js (they are translated without passing arguments, as args are replaced on js side). This way we avoid the notice and processing of the notice in the error handler (which adds some performance penalty to every request).
* Mage_Sales - DOC block update - part 1 - doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) * Mage_Sales - PSR2 update (installer only) - part 2 * Review fixes * Update app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php Co-authored-by: Tymoteusz Motylewski <t.motylewski@gmail.com> Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
Co-authored-by: Aike Terjung <at@akt-web.de>
* Mage_Customer - DOC block update * Change variable scope to private * Some DOC updates, PSR2 * Changed for request - #681 (comment) Co-authored-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) Co-authored-by: Colin Mollenhour <colin@mollenhour.com> Co-authored-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
* cleanup-mage-cataloginventory * Fixed qty int return types * Use pipe instead of slash * Use pipe instead of slash Co-authored-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
$atttribute -> $attribute
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
…936) The $type variable can be both string or int, so before comparing it to 'TYPE_CONDITION' string it has to be casted to avoid comparing integer zero with string (0 == 'TYPE_CONDITION') which will wrongly return true, and remove the information about type. Pass type provided to where function down the chain to allow automatic casting of arrays of values e.g. to int. This fixes following cases: 1) ->where('attr_table.store_id IN (?)', $storeIds, Zend_Db::INT_TYPE); 2) ->where('attr_table.store_id = ?', $storeId, Zend_Db::INT_TYPE); In both cases now passed value is correctly casted to int (either single value, or each value from array) Passing Zend_Db::INT_TYPE to where condition will prevent mysql performance issues which might occur when mixed types are passed in "in()" condition. Also fixes type hints along the way.
* Remove this->_debug Not supposed to be there? * Remove commented line Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
- 3k occurrences of "count" and 119 of "sizeof" - simplified "count(x) > 0" - simplified "count(x) == 0" - strict type compare to int
add parameter true to in_array function call to avoid php error Fatal error: Nesting level too deep - recursive dependency?
* Mage_Checkout - DOC block update - doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) * Fixed mixed return types
* Mage_Core - DOC block update * Removed new code * Mage_Core fixes - changes from reviews - added some @methods - reverted some changes in code style for less diffs * DOC update * Minor fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.