Skip to content

Commit 382738e

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-43072' into PR-2
2 parents 33793b4 + b5d3927 commit 382738e

File tree

184 files changed

+2159
-1148
lines changed

Some content is hidden

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

184 files changed

+2159
-1148
lines changed

‎app/code/Magento/AdminNotification/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="controller_action_predispatch">
10-
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" method="execute" />
10+
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" />
1111
</event>
1212
</config>

‎app/code/Magento/Authorizenet/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="checkout_submit_all_after">
10-
<observer name="directpost_update_all_edit_increments" instance="Magento\Authorizenet\Observer\UpdateAllEditIncrementsObserver" method="execute" />
10+
<observer name="directpost_update_all_edit_increments" instance="Magento\Authorizenet\Observer\UpdateAllEditIncrementsObserver" />
1111
</event>
1212
</config>

‎app/code/Magento/Authorizenet/etc/frontend/events.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="checkout_submit_all_after">
10-
<observer name="directpost_save_order_after_submit" instance="Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver" method="execute" />
10+
<observer name="directpost_save_order_after_submit" instance="Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver" />
1111
</event>
1212
<event name="checkout_directpost_placeOrder">
13-
<observer name="directpost_save_order_onepage" instance="Magento\Authorizenet\Observer\AddFieldsToResponseObserver" method="execute" />
13+
<observer name="directpost_save_order_onepage" instance="Magento\Authorizenet\Observer\AddFieldsToResponseObserver" />
1414
</event>
1515
</config>

‎app/code/Magento/Braintree/etc/events.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="sales_order_shipment_save_after">
10-
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreePayment" method="execute" />
10+
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreePayment" />
1111
</event>
1212
<event name="customer_delete_commit_after">
13-
<observer name="braintree" instance="Magento\Braintree\Observer\DeleteBraintreeCustomer" method="execute" />
13+
<observer name="braintree" instance="Magento\Braintree\Observer\DeleteBraintreeCustomer" />
1414
</event>
1515
<event name="checkout_submit_before">
16-
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreeAddress" method="execute" />
16+
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreeAddress" />
1717
</event>
1818
</config>

‎app/code/Magento/Braintree/etc/frontend/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="shortcut_buttons_container">
10-
<observer name="braintree_paypal_shortcuts" instance="Magento\Braintree\Observer\AddPaypalShortcuts" method="execute" />
10+
<observer name="braintree_paypal_shortcuts" instance="Magento\Braintree\Observer\AddPaypalShortcuts" />
1111
</event>
1212
</config>

‎app/code/Magento/Bundle/etc/adminhtml/events.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="catalog_product_edit_action">
10-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" method="execute" />
10+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" />
1111
</event>
1212
<event name="catalog_product_new_action">
13-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" method="execute" />
13+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" />
1414
</event>
1515
</config>

‎app/code/Magento/Bundle/etc/frontend/events.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="catalog_product_upsell">
10-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\AppendUpsellProductsObserver" method="execute"/>
10+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\AppendUpsellProductsObserver"/>
1111
</event>
1212
<event name="catalog_product_collection_load_after">
13-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\LoadProductOptionsObserver" method="execute"/>
13+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\LoadProductOptionsObserver"/>
1414
</event>
1515
<event name="product_option_renderer_init">
16-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\InitOptionRendererObserver" method="execute"/>
16+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\InitOptionRendererObserver"/>
1717
</event>
1818
</config>

