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

Jump to bottom

Follow coding-standard PER-CS2.0 #4372

Merged
merged 38 commits into from
Dec 9, 2024
Merged

Follow coding-standard PER-CS2.0 #4372

merged 38 commits into from
Dec 9, 2024

Conversation

sreichel
Copy link
Contributor

@sreichel sreichel commented Nov 18, 2024 •
edited
Loading

Description (*)

We run coding-rule checks since ages, but we never followed a common standard, We had some PSR2/12-rules for PHPCS, but settings for php-cs-fixer where different.

@github-actions github-actions bot added environment Component: PayPal Relates to Mage_Paypal Component: Core Relates to Mage_Core Component: Catalog Relates to Mage_Catalog Template : admin Relates to admin template Component: Cms Relates to Mage_Cms Component: Reports Relates to Mage_Reports Component: CatalogInventory Relates to Mage_CatalogInventory Component: Checkout Relates to Mage_Checkout Component: AdminNotification Relates to Mage_AdminNotification Component: lib/Varien Relates to lib/Varien Component: Sales Relates to Mage_Sales Component: Usa Relates to Mage_Usa Component: Customer Relates to Mage_Customer Component: Eav Relates to Mage_Eav Template : rwd Relates to rwd template Component: lib/Mage Relates to lib/Mage Template : base Relates to base template Component: Adminhtml Relates to Mage_Adminhtml Component: ProductAlert Relates to Mage_ProductAlert Mage.php Relates to app/Mage.php Component: Sitemap Relates to Mage_Sitemap Component: Page Relates to Mage_Page Component: Api PageRelates to Mage_Api Component: Cron Relates to Mage_Cron Component: Captcha Relates to Mage_Captcha labels Nov 18, 2024
@github-actions github-actions bot removed Template : admin Relates to admin template Template : rwd Relates to rwd template Template : base Relates to base template labels Dec 7, 2024
@sreichel sreichel marked this pull request as ready for review December 7, 2024 13:09
@sreichel
Copy link
Contributor Author

sreichel commented Dec 7, 2024

Update config to work with php7.

@sreichel
Copy link
Contributor Author

sreichel commented Dec 7, 2024

I'm on-board with PER-CS2.0, but the Copyright year updates are annoying

There will be no more this year 😄

Please approvel. (should be part of next release)

addison74
addison74 previously approved these changes Dec 7, 2024
View reviewed changes
kiatng
kiatng previously approved these changes Dec 9, 2024
View reviewed changes
@sreichel
Merge branch 'main' into PER-CS2.0
9941cac 
# Conflicts:
#	app/code/core/Mage/Core/Controller/Front/Router.php
@sreichel sreichel dismissed stale reviews from kiatng and addison74 via 9941cac December 9, 2024 05:34
@sreichel
Merge branch 'main' into PER-CS2.0
9067d54 
# Conflicts:
#	app/code/core/Mage/Catalog/Model/Layer.php
#	app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php
#	app/code/core/Mage/CatalogRule/Model/Rule/Action/Collection.php
#	app/code/core/Mage/Eav/Model/Entity/Increment/Abstract.php
@sreichel
Copy link
Contributor Author

sreichel commented Dec 9, 2024

I ❤️ these conficts.

@sreichel sreichel requested review from addison74 and kiatng December 9, 2024 05:42
kiatng
kiatng previously approved these changes Dec 9, 2024
View reviewed changes
@sreichel
Copy link
Contributor Author

sreichel commented Dec 9, 2024

...

@sreichel sreichel requested a review from kiatng December 9, 2024 06:58
@sreichel sreichel merged commit 31ff920 into OpenMage:main Dec 9, 2024
20 checks passed
@sreichel sreichel deleted the PER-CS2.0 branch December 9, 2024 17:04
fballiano added a commit to MahoCommerce/maho that referenced this pull request Dec 11, 2024
@fballiano
OM PR 4372
c599549 
OpenMage/magento-lts#4372
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@addison74 addison74 addison74 approved these changes

@kiatng kiatng kiatng approved these changes

@colinmollenhour colinmollenhour Awaiting requested review from colinmollenhour

Assignees
No one assigned
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: 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: 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 documentation needed documentation environment errors Relates to error pages Mage.php Relates to app/Mage.php php-cs-fixer phpcs phpunit shell Relates to shell scripts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sreichel @addison74 @kiatng @colinmollenhour