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

Minor fixes on 'filter_condition_callback' method _filterStoreConditi… #2362

Merged
merged 5 commits into from
Aug 10, 2022

Conversation

kiatng
Copy link
Contributor

@kiatng kiatng commented Aug 4, 2022

…on().

Minor code fixes.

@github-actions github-actions bot added the Component: Adminhtml Relates to Mage_Adminhtml label Aug 4, 2022
Sdfendor
Sdfendor previously approved these changes Aug 5, 2022
luigifab
luigifab previously approved these changes Aug 9, 2022
fballiano
fballiano previously approved these changes Aug 9, 2022
addison74
addison74 previously approved these changes Aug 9, 2022
@fballiano
Copy link
Contributor

@kiatng could you check the conflict? sorry :-(

@sreichel
Copy link
Contributor

sreichel commented Aug 9, 2022

Damn, had to remove all lines ... please reapply change to baseline (instead of resolving conflicts :P)

# Conflicts:
#	.github/phpstan-baseline.neon
…ento-lts into _filterStoreCondition

# Conflicts:
#	.github/phpstan-baseline.neon
@kiatng
Copy link
Contributor Author

kiatng commented Aug 10, 2022

As I'm not any good with git CLI, I rely on TortoiseGit, it seems ok now.

@sreichel
Copy link
Contributor

As I'm not any good with git CLI, I rely on TortoiseGit, it seems ok now.

OT: why TortoiseGit? Not using phpStorm?

@kiatng
Copy link
Contributor Author

kiatng commented Aug 10, 2022

As I'm not any good with git CLI, I rely on TortoiseGit, it seems ok now.

OT: why TortoiseGit? Not using phpStorm?

Way way back then, I couldn't afford phpStorm; I used free tools. Now that I can afford it but the habit stuck. I do not know what I am missing but VS Code is good enough for me. Plus, I can represent those 3rd-world developers, or other devs, for whatever reasons, use free tools like me.

@sreichel
Copy link
Contributor

Way way back then, I couldn't afford phpStorm

Erm ... if you activly contribute to an unpaid, open source projects like OM, you can get a free license.

Always had a paid one for paid projects and a free one for OM/open-soure ...

@fballiano fballiano merged commit 6902359 into OpenMage:1.9.4.x Aug 10, 2022
@github-actions
Copy link
Contributor

Unit Test Results

1 files  ±0  1 suites  ±0   0s ⏱️ ±0s
0 tests ±0  0 ✔️ ±0  0 💤 ±0  0 ❌ ±0 
7 runs  ±0  5 ✔️ ±0  2 💤 ±0  0 ❌ ±0 

Results for commit 6902359. ± Comparison against base commit f1b41d3.

sreichel added a commit that referenced this pull request Aug 12, 2022
* Merge PR #2342

* Revert "Add basic text for Ukraine (#2074)" (#2325)

This reverts commit 33dfa26.

* Mage_Catalog_Model_Product_Attribute_Backend_Groupprice_Abstract: avoid loading all websites when using only the current one (#2351)

* Added support for HTTP2 to Mage_HTTP_Client_Curl (#1137)

* Blocked access to all dot files (#2349)

* Capitalization Adjustment Regarding CamelCase in Method Names (#2365)

* refactor: Adjusted capitalization of two public methods.

* refactor: Adjusted capitalization of one protected method.

* refactor: Adjusted capitalization of where call.

* chore: Removed fixed error from phpstan baseline.

* Some microoptimization (#2335)

* Avoid duplicate method calls

* Replaced array_push()

* Changed substr() third parameter

* Use array_key_exists()

* php7 opcode - internal functions

* Enclosed error with <pre> tag for prettier error print (if developer mode is enabled). (#2368)

* Updated phpstan to 1.8.2 (#2367)

* Escape product titles in MSRP JavaScript (#2366)

* Product names were not escaped. If contained a double quote, would break the JavaScript for MSRP/MAP

* update contribution list

* Update boxes.css (#2330)

* Force describeTable() to use read DB adapter (#2371)

* Do not install n98/n98_layouthelper (#2373)

* Add apt update to XML validation workflow (#2376)

* Merged PR #2375

* Replace remaining "sizeof" calls with "count" (#2369)

* Remove DISCLAIMER and change Magento -> OpenMage in header (#2297)

* Added label for phpstan cosmetic changes (#2384)

* Added weight to salesOrderShipmentAddTrack API (#1377)

* PHPStan/DOCBlock fixes (#2336)

* Updated docs for email addTo() (#2382)

* Updated phpstan experimental (#2386)

* Cosmetic changes to Mage_Payment_Model_Method_Abstract::validate() (#2388)

* Replaced join() calls with implode() (#2389)

* Hidden empty sub menu from backend (#2391)

* Remove Thumbs.db file (#2394)

* Support PHP 8.1 in composer.json (#2378)

* php condition in composer.json

This solves the issue related to php versions > 8.1

* Reduced condition for PHP requirement

* Changed PHP requirement

* Updated version in Ubuntu 22.04 based on PHP 8.1.2

* Composer.lock updated in Ubuntu 20.04 (PHP 8.1.2)

* Update composer.lock

* Update composer.lock

* Blocked various file types in .htaccess (#2359)

* Color swatches work with disparate product IDs (#2390)

* Move Credit Memo at the end of the buttons list (#2392)

* Version bump (#2387)

* Minor fixes on 'filter_condition_callback' method _filterStoreCondition() (#2362)

* add ReturnTypeWillChange to various Files catched by code style checker #2302

* Phpstan fixes (#2396)

* Fixed addCrumb()

* Fixed initForm() and _needToAddDummy()

* Fixed addLink()

* Fixed addLinkRel()

* Fixed canUseCanonicalTag()

* Fixed getAddUrl...()

* Fixed rollBack() camelCase error reported by phpstan (#2403)

* Changes default root dir in composer.json (#2401)

* Fixed targetNamespace for WS-I Compliant SOAP APIs (#2405)

* Updated phpstan baseline

Co-authored-by: sv3n <github-sr@hotmail.com>
Co-authored-by: Fabian Blechschmidt <github@fabian-blechschmidt.de>
Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
Co-authored-by: Kevin Jakob <kevin-jakob@web.de>
Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
Co-authored-by: Scott Moore <scott.moore@dfsupplyinc.com>
Co-authored-by: ADDISON <8360474+ADDISON74@users.noreply.github.com>
Co-authored-by: Justin Beaty <51970393+justinbeaty@users.noreply.github.com>
Co-authored-by: luigifab <31816829+luigifab@users.noreply.github.com>
Co-authored-by: Daniel Fahlke <flyingmana@googlemail.com>
Co-authored-by: leissbua <68073221+leissbua@users.noreply.github.com>
@kiatng kiatng deleted the _filterStoreCondition branch August 30, 2022 02:01
kiatng added a commit to kiatng/magento-lts that referenced this pull request May 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants