From cf510fc0337c1d79a565cfbbad53a6c0bb35c2ba Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 2 Oct 2025 00:47:32 +0200 Subject: [PATCH 1/4] Add test for existing TinyMCE license files (it will fail for v8) --- tests/unit/Base/TinyMCELicenseTest.php | 53 ++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 tests/unit/Base/TinyMCELicenseTest.php diff --git a/tests/unit/Base/TinyMCELicenseTest.php b/tests/unit/Base/TinyMCELicenseTest.php new file mode 100644 index 00000000000..427bf4639b2 --- /dev/null +++ b/tests/unit/Base/TinyMCELicenseTest.php @@ -0,0 +1,53 @@ + Date: Thu, 2 Oct 2025 03:23:50 +0200 Subject: [PATCH 2/4] Updated composer plugin --- composer.json | 2 +- composer.lock | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 2c45597857b..21abf2784b0 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0", "mklkj/tinymce-i18n": "^25.2", "nnnick/chartjs": "^4.4", - "openmage/composer-plugin": "^3.0", + "openmage/composer-plugin": "^3.1", "pelago/emogrifier": "^8.0", "phpseclib/mcrypt_compat": "^2.0.3", "phpseclib/phpseclib": "^3.0.14", diff --git a/composer.lock b/composer.lock index 48be264c858..41ab91549b7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2a379a4ec7e3f7b249a91881618f67c9", + "content-hash": "132128cf56c404549e5451faed640451", "packages": [ { "name": "carbonphp/carbon-doctrine-types", @@ -1357,16 +1357,16 @@ }, { "name": "openmage/composer-plugin", - "version": "v3.0.0", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/OpenMage/composer-plugin.git", - "reference": "a20c2f24c6bacb693a02768f10d447c9bb40e299" + "reference": "5ea8f5d3dc2119f74699ace4d5ee5b50e3627a37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OpenMage/composer-plugin/zipball/a20c2f24c6bacb693a02768f10d447c9bb40e299", - "reference": "a20c2f24c6bacb693a02768f10d447c9bb40e299", + "url": "https://api.github.com/repos/OpenMage/composer-plugin/zipball/5ea8f5d3dc2119f74699ace4d5ee5b50e3627a37", + "reference": "5ea8f5d3dc2119f74699ace4d5ee5b50e3627a37", "shasum": "" }, "require": { @@ -1376,7 +1376,15 @@ "symfony/finder": "*" }, "require-dev": { - "composer/composer": "^2.7" + "composer/composer": "^2.8", + "friendsofphp/php-cs-fixer": "^3.67", + "phpmd/phpmd": "^2.15", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpstan/phpstan-symfony": "^2.0", + "phpunit/phpunit": "^9.6", + "rector/rector": "^2.1.2" }, "type": "composer-plugin", "extra": { @@ -1405,7 +1413,7 @@ ], "support": { "issues": "https://github.com/OpenMage/composer-plugin/issues", - "source": "https://github.com/OpenMage/composer-plugin/tree/v3.0.0" + "source": "https://github.com/OpenMage/composer-plugin/tree/v3.1.0" }, "funding": [ { @@ -1417,7 +1425,7 @@ "type": "opencollective" } ], - "time": "2025-01-13T01:08:07+00:00" + "time": "2025-10-02T01:15:46+00:00" }, { "name": "paragonie/constant_time_encoding", From bc4dc5e691e73bc8d6fa0e8810ff4c08bc7048d5 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 2 Oct 2025 03:35:28 +0200 Subject: [PATCH 3/4] Update tests/unit/Base/TinyMCELicenseTest.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- tests/unit/Base/TinyMCELicenseTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/Base/TinyMCELicenseTest.php b/tests/unit/Base/TinyMCELicenseTest.php index 427bf4639b2..5c46c482e30 100644 --- a/tests/unit/Base/TinyMCELicenseTest.php +++ b/tests/unit/Base/TinyMCELicenseTest.php @@ -43,8 +43,8 @@ public function testRootLicenseFilesExists(): void public function testVendorLicenseFilesExists(): void { if (InstalledVersions::isInstalled(self::TINY_MCE_NAMESPACE)) { - // @todo find a better way to get vendor dir - $filename = 'vendor/tinymce/tinymce/LICENSE_TINYMCE_OPENMAGE.txt'; + $vendorPath = InstalledVersions::getInstallPath(self::TINY_MCE_NAMESPACE); + $filename = $vendorPath . DIRECTORY_SEPARATOR . 'LICENSE_TINYMCE_OPENMAGE.txt'; self::assertFileExists($filename, self::ERROR_MESSAGE); } else { self::markTestSkipped(self::SKIP_MESSAGE); From c1a3ec1b150bfca9f65d10629ce1eb6628d7c3f9 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 2 Oct 2025 03:36:22 +0200 Subject: [PATCH 4/4] Update tests/unit/Base/TinyMCELicenseTest.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- tests/unit/Base/TinyMCELicenseTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/Base/TinyMCELicenseTest.php b/tests/unit/Base/TinyMCELicenseTest.php index 5c46c482e30..db764c28ea8 100644 --- a/tests/unit/Base/TinyMCELicenseTest.php +++ b/tests/unit/Base/TinyMCELicenseTest.php @@ -29,7 +29,8 @@ final class TinyMCELicenseTest extends TestCase public function testRootLicenseFilesExists(): void { if (InstalledVersions::isInstalled(self::TINY_MCE_NAMESPACE)) { - $filename = 'LICENSE_TINYMCE.txt'; + $rootDir = dirname(__DIR__, 3); + $filename = $rootDir . DIRECTORY_SEPARATOR . 'LICENSE_TINYMCE.txt'; self::assertFileExists($filename, self::ERROR_MESSAGE); } else { self::markTestSkipped(self::SKIP_MESSAGE);