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

Code style (endif) #1701

Merged
merged 1 commit into from
Jul 30, 2021
Merged

Code style (endif) #1701

merged 1 commit into from
Jul 30, 2021

Conversation

luigifab
Copy link
Contributor

@luigifab luigifab commented Jun 25, 2021

Description

I'm so sorry for this PR (after #1035 and #1577), but when I updated to 20.0.11, I saw things that hurt my eyes.

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All automated tests passed successfully (all builds are green)

@github-actions github-actions bot added Component: Adminhtml Relates to Mage_Adminhtml Component: Bundle Relates to Mage_Bundle Component: Catalog Relates to Mage_Catalog Component: Checkout Relates to Mage_Checkout Component: PayPal Relates to Mage_Paypal Component: Sales Relates to Mage_Sales Template : admin Relates to admin template Template : base Relates to base template Template : default Relates to base template Template : rwd Relates to rwd template labels Jun 25, 2021
@addison74
Copy link
Contributor

There may be others left but we will solve them in time. It wouldn't spoil a new search for every word in the entire OpenMage directory. In any case, you did a good job because now the code in the templates looks much better. This semicolon usage is similar to SASS versus SCSS. Personally, I am more attached to the Python code than to the one with braces and semicolons, but I see that most of them use it.

Copy link
Member

@elidrissidev elidrissidev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always good to see code style inconsistencies getting fixed 👍

@Flyingmana Flyingmana merged commit 0be8547 into OpenMage:1.9.4.x Jul 30, 2021
@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 
6 runs  ±0  4 ✔️ ±0  2 💤 ±0  0 ❌ ±0 

Results for commit 0be8547. ± Comparison against base commit 92854a1.

@luigifab luigifab deleted the endif branch July 31, 2021 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Adminhtml Relates to Mage_Adminhtml Component: Bundle Relates to Mage_Bundle Component: Catalog Relates to Mage_Catalog Component: Checkout Relates to Mage_Checkout Component: PayPal Relates to Mage_Paypal Component: Sales Relates to Mage_Sales Template : admin Relates to admin template Template : base Relates to base template Template : default Relates to base template Template : rwd Relates to rwd template
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants