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

Sync OpenMage #44

Merged
merged 89 commits into from
Oct 27, 2024
Merged

Sync OpenMage #44

merged 89 commits into from
Oct 27, 2024

Conversation

sreichel
Copy link

@sreichel sreichel commented Sep 4, 2024

No description provided.

dependabot bot and others added 9 commits September 2, 2024 13:42
Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.62.0 to 3.64.0.
- [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases)
- [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md)
- [Commits](PHP-CS-Fixer/PHP-CS-Fixer@v3.62.0...v3.64.0)

---
updated-dependencies:
- dependency-name: friendsofphp/php-cs-fixer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)

* Rector: CQ - UnusedForeachValueToArrayKeysRector

See Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector

* fixes + phpstan

See fix at rector: rectorphp/rector-src#6164

* Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)"

This reverts commit 3d7eaf6.

* Convert double-quotes to single-quotes
…talog_Model_Product_Attribute_Backend_Media (#4136)

* fix issues 4134

* better code
Co-authored-by: kiatng

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
* Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)

* Rector: CQ - UnusedForeachValueToArrayKeysRector

See Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector

* fixes + phpstan

See fix at rector: rectorphp/rector-src#6164

* Fixes some phpstan errors

* Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)"

This reverts commit 3d7eaf6.

* Update app/code/core/Mage/Tag/Model/Tag.php

Co-authored-by: Ng Kiat Siong <[email protected]>

* Updated docblock

- have to keep array from parent method

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
Co-authored-by: Ng Kiat Siong <[email protected]>
* Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)

* Rector: CQ - UnusedForeachValueToArrayKeysRector

See Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector

* fixes + phpstan

See fix at rector: rectorphp/rector-src#6164

* Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)"

This reverts commit 3d7eaf6.

* DocBlock update

* Update app/code/core/Mage/Adminhtml/Helper/Help/Mapping.php

Co-authored-by: Ng Kiat Siong <[email protected]>

* Update app/code/core/Mage/Core/Model/Session/Abstract.php

Co-authored-by: Ng Kiat Siong <[email protected]>

* Update app/code/core/Mage/Core/Model/Session/Abstract.php

Co-authored-by: Ng Kiat Siong <[email protected]>

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
* Bump phpstan/phpstan from 1.11.7 to 1.12.0

Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.11.7 to 1.12.0.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.12.x/CHANGELOG.md)
- [Commits](phpstan/phpstan@1.11.7...1.12.0)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Phpstan: update for v1.12 (#4179)

* patch 1.11

* patch 1.12

* patch 1.12 - ignore errors

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sven Reichel <[email protected]>
Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 44 to 45.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v44...v45)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions github-actions bot added environment Component: PayPal Relates to Mage_Paypal Component: Core Relates to Mage_Core Component: Reports Relates to Mage_Reports Component: Catalog Relates to Mage_Catalog Component: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: lib/Varien Relates to lib/Varien Component: Sales Relates to Mage_Sales Component: Usa Relates to Mage_Usa Component: lib/Mage Relates to lib/Mage Component: Eav Relates to Mage_Eav Component: Customer Relates to Mage_Customer Component: Adminhtml Relates to Mage_Adminhtml Component: Page Relates to Mage_Page Component: Api PageRelates to Mage_Api Component: Cron Relates to Mage_Cron Component: Tag Relates to Mage_Tag Component: CatalogRule Relates to Mage_CatalogRule Component: Admin Relates to Mage_Admin Component: SalesRule Relates to Mage_SalesRule labels Sep 4, 2024
sreichel and others added 28 commits October 9, 2024 09:39
* Bump phpstan to level 5

* Revert "Bump phpstan to level 5"

This reverts commit 8b6f2f8.

