Skip to content

Remove extra space before semicolon and remove extra comma in php, phtml and js files #26342

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

Merged
magento-engcom-team merged 4 commits into from
Feb 13, 2020
Merged

Remove extra space before semicolon and remove extra comma in php, phtml and js files #26342

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9abbd32
Remove extra space before semicolon and remove extra comma in php, ph…
tejash-wagento Jan 10, 2020
89d09ac
revert back and added comma
tejash-wagento Jan 13, 2020
854b044
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
Nazar65 Feb 7, 2020
9d992d0
refactoring, static test fixes
Nazar65 Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
define('analyticsPopupConfig', function () {
return {
analyticsVisible: <?= $block->getNotification()->isAnalyticsVisible() ? 1 : 0; ?>,
releaseVisible: <?= $block->getNotification()->isReleaseVisible() ? 1 : 0; ?>,
Copy link
Contributor

@orlangur orlangur Jan 10, 2020

Choose a reason for hiding this comment

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

This change is not needed if it works with trailing comma.

Copy link
Contributor

@hostep hostep Jan 11, 2020

Choose a reason for hiding this comment

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

I agree with @orlangur here, keeping comma's in javascript objects or php arrays is a good thing, it gives a clearer diff in git when one or multiple lines are added if a comma already existed on the line above the new line.

For javascript, historically this was an issue in older Internet Explorer versions, they couldn't handle that, but according to this comment it was fixed in IE9 and higher and Magento only supports IE11, so we should be fine.

PHP is more and more encouraging this kind of syntax btw, PHP 7.3 got a new feature where arguments in function/method calls can now also have a trailing comma: https://www.php.net/manual/en/migration73.new-features.php#migration73.new-features.core.trailing-commas

Copy link
Contributor Author

@tejash-wagento tejash-wagento Jan 13, 2020

Choose a reason for hiding this comment

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

@orlangur, comma added after array,
Thanks for suggestion.

releaseVisible: <?= $block->getNotification()->isReleaseVisible() ? 1 : 0; ?>
}
});
</script>
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function render(DataObject $row)
$result .= $this->getColumn()->getEditOnly() ? ''
: '<span class="admin__grid-control-value">' . $this->_getValue($row) . '</span>';

return $result . $this->_getInputValueElement($row) . '</div>' ;
return $result . $this->_getInputValueElement($row) . '</div>';
}
return $this->_getValue($row);
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private function addVisibilityFilter(SearchCriteriaInterface $searchCriteria, bo
{
if ($isFilter && $isSearch) {
// Index already contains products filtered by visibility: catalog, search, both
return ;
return;
}
$visibilityIds = $isSearch
? $this->visibility->getVisibleInSearchIds()
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Csp/Model/Collector/CspWhitelistXml/SchemaLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class SchemaLocator implements SchemaLocatorInterface
*
* @var string
*/
private $schema ;
private $schema;

/**
* @param Reader $moduleReader
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ protected function setUp()

public function testGetOrder()
{
$this->assertSame($this->orderMock, $this->model->getOrder()) ;
$this->assertSame($this->orderMock, $this->model->getOrder());
}

public function testGetPayment()
{
$this->assertSame($this->paymentMock, $this->model->getPayment()) ;
$this->assertSame($this->paymentMock, $this->model->getPayment());
}
}
4 changes: 2 additions & 2 deletions app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class UpdateQuoteItemsTest extends \PHPUnit\Framework\TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\ResourceModel\Quote
*/
private $quoteResource ;
private $quoteResource;

protected function setUp()
{
Expand Down Expand Up @@ -58,7 +58,7 @@ public function aroundUpdateDataProvider()
[10, 20, 'once'],
[null, 10, 'never'],
[10, 10, 'never'],
[10, 10, 'once', true],
Copy link
Contributor

@orlangur orlangur Jan 10, 2020

Choose a reason for hiding this comment

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

This change is definitely not needed

Copy link
Contributor Author

@tejash-wagento tejash-wagento Jan 13, 2020

Choose a reason for hiding this comment

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

added comma after array

[10, 10, 'once', true]
];
}
}
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ protected function _addStoresFieldset($model, $form)
'fieldset_html_class' => 'store'
]
);
return ;
return;
}

$renderer = $this->getLayout()->createBlock(
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/table/editor_plugin_src.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@
var last;

// Skip empty text nodes form the end
for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;
for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling);

if (last && last.nodeName == 'TABLE')
ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');
Expand Down