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.

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

[Backport] Fixed - Lifetime update syntax error #13309 #8

Merged
merged 366 commits into from
Dec 22, 2018

Conversation

saphaljha
Copy link
Owner

Original Pull Request

magento#19634

Description (*)

Fixed issue of Lifetime update syntax error

Fixed Issues (if relevant)

  1. Lifetime update syntax error magento/magento2#13309: Lifetime update syntax error

Manual testing scenarios (*)

magento2/lib/internal/Magento/Framework/Cache/Backend/Database.php

Line 435
['id=?' => $id, 'expire_time = 0 OR expire_time>' => time()]

Should be (question sign is missing):
['id=?' => $id, 'expire_time = 0 OR expire_time>?' => time()]

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

OlgaVasyltsun and others added 30 commits December 3, 2018 15:12
…antity" in customer account shows incorrect value
…antity" in customer account shows incorrect value

Fix MFTF gitignore issues
…ter system configuration at desired position

- Adjusted Newsletter system configuration fields sortOrder so they has a step of 10
…nal field to system configuration at desired position magento#19568

 - Merge Pull Request magento#19568 from vasilii-b/magento2:2.2-develop-PR-port-19419
 - Merged commits:
   1. 1a01f4e
StasKozar and others added 28 commits December 14, 2018 11:21
…mftf-pr11

# Conflicts:
#	app/code/Magento/Store/Test/Mftf/Page/StorefrontStoreHomePage.xml
[TSG] Backporting for 2.2 (pr63) (2.2.8)
Fixed issues:
  - MAGETWO-97151 [Backport][MC-5683] Implement handling of large number of addresses on admin order creation page
…pr14

# Conflicts:
#	app/code/Magento/Checkout/Model/DefaultConfigProvider.php
# Conflicts:
#	app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryActionGroup.xml
# Conflicts:
#	app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/CatalogPriceRuleActionGroup.xml
[TSG] Backporting for 2.2 (pr64) (2.2.8)
@saphaljha saphaljha merged commit 2bf3b78 into 2.2-develop Dec 22, 2018
@saphaljha saphaljha deleted the 2.2-develop-PR-port-19634 branch January 24, 2019 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.