Skip to content

Commit cf89cf0

Browse files
ajbonnerajbonner
committed
Use modern array syntax
1 parent df661f9 commit cf89cf0

Some content is hidden

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

44 files changed

+548
-549
lines changed

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Generate.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public function render(Varien_Data_Form_Element_Abstract $element)
3535
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
3636
{
3737
$originalData = $element->getOriginalData();
38-
$this->addData(array(
38+
$this->addData([
3939
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
4040
'html_id' => $element->getHtmlId(),
4141
'url' => Mage::getSingleton('adminhtml/url')->getUrl('*/setup/start')
42-
));
42+
]);
4343

4444
return $this->_toHtml();
4545
}
46-
}
46+
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/MagentoTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public function render(Varien_Data_Form_Element_Abstract $element)
3535
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
3636
{
3737
$originalData = $element->getOriginalData();
38-
$this->addData(array(
38+
$this->addData([
3939
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
4040
'html_id' => $element->getHtmlId(),
4141
'url' => Mage::getSingleton('adminhtml/url')->getUrl('*/setup/start')
42-
));
42+
]);
4343

4444
return $this->_toHtml();
4545
}
@@ -53,4 +53,4 @@ public function getAuthHeader()
5353
{
5454
return 'Token token="' . Mage::helper('zendesk')->getApiToken(false) . '"';
5555
}
56-
}
56+
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Signup.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public function render(Varien_Data_Form_Element_Abstract $element)
3535
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
3636
{
3737
$originalData = $element->getOriginalData();
38-
$this->addData(array(
38+
$this->addData([
3939
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
4040
'button_url' => Mage::helper('zendesk')->__($originalData['button_url']),
4141
'html_id' => $element->getHtmlId(),
4242
'url' => Mage::getSingleton('adminhtml/url')->getUrl('*/setup/start')
43-
));
43+
]);
4444

4545
return $this->_toHtml();
4646
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public function render(Varien_Data_Form_Element_Abstract $element)
3535
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
3636
{
3737
$originalData = $element->getOriginalData();
38-
$this->addData(array(
38+
$this->addData([
3939
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
4040
'html_id' => $element->getHtmlId(),
4141
'url' => Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/sync')
42-
));
42+
]);
4343

4444
return $this->_toHtml();
4545
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/ZendeskTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ public function render(Varien_Data_Form_Element_Abstract $element)
3535
protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
3636
{
3737
$originalData = $element->getOriginalData();
38-
$this->addData(array(
38+
$this->addData([
3939
'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
4040
'html_id' => $element->getHtmlId(),
4141
'url' => Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/checkOutbound')
42-
));
42+
]);
4343

4444
return $this->_toHtml();
4545
}
46-
}
46+
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Link.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
4242

4343
$url = Mage::helper('zendesk')->getUrl('raw', $path);
4444

45-
$this->addData(array('label' => $label, 'link_url' => $url));
45+
$this->addData(['label' => $label, 'link_url' => $url]);
4646

4747
return $this->_toHtml();
4848
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public function getHeaderText()
2929
{
3030
return Mage::helper('zendesk')->__('Please Select User to Add');
3131
}
32-
32+
3333
public function getButtonsHtml($area = null)
3434
{
35-
$addButtonData = array(
35+
$addButtonData = [
3636
'label' => Mage::helper('zendesk')->__('Select User'),
3737
'onclick' => 'showUsers()',
3838
'id' => 'show-users'
39-
);
39+
];
4040
return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
4141
}
4242

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function _prepareCollection()
4949
->addAttributeToSelect('firstname')
5050
->addAttributeToSelect('lastname')
5151
->addAttributeToSelect('email');
52-
52+
5353

5454
$this->setCollection($collection);
5555
return parent::_prepareCollection();
@@ -62,39 +62,39 @@ protected function _prepareCollection()
6262
*/
6363
protected function _prepareColumns()
6464
{
65-
$this->addColumn('entity_id', array(
65+
$this->addColumn('entity_id', [
6666
'header' => Mage::helper('zendesk')->__('ID'),
6767
'sortable' => true,
6868
'width' => '60',
6969
'index' => 'entity_id'
70-
));
71-
$this->addColumn('firstname', array(
70+
]);
71+
$this->addColumn('firstname', [
7272
'header' => Mage::helper('zendesk')->__('Firstname'),
7373
'index' => 'firstname'
74-
));
75-
$this->addColumn('lastname', array(
74+
]);
75+
$this->addColumn('lastname', [
7676
'header' => Mage::helper('zendesk')->__('Lastname'),
7777
'index' => 'lastname'
78-
));
79-
$this->addColumn('email', array(
78+
]);
79+
$this->addColumn('email', [
8080
'header' => Mage::helper('zendesk')->__('Email'),
8181
'index' => 'email'
82-
));
83-
$this->addColumn('action', array(
82+
]);
83+
$this->addColumn('action', [
8484
'header' => Mage::helper('zendesk')->__('Action'),
8585
'renderer' => 'zendesk/adminhtml_create_customer_grid_renderer_action',
8686
'filter' => false,
8787
'sortable' => false
88-
));
89-
88+
]);
89+
9090
return parent::_prepareColumns();
9191
}
9292

9393
public function getGridUrl()
9494
{
95-
return $this->getUrl('adminhtml/zendesk/loadBlock', array('block'=>'customer_grid', '_current' => true, 'collapse' => null));
95+
return $this->getUrl('adminhtml/zendesk/loadBlock', ['block'=>'customer_grid', '_current' => true, 'collapse' => null]);
9696
}
97-
97+
9898
public function getRowUrl($row)
9999
{
100100
return "";

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Edit extends Mage_Adminhtml_Block_W
2020
protected function _construct()
2121
{
2222
$this->_controller = false;
23-
parent::_construct();
23+
parent::_construct();
2424
}
2525

2626
protected function _preparelayout()
@@ -34,19 +34,19 @@ protected function _preparelayout()
3434
$data = Mage::registry('zendesk_create_data');
3535

3636
if(isset($data['order_id'])) {
37-
$this->_addButton('back', array(
37+
$this->_addButton('back', [
3838
'label' => Mage::helper('adminhtml')->__('Back'),
3939
'onclick' => 'setLocation(\'' . $this->getZdBackUrl($data['order_id']) . '\')',
4040
'class' => 'back',
41-
), -1);
41+
], -1);
4242
}
4343
}
4444

45-
$this->_addButton('save', array(
45+
$this->_addButton('save', [
4646
'label' => Mage::helper('zendesk')->__('Create Ticket'),
4747
'onclick' => 'editForm.submit();',
4848
'class' => 'save',
49-
), 1);
49+
], 1);
5050
$this->setChild('form', $this->getLayout()->createBlock('zendesk/adminhtml_create_edit_form'));
5151
return parent::_prepareLayout();
5252
}
@@ -65,13 +65,13 @@ public function getHeaderText()
6565
public function getZdBackUrl($orderId)
6666
{
6767
if (Mage::getSingleton('admin/session')->isAllowed('sales/order/actions/view')) {
68-
return $this->getUrl('adminhtml/sales_order/view', array('order_id' => $orderId));
68+
return $this->getUrl('adminhtml/sales_order/view', ['order_id' => $orderId]);
6969
}
7070
return false;
7171
}
7272

