Merge branch 'main' into phpunit-2

OpenMage · Nov 11, 2024 · 46f3234 · 46f3234
2 parents 6c159e8 + 258e6b0
commit 46f3234
Show file tree

Hide file tree

Showing 26 changed files with 848 additions and 37 deletions.
diff --git a/.github/workflows/phpcs.yml b/.github/workflows/phpcs.yml
@@ -45,4 +45,3 @@ jobs:
 
       - name: PHPCodeSniffer
         run: php vendor/bin/phpcs -s --report=full --standard=${{ matrix.rules.path }}
-        continue-on-error: ${{ matrix.rules.path == '.phpcs.ecg.xml.dist' }}
diff --git a/.phpcs.ecg.xml.dist b/.phpcs.ecg.xml.dist
@@ -44,6 +44,7 @@
         <exclude-pattern>*/core/Mage/Adminhtml/Model/System/Config/Backend/Category.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Adminhtml/Model/System/Config/Backend/Customer/Show/Customer.php*</exclude-pattern>
+        <exclude-pattern>*/core/Mage/Api/Model/Acl/Role/Registry.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Api/Model/Resource/User.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Api2/Model/Observer.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Api2/controllers/Adminhtml/Api2/AttributeController.php*</exclude-pattern>

diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php
@@ -171,6 +171,6 @@ public function getCategoryUrlPath($urlPath, $slash = false, $storeId = null)
      */
     public function canUseCanonicalTag($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_USE_CATEGORY_CANONICAL_TAG, $store);
+        return Mage::getStoreConfigFlag(self::XML_PATH_USE_CATEGORY_CANONICAL_TAG, $store);
     }
 }
diff --git a/app/code/core/Mage/Catalog/Helper/Product.php b/app/code/core/Mage/Catalog/Helper/Product.php
@@ -229,7 +229,7 @@ public function getProductUrlSuffix($storeId = null)
      */
     public function canUseCanonicalTag($store = null)
     {
-        return Mage::getStoreConfig(self::XML_PATH_USE_PRODUCT_CANONICAL_TAG, $store);
+        return Mage::getStoreConfigFlag(self::XML_PATH_USE_PRODUCT_CANONICAL_TAG, $store);
     }
 
     /**

diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule.php
@@ -183,8 +183,8 @@ public function insertRuleData(Mage_CatalogRule_Model_Rule $rule, array $website
 
         $customerGroupIds = $rule->getCustomerGroupIds();
 
-        $fromTime = (int) Mage::getModel('core/date')->gmtTimestamp(strtotime($rule->getFromDate()));
-        $toTime = (int) Mage::getModel('core/date')->gmtTimestamp(strtotime($rule->getToDate()));
+        $fromTime = (int) Mage::getModel('core/date')->gmtTimestamp(strtotime((string) $rule->getFromDate()));
+        $toTime = (int) Mage::getModel('core/date')->gmtTimestamp(strtotime((string) $rule->getToDate()));
         $toTime = $toTime ? ($toTime + self::SECONDS_IN_DAY - 1) : 0;
 
         $timestamp = time();

diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
@@ -464,6 +464,7 @@ public function setChild($alias, $block)
 
         $block->setParentBlock($this);
         $block->setBlockAlias($alias);
+        $this->unsetChild($alias);
         $this->_children[$alias] = $block;
         return $this;
     }
@@ -482,7 +483,7 @@ public function unsetChild($alias)
             unset($this->_children[$alias]);
             $key = array_search($name, $this->_sortedChildren);
             if ($key !== false) {
-                unset($this->_sortedChildren[$key]);
+                array_splice($this->_sortedChildren, $key, 1);
             }
         }
 
@@ -741,7 +742,6 @@ public function insert($block, $siblingName = '', $after = false, $alias = '')
      */
     public function sortChildren($force = false)
     {
-        $this->_sortedChildren = array_values($this->_sortedChildren); // reset indexes which might have gaps after unsetting blocks
         foreach ($this->_sortInstructions as $name => $list) {
             list($siblingName, $after, $exists) = $list;
             if ($exists && !$force) {

diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
@@ -874,7 +874,7 @@ public function getStore($id = null)
             return $id;
         }
         if (!isset($id)) {
-            $this->throwStoreException();
+            $this->throwStoreException('Invalid store id requested.');
         }
 
         if (empty($this->_stores[$id])) {
@@ -887,7 +887,7 @@ public function getStore($id = null)
             }
 
             if (!$store->getCode()) {
-                $this->throwStoreException();
+                $this->throwStoreException('Invalid store code requested.');
             }
             $this->_stores[$store->getStoreId()] = $store;
             $this->_stores[$store->getCode()] = $store;

diff --git a/composer.lock b/composer.lock
diff --git a/tests/unit/Base/DefaultConfigTest.php b/tests/unit/Base/DefaultConfigTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Base;
+
+use Generator;
+use Mage;
+use Mage_Adminhtml_Block_Dashboard;
+use PHPUnit\Framework\TestCase;
+
+class DefaultConfigTest extends TestCase
+{
+    /**
+     * @dataProvider provideGetStoreConfig
+     * @group Base
+     * @group Default_Config
+     */
+    public function testGetStoreConfig(string $expectedResult, string $path, $store = null): void
+    {
+        $this->assertSame($expectedResult, Mage::getStoreConfig($path, $store));
+    }
+
+
+    public function provideGetStoreConfig(): Generator
+    {
+        yield Mage_Adminhtml_Block_Dashboard::XML_PATH_ENABLE_CHARTS => [
+            '1',
+            Mage_Adminhtml_Block_Dashboard::XML_PATH_ENABLE_CHARTS
+        ];
+    }
+}
diff --git a/tests/unit/Mage/Admin/Helper/BlockTest.php b/tests/unit/Mage/Admin/Helper/BlockTest.php
@@ -32,20 +32,22 @@ public function setUp(): void
     }
 
     /**
+     * @covers Mage_Admin_Helper_Block::isTypeAllowed()
      * @group Mage_Admin
      * @group Mage_Admin_Helper
      */
     public function testIsTypeAllowed(): void
     {
-        $this->assertIsBool($this->subject->isTypeAllowed('some-type'));
+        $this->assertFalse($this->subject->isTypeAllowed('some-type'));
     }
 
     /**
+     * @covers Mage_Admin_Helper_Block::getDisallowedBlockNames()
      * @group Mage_Admin
      * @group Mage_Admin_Helper
      */
     public function testGetDisallowedBlockNames(): void
     {
-        $this->assertIsArray($this->subject->getDisallowedBlockNames());
+        $this->assertSame(['install/end'], $this->subject->getDisallowedBlockNames());
     }
 }
