Skip to content

Commit c47df5b

Browse files
sreichelkiatng
andauthored
Install TinyMCE 7.5 via composer (OpenMage#4113)
* Rector: CQ - UnusedForeachValueToArrayKeysRector (#1) * Rector: CQ - UnusedForeachValueToArrayKeysRector See Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector * fixes + phpstan See fix at rector: rectorphp/rector-src#6164 * Install TinyMCE via composer * Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)" This reverts commit 3d7eaf6. * Install TinyMCE via composer * Back to v6.8 * Updated phpstan.dist.baseline.neon for updated composer.lock * Fixed merge conflict * Updated TinyMCE to v7.3 * Typo * Updated composer.lock * Updated to 7.4 * Added license-key, updated to 7.4.1 * Updated .phpstan.dist.baseline.neon * Moved block files from adminhtml/cms to cms/adminhtml * Removed unused test * Updated phpstorm meta files * typos + phpstan baseline * Pinned plugin commit until there is no release * Use plugin 1.1 release * rector * Merge branch 'main' into tinymce # Conflicts: # composer.lock * Fixed merge error * Revert "Moved block files from adminhtml/cms to cms/adminhtml" This reverts commit 3641080 * removed previously added files * removed previously added classes from meta files * Fixed composer * Updated composer * Updated composer * Updated composer * composer plugin * Updated plugin for tests [skip ci] * Updated plugin * updated composer plug-in --------- Co-authored-by: Ng Kiat Siong <kiatsiong.ng@gmail.com>
1 parent cf3fbe6 commit c47df5b

File tree

205 files changed

+4900
-11809
lines changed

Some content is hidden

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

205 files changed

+4900
-11809
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
/app/etc/modules/Cm_RedisSession.xml
2424
/lib/Credis
2525

26+
# TinyMCE library
27+
/js/tinymce
28+
2629
# Add development environment setup files and README
2730
# https://github.com/OpenMage/magento-lts/pull/1012
2831
/dev/openmage/docker-magento

.phpstorm.meta.php/magento_blocks.meta.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,7 @@
10531053
'install/locale' => \Mage_Install_Block_Locale::class,
10541054
'install/state' => \Mage_Install_Block_State::class,
10551055
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
1056+
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
10561057
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
10571058
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
10581059
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,

.phpstorm.meta.php/magento_blocks_methods.meta.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,6 +1053,7 @@
10531053
'install/locale' => \Mage_Install_Block_Locale::class,
10541054
'install/state' => \Mage_Install_Block_State::class,
10551055
'newsletter/subscribe' => \Mage_Newsletter_Block_Subscribe::class,
1056+
'newsletter/widget_subscribe' => \Mage_Newsletter_Block_Widget_Subscribe::class,
10561057
'oauth/adminhtml_oauth_admin_token' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token::class,
10571058
'oauth/adminhtml_oauth_admin_token_grid' => \Mage_Oauth_Block_Adminhtml_Oauth_Admin_Token_Grid::class,
10581059
'oauth/adminhtml_oauth_authorize' => \Mage_Oauth_Block_Adminhtml_Oauth_Authorize::class,

.phpstorm.meta.php/magento_helpers.meta.php

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
namespace PHPSTORM_META {
33
override( \Mage::helper(0),
44
map( [
5-
'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
65
'adminnotification/data' => \Mage_AdminNotification_Helper_Data::class,
6+
'adminnotification' => \Mage_AdminNotification_Helper_Data::class,
77
'admin/block' => \Mage_Admin_Helper_Block::class,
8-
'admin' => \Mage_Admin_Helper_Data::class,
98
'admin/data' => \Mage_Admin_Helper_Data::class,
9+
'admin' => \Mage_Admin_Helper_Data::class,
1010
'admin/rules_fallback' => \Mage_Admin_Helper_Rules_Fallback::class,
1111
'admin/variable' => \Mage_Admin_Helper_Variable::class,
1212
'adminhtml/addresses' => \Mage_Adminhtml_Helper_Addresses::class,
@@ -24,10 +24,10 @@
2424
'adminhtml/media_js' => \Mage_Adminhtml_Helper_Media_Js::class,
2525
'adminhtml/rss' => \Mage_Adminhtml_Helper_Rss::class,
2626
'adminhtml/sales' => \Mage_Adminhtml_Helper_Sales::class,
27-
'api2' => \Mage_Api2_Helper_Data::class,
2827
'api2/data' => \Mage_Api2_Helper_Data::class,
29-
'api' => \Mage_Api_Helper_Data::class,
28+
'api2' => \Mage_Api2_Helper_Data::class,
3029
'api/data' => \Mage_Api_Helper_Data::class,
30+
'api' => \Mage_Api_Helper_Data::class,
3131
'authorizenet/admin' => \Mage_Authorizenet_Helper_Admin::class,
3232
'authorizenet/data' => \Mage_Authorizenet_Helper_Data::class,
3333
'authorizenet' => \Mage_Authorizenet_Helper_Data::class,
@@ -36,8 +36,8 @@
3636
'bundle' => \Mage_Bundle_Helper_Data::class,
3737
'captcha' => \Mage_Captcha_Helper_Data::class,
3838
'captcha/data' => \Mage_Captcha_Helper_Data::class,
39-
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
4039
'cataloginventory/data' => \Mage_CatalogInventory_Helper_Data::class,
40+
'cataloginventory' => \Mage_CatalogInventory_Helper_Data::class,
4141
'cataloginventory/minsaleqty' => \Mage_CatalogInventory_Helper_Minsaleqty::class,
4242
'catalogrule' => \Mage_CatalogRule_Helper_Data::class,
4343
'catalogrule/data' => \Mage_CatalogRule_Helper_Data::class,
@@ -64,8 +64,8 @@
6464
'centinel/data' => \Mage_Centinel_Helper_Data::class,
6565
'centinel' => \Mage_Centinel_Helper_Data::class,
6666
'checkout/cart' => \Mage_Checkout_Helper_Cart::class,
67-
'checkout' => \Mage_Checkout_Helper_Data::class,
6867
'checkout/data' => \Mage_Checkout_Helper_Data::class,
68+
'checkout' => \Mage_Checkout_Helper_Data::class,
6969
'checkout/url' => \Mage_Checkout_Helper_Url::class,
7070
'cms' => \Mage_Cms_Helper_Data::class,
7171
'cms/data' => \Mage_Cms_Helper_Data::class,
@@ -81,8 +81,8 @@
8181
'core/abstract' => \Mage_Core_Helper_Abstract::class,
8282
'core/array' => \Mage_Core_Helper_Array::class,
8383
'core/cookie' => \Mage_Core_Helper_Cookie::class,
84-
'core/data' => \Mage_Core_Helper_Data::class,
8584
'core' => \Mage_Core_Helper_Data::class,
85+
'core/data' => \Mage_Core_Helper_Data::class,
8686
'core/environmentConfigLoader' => \Mage_Core_Helper_EnvironmentConfigLoader::class,
8787
'core/file_storage' => \Mage_Core_Helper_File_Storage::class,
8888
'core/file_storage_database' => \Mage_Core_Helper_File_Storage_Database::class,
@@ -99,8 +99,8 @@
9999
'currencysymbol' => \Mage_CurrencySymbol_Helper_Data::class,
100100
'currencysymbol/data' => \Mage_CurrencySymbol_Helper_Data::class,
101101
'customer/address' => \Mage_Customer_Helper_Address::class,
102-
'customer' => \Mage_Customer_Helper_Data::class,
103102
'customer/data' => \Mage_Customer_Helper_Data::class,
103+
'customer' => \Mage_Customer_Helper_Data::class,
104104
'dataflow/data' => \Mage_Dataflow_Helper_Data::class,
105105
'dataflow' => \Mage_Dataflow_Helper_Data::class,
106106
'directory' => \Mage_Directory_Helper_Data::class,
@@ -111,57 +111,57 @@
111111
'downloadable/data' => \Mage_Downloadable_Helper_Data::class,
112112
'downloadable/download' => \Mage_Downloadable_Helper_Download::class,
113113
'downloadable/file' => \Mage_Downloadable_Helper_File::class,
114-
'eav' => \Mage_Eav_Helper_Data::class,
115114
'eav/data' => \Mage_Eav_Helper_Data::class,
116-
'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
115+
'eav' => \Mage_Eav_Helper_Data::class,
117116
'giftmessage/data' => \Mage_GiftMessage_Helper_Data::class,
117+
'giftmessage' => \Mage_GiftMessage_Helper_Data::class,
118118
'giftmessage/message' => \Mage_GiftMessage_Helper_Message::class,
119119
'giftmessage/url' => \Mage_GiftMessage_Helper_Url::class,
120120
'googleanalytics/data' => \Mage_GoogleAnalytics_Helper_Data::class,
121121
'googleanalytics' => \Mage_GoogleAnalytics_Helper_Data::class,
122122
'importexport/data' => \Mage_ImportExport_Helper_Data::class,
123123
'importexport' => \Mage_ImportExport_Helper_Data::class,
124-
'index' => \Mage_Index_Helper_Data::class,
125124
'index/data' => \Mage_Index_Helper_Data::class,
125+
'index' => \Mage_Index_Helper_Data::class,
126126
'install' => \Mage_Install_Helper_Data::class,
127127
'install/data' => \Mage_Install_Helper_Data::class,
128128
'log/data' => \Mage_Log_Helper_Data::class,
129129
'log' => \Mage_Log_Helper_Data::class,
130-
'media/data' => \Mage_Media_Helper_Data::class,
131130
'media' => \Mage_Media_Helper_Data::class,
131+
'media/data' => \Mage_Media_Helper_Data::class,
132132
'newsletter' => \Mage_Newsletter_Helper_Data::class,
133133
'newsletter/data' => \Mage_Newsletter_Helper_Data::class,
134-
'oauth' => \Mage_Oauth_Helper_Data::class,
135134
'oauth/data' => \Mage_Oauth_Helper_Data::class,
136-
'page' => \Mage_Page_Helper_Data::class,
135+
'oauth' => \Mage_Oauth_Helper_Data::class,
137136
'page/data' => \Mage_Page_Helper_Data::class,
137+
'page' => \Mage_Page_Helper_Data::class,
138138
'page/html' => \Mage_Page_Helper_Html::class,
139139
'page/layout' => \Mage_Page_Helper_Layout::class,
140-
'payment' => \Mage_Payment_Helper_Data::class,
141140
'payment/data' => \Mage_Payment_Helper_Data::class,
141+
'payment' => \Mage_Payment_Helper_Data::class,
142142
'paypaluk/data' => \Mage_PaypalUk_Helper_Data::class,
143143
'paypaluk' => \Mage_PaypalUk_Helper_Data::class,
144144
'paypal/checkout' => \Mage_Paypal_Helper_Checkout::class,
145-
'paypal/data' => \Mage_Paypal_Helper_Data::class,
146145
'paypal' => \Mage_Paypal_Helper_Data::class,
146+
'paypal/data' => \Mage_Paypal_Helper_Data::class,
147147
'paypal/hss' => \Mage_Paypal_Helper_Hss::class,
148148
'persistent' => \Mage_Persistent_Helper_Data::class,
149149
'persistent/data' => \Mage_Persistent_Helper_Data::class,
150150
'persistent/session' => \Mage_Persistent_Helper_Session::class,
151-
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
152151
'productalert' => \Mage_ProductAlert_Helper_Data::class,
153-
'rating/data' => \Mage_Rating_Helper_Data::class,
152+
'productalert/data' => \Mage_ProductAlert_Helper_Data::class,
154153
'rating' => \Mage_Rating_Helper_Data::class,
155-
'reports' => \Mage_Reports_Helper_Data::class,
154+
'rating/data' => \Mage_Rating_Helper_Data::class,
156155
'reports/data' => \Mage_Reports_Helper_Data::class,
156+
'reports' => \Mage_Reports_Helper_Data::class,
157157
'review' => \Mage_Review_Helper_Data::class,
158158
'review/data' => \Mage_Review_Helper_Data::class,
159159
'rss/catalog' => \Mage_Rss_Helper_Catalog::class,
160160
'rss' => \Mage_Rss_Helper_Data::class,
161161
'rss/data' => \Mage_Rss_Helper_Data::class,
162162
'rss/order' => \Mage_Rss_Helper_Order::class,
163-
'rule' => \Mage_Rule_Helper_Data::class,
164163
'rule/data' => \Mage_Rule_Helper_Data::class,
164+
'rule' => \Mage_Rule_Helper_Data::class,
165165
'salesrule/coupon' => \Mage_SalesRule_Helper_Coupon::class,
166166
'salesrule' => \Mage_SalesRule_Helper_Data::class,
167167
'salesrule/data' => \Mage_SalesRule_Helper_Data::class,
@@ -175,12 +175,12 @@
175175
'shipping/data' => \Mage_Shipping_Helper_Data::class,
176176
'sitemap' => \Mage_Sitemap_Helper_Data::class,
177177
'sitemap/data' => \Mage_Sitemap_Helper_Data::class,
178-
'tag' => \Mage_Tag_Helper_Data::class,
179178
'tag/data' => \Mage_Tag_Helper_Data::class,
179+
'tag' => \Mage_Tag_Helper_Data::class,
180180
'tax/data' => \Mage_Tax_Helper_Data::class,
181181
'tax' => \Mage_Tax_Helper_Data::class,
182-
'uploader/data' => \Mage_Uploader_Helper_Data::class,
183182
'uploader' => \Mage_Uploader_Helper_Data::class,
183+
'uploader/data' => \Mage_Uploader_Helper_Data::class,
184184
'uploader/file' => \Mage_Uploader_Helper_File::class,
185185
'usa' => \Mage_Usa_Helper_Data::class,
186186
'usa/data' => \Mage_Usa_Helper_Data::class,

0 commit comments

Comments
 (0)