* Bump phpstan to level 5
* Bump phpstan/phpstan from 1.12.3 to 1.12.6

Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.12.3 to 1.12.6.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/2.0.x/CHANGELOG.md)
- [Commits](phpstan/phpstan@1.12.3...1.12.6)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* phpstan 1.12.5 fixes (#4260)

* phpstan-fixes

* baseline

* phpcbf

* Updated .phpstan.dist.baseline.neon

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sven Reichel <[email protected]>
Bumps [rector/rector](https://github.com/rectorphp/rector) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](rectorphp/rector@1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sven Reichel <[email protected]>
* Added better caching for phpstan

* Updated phpstan baseline
* Added ext-ftp to requirements

* Updated .phpstan.dist.baseline.neon
Bumps [rector/rector](https://github.com/rectorphp/rector) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](rectorphp/rector@1.2.6...1.2.7)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* polyfill-8.3

* polyfill-8.3/8.4

* Updated .phpstan.dist.baseline.neon

* Merge branch 'main' into ADDISON74-polifyll-8.3

# Conflicts:
#	composer.lock

---------

Co-authored-by: Sven Reichel <[email protected]>
Bumps [macopedia/phpstan-magento1](https://github.com/macopedia/phpstan-magento1) from 1.0.7 to 1.0.8.
- [Release notes](https://github.com/macopedia/phpstan-magento1/releases)
- [Commits](macopedia/phpstan-magento1@v1.0.7...v1.0.8)

---
updated-dependencies:
- dependency-name: macopedia/phpstan-magento1
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* backport, ref #1525 #2940

* test coverage for formatTimezoneDate() 100%

* Minor change

* phpcs

* Minor fix

* rector

* Fixed tests

* phpstan l5 fix

* Fixed test .... hour w/o leading zero

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
* fix + tests

* Improvement

* phpcs

* Added helper method

* Typo spaces

* Updated warning message

* Added test

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
* fixes mktime

* fixes with return type void returns

* fixes getRowUrl

* phpstan

* rector

* minor fix
* fixes [wip]

* fixes

* fixes
* PHP8: base64_decode(): Passing null to parameter #1 ($string) of type string is deprecated

- #4243 (comment)

* refactor

* refactor

* refactor

* refactor [skip ci]

* Update app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php

Co-authored-by: Ng Kiat Siong <[email protected]>

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.12.6 to 1.12.7.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/2.0.x/CHANGELOG.md)
- [Commits](phpstan/phpstan@1.12.6...1.12.7)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [rector/rector](https://github.com/rectorphp/rector) from 1.2.7 to 1.2.8.
- [Release notes](https://github.com/rectorphp/rector/releases)
- [Commits](rectorphp/rector@1.2.7...1.2.8)

---
updated-dependencies:
- dependency-name: rector/rector
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fixes price filter

* Fixes price filter (test)

* copyright

* Unified grid columns

- makes all "entity_id" grid columns searchable "from" "to"
- disallow/ignore non-numeric input on price/currency/range grid columns
- removed useless "'sortable' => true"

* Increased width

* Unified "edit" column

* Unified "action" column

* Unified "store" column

* Use config from XML

* Added test

* phpcs

* Update tests/unit/Mage/Adminhtml/Block/Widget/GridTest.php

Removed usseles line

* typo

* Unified "currency" column

* Unified "price" column

* Unified "currency" column

* Unified "currency" column

- added config helper

* Unified "number" column

- removed useless align right

* updated copyright dates

* cleanup

* Removed "from" "to" label to safe space

- add input placeholder

* Typo [skip ci]

* Re-added "from" "to" label to legacy theme

* Flush cache once if an old config is cached

* Hide placeholder in legacy theme

* Update app/code/core/Mage/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php

Co-authored-by: Ng Kiat Siong <[email protected]>

* Update app/code/core/Mage/Adminhtml/Block/Widget/Grid.php

Co-authored-by: Ng Kiat Siong <[email protected]>

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
…efault value will change (#4297)

* fgetcsv - lib/Varien/Convert/Parser/Csv.php

Deprecated. The $escape parameter must be provided as its default value will change.

* fgetcsv - app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php

Deprecated. The $escape parameter must be provided as its default value will change.

* fgetcsv - lib/Varien/Io/File.php

Deprecated. The $escape parameter must be provided as its default value will change.

* fgetcsv - lib/Varien/File/Csv.php

Deprecated. The $escape parameter must be provided as its default value will change.

* fgetcsv - app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php

Deprecated. The $escape parameter must be provided as its default value will change.

* Missing variabile fEsc in function parseTest()

* Missing $ in front of the variable

* Revert the typo

* escape parameter in function

* PHP CS Fixer for lib/Varien/Io/File.php
…efault value will change (#4298)

* fputcsv - lib/Varien/File/Csv.php

Deprecated. The PHP default value for the escape parameter is '\\' and I declared it at the beginning in certain files.

* fputcsv - lib/Magento/Profiler/Output/Csvfile.php

Deprecated. Deprecated. The $escape parameter must be provided as its default value will change.

* fputcsv - lib/Varien/Io/File.php

Deprecated. The $escape parameter must be provided as its default value will change.

* fputcsv - app/code/core/Mage/ImportExport/Model/Export/Adapter/Abstract.php

Deprecated. The $escape parameter must be provided as its default value will change.

* fputcsv - app/code/core/Mage/ImportExport/Model/Export/Adapter/Csv.php

Deprecated. The $escape parameter must be provided as its default value will change.

* Revert the changes

* escape parameter in function

Co-authored-by: Sven Reichel <[email protected]>

* PHP CS Fixer - lib/Varien/Io/File.php

---------

Co-authored-by: Sven Reichel <[email protected]>
…#4295)

* added tests

* fixes

* return earlier

* return earlier
* fix for php84 deprecated E_STRICT

* baseline

* Update app/code/core/Mage/Core/functions.php

Co-authored-by: Ng Kiat Siong <[email protected]>

* baseline

---------

Co-authored-by: Ng Kiat Siong <[email protected]>
Copy link

sonarcloud bot commented Oct 23, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
10 Security Hotspots
4.3% Duplication on New Code (required ≤ 3%)
D Reliability Rating on New Code (required ≥ A)
C Security Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@sreichel sreichel merged commit 0b1670c into openmage-strict:main Oct 27, 2024
2 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Admin Relates to Mage_Admin Component: Adminhtml Relates to Mage_Adminhtml Component: AdminNotification Relates to Mage_AdminNotification Component: Api PageRelates to Mage_Api Component: Api2 Relates to Mage_Api2 Component: Authorizenet Relates to Mage_Authorizenet Component: Bundle Relates to Mage_Bundle Component: Captcha Relates to Mage_Captcha Component: Catalog Relates to Mage_Catalog Component: CatalogIndex Relates to Mage_CatalogIndex Component: CatalogInventory Relates to Mage_CatalogInventory Component: CatalogRule Relates to Mage_CatalogRule Component: CatalogSearch Relates to Mage_CatalogSearch Component: Centinel Relates to Mage_Centinel Component: Checkout Relates to Mage_Checkout Component: Cms Relates to Mage_Cms Component: ConfigurableSwatches Relates to Mage_ConfigurableSwatches Component: Contacts Relates to Mage_Contacts Component: Core Relates to Mage_Core Component: Cron Relates to Mage_Cron Component: CurrencySymbol Relates to Mage_CurrencySymbol Component: Customer Relates to Mage_Customer Component: Dataflow Relates to Mage_Dataflow Component: Directory Relates to Mage_Directory Component: Downloadable Relates to Mage_Downloadable Component: Eav Relates to Mage_Eav Component: GoogleAnalytics Relates to Mage_GoogleAnalytics Component: GoogleCheckout Relates to Mage_GoogleCheckout Component: ImportExport Relates to Mage_ImportExport Component: Index Relates to Mage_Index Component: Install Relates to Mage_Install Component: lib/Mage Relates to lib/Mage Component: lib/Magento Relates to lib/Magento Component: lib/Varien Relates to lib/Varien Component: lib/* Relates to lib/* Component: Log Relates to Mage_Log Component: Media Relates to Mage_Media Component: Newsletter Relates to Mage_Newsletter Component: Oauth Relates to Mage_Oauth Component: Page Relates to Mage_Page Component: Paygate Relates to Mage_Paygate Component: Payment Relates to Mage_Payment Component: PayPal Relates to Mage_Paypal Component: ProductAlert Relates to Mage_ProductAlert Component: Rating Relates to Mage_Rating Component: Reports Relates to Mage_Reports Component: Review Relates to Mage_Review Component: Rss Relates to Mage_Rss Component: Rule Relates to Mage_Rule Component: Sales Relates to Mage_Sales Component: SalesRule Relates to Mage_SalesRule Component: Sendfriend Relates to Mage_Sendfriend Component: Shipping Relates to Mage_Shipping Component: Sitemap Relates to Mage_Sitemap Component: Tag Relates to Mage_Tag Component: Tax Relates to Mage_Tax Component: Uploader Relates to Mage_Uploader Component: Usa Relates to Mage_Usa Component: Weee Relates to Mage_Weee Component: Widget Relates to Mage_Widget Component: Wishlist Relates to Mage_Wishlist composer Relates to composer.json ddev documentation Improvements or additions to documentation environment errors Relates to error pages JavaScript Relates to js/* Mage.php Relates to app/Mage.php php-cs-fixer phpcs phpstan phpunit shell Relates to shell scripts Template : admin Relates to admin template Template : base Relates to base template Template : install Relates to install template Template : rwd Relates to rwd template translations Relates to app/locale XML Layout
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants