Skip to content

Commit 675aa3d

Browse files
MAGETWO-53549: [Github][PR] Replace fabpot/php-cs-fixer with friendsofphp/php-cs-fixer #4791
2 parents a7d582d + 1630c06 commit 675aa3d

File tree

7,515 files changed

+90764
-50168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,515 files changed

+90764
-50168
lines changed

.php_cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ return Symfony\CS\Config\Config::create()
3333
'extra_empty_lines',
3434
'include',
3535
'join_function',
36-
'multiline_array_trailing_comma',
3736
'namespace_no_leading_whitespace',
3837
'new_with_braces',
3938
'object_operator',

Gruntfile.js.sample

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,19 @@
55

66
// For performance use one level down: 'name/{,*/}*.js'
77
// If you want to recursively match all subfolders, use: 'name/**/*.js'
8+
89
module.exports = function (grunt) {
910
'use strict';
1011

1112
var _ = require('underscore'),
1213
path = require('path'),
13-
themes = require('./dev/tools/grunt/configs/themes'),
14+
filesRouter = require('./dev/tools/grunt/tools/files-router'),
1415
configDir = './dev/tools/grunt/configs',
15-
tasks = grunt.file.expand('./dev/tools/grunt/tasks/*');
16+
tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'),
17+
themes;
18+
19+
filesRouter.set('themes', 'dev/tools/grunt/configs/themes');
20+
themes = filesRouter.get('themes');
1621

1722
tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
1823
tasks.push('time-grunt');

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function execute()
2222
$responseData = [];
2323
try {
2424
$this->_objectManager->create(
25-
'Magento\AdminNotification\Model\NotificationService'
25+
\Magento\AdminNotification\Model\NotificationService::class
2626
)->markAsRead(
2727
$notificationId
2828
);
@@ -31,7 +31,7 @@ public function execute()
3131
$responseData['success'] = false;
3232
}
3333
$this->getResponse()->representJson(
34-
$this->_objectManager->create('Magento\Framework\Json\Helper\Data')->jsonEncode($responseData)
34+
$this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
3535
);
3636
}
3737
}

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function execute()
2424
if ($notificationId) {
2525
try {
2626
$this->_objectManager->create(
27-
'Magento\AdminNotification\Model\NotificationService'
27+
\Magento\AdminNotification\Model\NotificationService::class
2828
)->markAsRead(
2929
$notificationId
3030
);

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
30-
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
30+
$model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
3131
if ($model->getId()) {
3232
$model->setIsRead(1)->save();
3333
}

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
30-
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
30+
$model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
3131
if ($model->getId()) {
3232
$model->setIsRemove(1)->save();
3333
}

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notificatio
2222
public function execute()
2323
{
2424
if ($id = $this->getRequest()->getParam('id')) {
25-
$model = $this->_objectManager->create('Magento\AdminNotification\Model\Inbox')->load($id);
25+
$model = $this->_objectManager->create(\Magento\AdminNotification\Model\Inbox::class)->load($id);
2626

2727
if (!$model->getId()) {
2828
$this->_redirect('adminhtml/*/');

app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierIn
3838
*/
3939
protected function _construct()
4040
{
41-
$this->_init('Magento\AdminNotification\Model\ResourceModel\Inbox');
41+
$this->_init(\Magento\AdminNotification\Model\ResourceModel\Inbox::class);
4242
}
4343

4444
/**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
1919
*/
2020
protected function _construct()
2121
{
22-
$this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
22+
$this->_init(
23+
\Magento\AdminNotification\Model\Inbox::class,
24+
\Magento\AdminNotification\Model\ResourceModel\Inbox::class
25+
);
2326
}
2427

2528
/**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\Abst
1616
*/
1717
protected function _construct()
1818
{
19-
$this->_init('Magento\AdminNotification\Model\Inbox', 'Magento\AdminNotification\Model\ResourceModel\Inbox');
19+
$this->_init(
20+
\Magento\AdminNotification\Model\Inbox::class,
21+
\Magento\AdminNotification\Model\ResourceModel\Inbox::class
22+
);
2023
}
2124

2225
/**

0 commit comments

Comments
 (0)