Merge branch 'OpenMage:main' into OAuth2

Author: hirale

.php-cs-fixer.dist.php

@@ -63,6 +63,8 @@
         'no_trailing_whitespace_in_comment' => true,
         // Remove trailing whitespace at the end of blank lines.
         'no_whitespace_in_blank_line' => true,
+        // Adds or removes ? before single type declarations or |null at the end of union types when parameters have a default null value.
+        'nullable_type_declaration_for_default_null_value' => true,
         // Orders the elements of classes/interfaces/traits.
         'ordered_class_elements' => false,
         // Ordering `use` statements.

app/Mage.php

@@ -213,7 +213,7 @@ public static function getOpenMageVersionInfo(): array
         if (self::getOpenMageMajorVersion() === 20) {
             return [
                 'major'     => '20',
-                'minor'     => '9',
+                'minor'     => '10',
                 'patch'     => '0',
                 'stability' => '', // beta,alpha,rc
                 'number'    => '', // 1,2,3,0.3.7,x.7.z.92 @see https://semver.org/#spec-item-9

app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php

@@ -32,8 +32,8 @@ class Mage_Admin_Model_Acl_Assert_Ip implements Zend_Acl_Assert_Interface
      */
     public function assert(
         Mage_Admin_Model_Acl $acl,
-        Mage_Admin_Model_Acl_Role $role = null,
-        Mage_Admin_Model_Acl_Resource $resource = null,
+        ?Mage_Admin_Model_Acl_Role $role = null,
+        ?Mage_Admin_Model_Acl_Resource $resource = null,
         $privilege = null
     ) {
         return $this->_isCleanIP(Mage::helper('core/http')->getRemoteAddr());

app/code/core/Mage/Admin/Model/Acl/Assert/Time.php

@@ -32,8 +32,8 @@ class Mage_Admin_Model_Acl_Assert_Time implements Zend_Acl_Assert_Interface
      */
     public function assert(
         Mage_Admin_Model_Acl $acl,
-        Mage_Admin_Model_Acl_Role $role = null,
-        Mage_Admin_Model_Acl_Resource $resource = null,
+        ?Mage_Admin_Model_Acl_Role $role = null,
+        ?Mage_Admin_Model_Acl_Resource $resource = null,
         $privilege = null
     ) {
         return $this->_isCleanTime(time());

app/code/core/Mage/Admin/Model/Redirectpolicy.php

@@ -45,7 +45,7 @@ public function __construct($parameters = [])
      */
     public function getRedirectUrl(
         Mage_Admin_Model_User $user,
-        Zend_Controller_Request_Http $request = null,
+        ?Zend_Controller_Request_Http $request = null,
         $alternativeUrl = null
     ) {
         if (empty($request)) {

app/code/core/Mage/Admin/Model/Roles.php

@@ -123,7 +123,7 @@ public function getRoleUsers()
      * @return Varien_Simplexml_Element|false|array
      */
     protected function _buildResourcesArray(
-        Varien_Simplexml_Element $resource = null,
+        ?Varien_Simplexml_Element $resource = null,
         $parentName = null,
         $level = 0,
         $represent2Darray = null,

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php

@@ -54,7 +54,7 @@ public function getProduct()
      * @param Mage_Catalog_Model_Product|null $product
      * @return $this
      */
-    public function setProduct(Mage_Catalog_Model_Product $product = null)
+    public function setProduct(?Mage_Catalog_Model_Product $product = null)
     {
         $this->_product = $product;
         return $this;

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php

@@ -82,7 +82,7 @@ protected function _beforeToHtml()
                 ]);
             }
 
-            if (Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings')) {
+            if (Mage::helper('core')->isModuleOutputEnabled('Mage_Review') && Mage::getSingleton('admin/session')->isAllowed('catalog/reviews_ratings')) {
                 $this->addTab('reviews', [
                     'label'     => Mage::helper('customer')->__('Product Reviews'),
                     'class'     => 'ajax',

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Grid.php

@@ -21,6 +21,16 @@
  */
 class Mage_Adminhtml_Block_Newsletter_Template_Grid extends Mage_Adminhtml_Block_Widget_Grid
 {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('newsletterTemplateGrid');
+        $this->setDefaultSort('template_code');
+        $this->setDefaultDir('desc');
+        $this->setSaveParametersInSession(true);
+        $this->setUseAjax(true);
+    }
+
     protected function _construct()
     {
         $this->setEmptyText(Mage::helper('newsletter')->__('No Templates Found'));

app/code/core/Mage/Adminhtml/Controller/Action.php

@@ -367,7 +367,7 @@ protected function _redirect($path, $arguments = [])
         return $this;
     }
 
-    protected function _forward($action, $controller = null, $module = null, array $params = null)
+    protected function _forward($action, $controller = null, $module = null, ?array $params = null)
     {
         $this->_getSession()->setIsUrlNotice($this->getFlag('', self::FLAG_IS_URLS_CHECKED));
         return parent::_forward($action, $controller, $module, $params);