7373
public function getSaveUrl()
7474
{
75-
return $this->getUrl('*/*/save', array('_current' => true, 'back' => null));
75+
return $this->getUrl('*/*/save', ['_current' => true, 'back' => null]);
7676
}
7777
}

‎src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,104 +19,104 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Edit_form extends Mage_Adminhtml_Bl
1919
{
2020
protected function _prepareForm()
2121
{
22-
$form = new Varien_Data_Form(array(
22+
$form = new Varien_Data_Form([
2323
'id' => 'edit_form',
2424
'action' => $this->getData('action'),
2525
'method' => 'post'
26-
));
26+
]);
2727

28-
$fieldset = $form->addFieldset('base', array(
28+
$fieldset = $form->addFieldset('base', [
2929
'legend'=>Mage::helper('adminhtml')->__('New Ticket'),
3030
'class'=>'fieldset-wide'
31-
));
31+
]);
3232

33-
$fieldset->addField('requester', 'text', array(
33+
$fieldset->addField('requester', 'text', [
3434
'name' => 'requester',
3535
'label' => Mage::helper('zendesk')->__('Requester Email'),
3636
'title' => Mage::helper('zendesk')->__('Requester Email'),
3737
'required' => true,
3838
'class' => 'requester'
39-
));
39+
]);
4040

41-
$fieldset->addField('requester_name', 'text', array(
41+
$fieldset->addField('requester_name', 'text', [
4242
'name' => 'requester_name',
4343
'label' => Mage::helper('zendesk')->__('Requester Name'),
4444
'title' => Mage::helper('zendesk')->__('Requester Name'),
4545
'required' => false,
4646
'class' => 'requester'
47-
));
47+
]);
4848

4949
if(Mage::getModel('customer/customer')->getSharingConfig()->isWebsiteScope()) {
50-
$fieldset->addField('website_id', 'select', array(
50+
$fieldset->addField('website_id', 'select', [
5151
'name' => 'website_id',
5252
'label' => Mage::helper('zendesk')->__('Requester Website'),
5353
'title' => Mage::helper('zendesk')->__('Requester Website'),
5454
'required' => true,
5555
'values' => Mage::getModel('adminhtml/system_config_source_website')->toOptionArray(),
56-
));
56+
]);
5757
}
5858

59-
$fieldset->addField('subject', 'text', array(
59+
$fieldset->addField('subject', 'text', [
6060
'name' => 'subject',
6161
'label' => Mage::helper('zendesk')->__('Subject'),
6262
'title' => Mage::helper('zendesk')->__('Subject'),
6363
'required' => true
64-
));
65-
66-
$fieldset->addField('status', 'select', array(
64+
]);
65+
66+
$fieldset->addField('status', 'select', [
6767
'name' => 'status',
6868
'label' => Mage::helper('zendesk')->__('Status'),
6969
'title' => Mage::helper('zendesk')->__('Status'),
7070
'required' => true,
71-
'values' => array(
72-
array('label' => 'New', 'value' => 'new'),
73-
array('label' => 'Open', 'value' => 'open'),
74-
array('label' => 'Pending', 'value' => 'pending'),
75-
array('label' => 'Solved', 'value' => 'solved'),
76-
)
77-
));
78-
79-
$fieldset->addField('type', 'select', array(
71+
'values' => [
72+
['label' => 'New', 'value' => 'new'],
73+
['label' => 'Open', 'value' => 'open'],
74+
['label' => 'Pending', 'value' => 'pending'],
75+
['label' => 'Solved', 'value' => 'solved'],
76+
]
77+
]);
78+
79+
$fieldset->addField('type', 'select', [
8080
'name' => 'type',
8181
'label' => Mage::helper('zendesk')->__('Type'),
8282
'title' => Mage::helper('zendesk')->__('Type'),
8383
'required' => false,
84-
'values' => array(
85-
array('label' => '-', 'value' => ''),
86-
array('label' => 'Problem', 'value' => 'problem'),
87-
array('label' => 'Incident', 'value' => 'incident'),
88-
array('label' => 'Question', 'value' => 'question'),
89-
array('label' => 'Task', 'value' => 'task'),
90-
)
91-
));
92-
93-
$fieldset->addField('priority', 'select', array(
84+
'values' => [
85+
['label' => '-', 'value' => ''],
86+
['label' => 'Problem', 'value' => 'problem'],
87+
['label' => 'Incident', 'value' => 'incident'],
88+
['label' => 'Question', 'value' => 'question'],
89+
['label' => 'Task', 'value' => 'task'],
90+
]
91+
]);
92+
93+
$fieldset->addField('priority', 'select', [
9494
'name' => 'priority',
9595
'label' => Mage::helper('zendesk')->__('Priority'),
9696
'title' => Mage::helper('zendesk')->__('Priority'),
9797
'required' => false,
98-
'values' => array(
99-
array('label' => 'Low', 'value' => 'low'),
100-
array('label' => 'Normal', 'value' => 'normal'),
101-
array('label' => 'High', 'value' => 'high'),
102-
array('label' => 'Urgent', 'value' => 'urgent'),
103-
)
104-
));
105-
106-
$fieldset->addField('order', 'text', array(
98+
'values' => [
99+
['label' => 'Low', 'value' => 'low'],
100+
['label' => 'Normal', 'value' => 'normal'],
101+
['label' => 'High', 'value' => 'high'],
102+
['label' => 'Urgent', 'value' => 'urgent'],
103+
]
104+
]);
105+
106+
$fieldset->addField('order', 'text', [
107107
'name' => 'order',
108108
'label' => Mage::helper('zendesk')->__('Order Number'),
109109
'title' => Mage::helper('zendesk')->__('Order Number'),
110110
'required' => false
111-
));
111+
]);
112112

113-
$fieldset->addField('description', 'textarea', array(
113+
$fieldset->addField('description', 'textarea', [
114114
'name' => 'description',
115115
'label' => Mage::helper('zendesk')->__('Description'),
116116
'title' => Mage::helper('zendesk')->__('Description'),
117117
'required' => true
118-
));
119-
118+
]);
119+
120120
if (Mage::registry('zendesk_create_data')) {
121121
$form->setValues(Mage::registry('zendesk_create_data'));
122122
}

0 commit comments

Comments
 (0)