diff --git a/tests/unit/Mage/Admin/Helper/DataTest.php b/tests/unit/Mage/Admin/Helper/DataTest.php
@@ -32,6 +32,7 @@ public function setUp(): void
     }
 
     /**
+     * @covers Mage_Admin_Helper_Data::generateResetPasswordLinkToken()
      * @group Mage_Admin
      * @group Mage_Admin_Helper
      */
@@ -41,6 +42,7 @@ public function testGenerateResetPasswordLinkToken(): void
     }
 
     /**
+     * @covers Mage_Admin_Helper_Data::getResetPasswordLinkExpirationPeriod()
      * @group Mage_Admin
      * @group Mage_Admin_Helper
      */

diff --git a/tests/unit/Mage/Adminhtml/Block/CacheTest.php b/tests/unit/Mage/Adminhtml/Block/CacheTest.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block;
+
+use Mage;
+use Mage_Adminhtml_Block_Cache;
+use PHPUnit\Framework\TestCase;
+
+class CacheTest extends TestCase
+{
+    public Mage_Adminhtml_Block_Cache $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_Cache();
+    }
+
+    /**
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetFlushStorageUrl(): void
+    {
+        $this->assertStringStartsWith('http', $this->subject->getFlushStorageUrl());
+    }
+
+    /**
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     * @group runInSeparateProcess
+     * @runInSeparateProcess
+     */
+    public function testGetFlushSystemUrl(): void
+    {
+        $this->assertStringStartsWith('http', $this->subject->getFlushSystemUrl());
+    }
+}
diff --git a/tests/unit/Mage/Catalog/Helper/CategoryTest.php b/tests/unit/Mage/Catalog/Helper/CategoryTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Catalog\Helper;
+
+use Mage;
+use Mage_Catalog_Helper_Category;
+use PHPUnit\Framework\TestCase;
+
+class CategoryTest extends TestCase
+{
+    public Mage_Catalog_Helper_Category $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('catalog/category');
+    }
+
+    /**
+     * @group Mage_Catalog
+     * @group Mage_Catalog_Helper
+     */
+    public function testCanUseCanonicalTag(): void
+    {
+        $this->assertIsBool($this->subject->canUseCanonicalTag());
+    }
+}