‎app/code/Magento/CacheInvalidate/etc/events.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,45 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="clean_cache_by_tags">
10-
<observer name="invalidate_varnish" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
10+
<observer name="invalidate_varnish" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
1111
</event>
1212
<event name="adminhtml_cache_flush_system">
13-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver" method="execute"/>
13+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver"/>
1414
</event>
1515
<event name="clean_media_cache_after">
16-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver" method="execute"/>
16+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver"/>
1717
</event>
1818
<event name="clean_catalog_images_cache_after">
19-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver" method="execute"/>
19+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver"/>
2020
</event>
2121
<event name="assigned_theme_changed">
22-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
22+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
2323
</event>
2424
<event name="catalogrule_after_apply">
25-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
25+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
2626
</event>
2727
<event name="adminhtml_cache_refresh_type">
28-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver" method="execute"/>
28+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver"/>
2929
</event>
3030
<event name="adminhtml_cache_flush_all">
31-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver" method="execute"/>
31+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver"/>
3232
</event>
3333
<event name="assign_theme_to_stores_after">
34-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver" method="execute"/>
34+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\FlushAllCacheObserver"/>
3535
</event>
3636
<event name="controller_action_postdispatch_adminhtml_system_currency_saveRates">
37-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
37+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
3838
</event>
3939
<event name="controller_action_postdispatch_adminhtml_system_config_save">
40-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
40+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
4141
</event>
4242
<event name="controller_action_postdispatch_adminhtml_catalog_product_action_attribute_save">
43-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
43+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
4444
</event>
4545
<event name="controller_action_postdispatch_adminhtml_catalog_product_massStatus">
46-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
46+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
4747
</event>
4848
<event name="controller_action_postdispatch_adminhtml_system_currencysymbol_save">
49-
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver" method="execute"/>
49+
<observer name="flush_varnish_pagecache" instance="Magento\CacheInvalidate\Observer\InvalidateVarnishObserver"/>
5050
</event>
5151
</config>

‎app/code/Magento/Captcha/etc/adminhtml/events.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="controller_action_predispatch_adminhtml_auth_forgotpassword">
10-
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserForgotPasswordBackendObserver" method="execute" />
10+
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserForgotPasswordBackendObserver" />
1111
</event>
1212
<event name="controller_action_predispatch_customer_account_forgotpasswordpost">
13-
<observer name="captcha" instance="Magento\Captcha\Observer\CheckForgotpasswordObserver" method="execute" />
13+
<observer name="captcha" instance="Magento\Captcha\Observer\CheckForgotpasswordObserver" />
1414
</event>
1515
</config>

‎app/code/Magento/Captcha/etc/events.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="controller_action_predispatch_customer_account_loginPost">
10-
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserLoginObserver" method="execute" />
10+
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserLoginObserver" />
1111
</event>
1212
<event name="controller_action_predispatch_customer_account_createpost">
13-
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserCreateObserver" method="execute" />
13+
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserCreateObserver" />
1414
</event>
1515
<event name="controller_action_predispatch_customer_account_forgotpasswordpost">
16-
<observer name="captcha" instance="Magento\Captcha\Observer\CheckForgotpasswordObserver" method="execute"/>
16+
<observer name="captcha" instance="Magento\Captcha\Observer\CheckForgotpasswordObserver"/>
1717
</event>
1818
<event name="admin_user_authenticate_before">
19-
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserLoginBackendObserver" method="execute" />
19+
<observer name="captcha" instance="Magento\Captcha\Observer\CheckUserLoginBackendObserver" />
2020
</event>
2121
<event name="controller_action_predispatch_checkout_onepage_saveBilling">
22-
<observer name="captcha_guest" instance="Magento\Captcha\Observer\CheckGuestCheckoutObserver" method="execute" />
23-
<observer name="captcha_register" instance="Magento\Captcha\Observer\CheckRegisterCheckoutObserver" method="execute" />
22+
<observer name="captcha_guest" instance="Magento\Captcha\Observer\CheckGuestCheckoutObserver" />
23+
<observer name="captcha_register" instance="Magento\Captcha\Observer\CheckRegisterCheckoutObserver" />
2424
</event>
2525
<event name="customer_customer_authenticated">
26-
<observer name="captcha_reset_attempt" instance="Magento\Captcha\Observer\ResetAttemptForFrontendObserver" method="execute" />
26+
<observer name="captcha_reset_attempt" instance="Magento\Captcha\Observer\ResetAttemptForFrontendObserver" />
2727
</event>
2828
<event name="backend_auth_user_login_success">
29-
<observer name="captcha_reset_attempt" instance="Magento\Captcha\Observer\ResetAttemptForBackendObserver" method="execute" />
29+
<observer name="captcha_reset_attempt" instance="Magento\Captcha\Observer\ResetAttemptForBackendObserver" />
3030
</event>
3131
</config>

0 commit comments

Comments
 (0)